From 76a55106a4a6c6444de8922a8f0ce89a4f8a675d Mon Sep 17 00:00:00 2001 From: heltai Date: Sun, 13 Apr 2014 14:20:06 +0000 Subject: [PATCH] Merged r32444 through r32769 from trunk. git-svn-id: https://svn.dealii.org/branches/branch_manifold_id_intermediate@32770 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/examples/step-40/doc/results.dox | 58 +++++++++++++----------- deal.II/examples/step-40/step-40.cc | 4 +- deal.II/source/base/data_out_base.cc | 9 ++-- tests/serialization/table_1.output | 4 +- tests/serialization/table_2.output | 4 +- tests/serialization/table_3.output | 4 +- tests/serialization/table_4.output | 4 +- tests/serialization/table_5.output | 4 +- tests/serialization/table_6.output | 4 +- tests/serialization/table_7.output | 4 +- 10 files changed, 50 insertions(+), 49 deletions(-) diff --git a/deal.II/examples/step-40/doc/results.dox b/deal.II/examples/step-40/doc/results.dox index 45eec441e8..8e887c0917 100644 --- a/deal.II/examples/step-40/doc/results.dox +++ b/deal.II/examples/step-40/doc/results.dox @@ -8,40 +8,44 @@ Cycle 0: Number of degrees of freedom: 4225 Solved in 10 iterations. + ++---------------------------------------------+------------+------------+ +| Total wallclock time elapsed since start | 0.176s | | +| | | | +| Section | no. calls | wall time | % of total | ++---------------------------------+-----------+------------+------------+ +| assembly | 1 | 0.0209s | 12% | +| output | 1 | 0.0189s | 11% | +| setup | 1 | 0.0299s | 17% | +| solve | 1 | 0.0419s | 24% | ++---------------------------------+-----------+------------+------------+ + + Cycle 1: Number of active cells: 1954 Number of degrees of freedom: 8399 - Solved in 11 iterations. + Solved in 10 iterations. -Cycle 2: - Number of active cells: 3640 - Number of degrees of freedom: 16091 - Solved in 11 iterations. -Cycle 3: - Number of active cells: 7018 - Number of degrees of freedom: 31387 ++---------------------------------------------+------------+------------+ +| Total wallclock time elapsed since start | 0.327s | | +| | | | +| Section | no. calls | wall time | % of total | ++---------------------------------+-----------+------------+------------+ +| assembly | 1 | 0.0368s | 11% | +| output | 1 | 0.0208s | 6.4% | +| refine | 1 | 0.157s | 48% | +| setup | 1 | 0.0452s | 14% | +| solve | 1 | 0.0668s | 20% | ++---------------------------------+-----------+------------+------------+ + + +Cycle 2: + Number of active cells: 3664 + Number of degrees of freedom: 16183 Solved in 11 iterations. -Cycle 4: - Number of active cells: 13594 - Number of degrees of freedom: 61531 - Solved in 13 iterations. - -Cycle 5: - Number of active cells: 26950 - Number of degrees of freedom: 122693 - Solved in 13 iterations. - -Cycle 6: - Number of active cells: 54373 - Number of degrees of freedom: 248265 - Solved in 14 iterations. - -Cycle 7: - Number of active cells: 111754 - Number of degrees of freedom: 513153 - Solved in 14 iterations. +... @endcode The exact numbers differ, depending on how many processors we use; diff --git a/deal.II/examples/step-40/step-40.cc b/deal.II/examples/step-40/step-40.cc index d8068b0596..1f5efcf0c9 100644 --- a/deal.II/examples/step-40/step-40.cc +++ b/deal.II/examples/step-40/step-40.cc @@ -656,11 +656,11 @@ namespace Step40 output_results (cycle); } - pcout << std::endl; computing_timer.print_summary (); computing_timer.reset (); - } + pcout << std::endl; + } } } diff --git a/deal.II/source/base/data_out_base.cc b/deal.II/source/base/data_out_base.cc index f4ce58050f..39a23d8558 100644 --- a/deal.II/source/base/data_out_base.cc +++ b/deal.II/source/base/data_out_base.cc @@ -7220,20 +7220,17 @@ void DataOutBase::write_hdf5_parallel (const std::vector > & herr_t status; unsigned int local_node_cell_count[2], global_node_cell_count[2], global_node_cell_offsets[2]; hsize_t count[2], offset[2], node_ds_dim[2], cell_ds_dim[2]; - bool empty_proc = false; std::vector node_data_vec; std::vector cell_data_vec; - if (data_filter.n_nodes() == 0) empty_proc = true; - // If HDF5 is not parallel and we're using multiple processes, abort #ifndef H5_HAVE_PARALLEL -#ifdef DEAL_II_WITH_MPI +# ifdef DEAL_II_WITH_MPI int world_size; MPI_Comm_size(comm, &world_size); AssertThrow (world_size <= 1, ExcMessage ("Serial HDF5 output on multiple processes is not yet supported.")); -#endif +# endif #endif local_node_cell_count[0] = data_filter.n_nodes(); @@ -7390,7 +7387,7 @@ void DataOutBase::write_hdf5_parallel (const std::vector > & // all vector data, then handle the // scalar data sets that have been // left over - unsigned int i, n, q, r, pt_data_vector_dim; + unsigned int i, pt_data_vector_dim; std::string vector_name; for (i=0; i