added extra Asserts to shared::Tria tests; do not output partition results

diff --git a/tests/sharedtria/dof_01.cc b/tests/sharedtria/dof_01.cc
index 77a0c8078c3e044c9fca06fa44d189011e37a1df..81968d92c65a59ed4ce96b015b72d57597d0157d 100644 (file)
--- a/tests/sharedtria/dof_01.cc
+++ b/tests/sharedtria/dof_01.cc
@@ -92,19 +92,20 @@ void test()
       triangulation.execute_coarsening_and_refinement ();
       dof_handler.distribute_dofs (fe);
 
+      // avoid outputing any partitioning info until Parmetis gives reproducable results
       deallog
-          << "n_dofs: " << dof_handler.n_dofs() << std::endl
-          << "n_locally_owned_dofs: " << dof_handler.n_locally_owned_dofs() << std::endl;
-
-      deallog << "n_locally_owned_dofs_per_processor: ";
-      std::vector<types::global_dof_index> v = dof_handler.n_locally_owned_dofs_per_processor();
-      unsigned int sum = 0;
-      for (unsigned int i=0; i<v.size(); ++i)
-        {
-          deallog << v[i] << " ";
-          sum += v[i];
-        }
-      deallog << " sum: " << sum << std::endl;
+          << "n_dofs: " << dof_handler.n_dofs() << std::endl;
+//          << "n_locally_owned_dofs: " << dof_handler.n_locally_owned_dofs() << std::endl;
+
+//      deallog << "n_locally_owned_dofs_per_processor: ";
+//      std::vector<types::global_dof_index> v = dof_handler.n_locally_owned_dofs_per_processor();
+//      unsigned int sum = 0;
+//      for (unsigned int i=0; i<v.size(); ++i)
+//        {
+//          deallog << v[i] << " ";
+//          sum += v[i];
+//        }
+//      deallog << " sum: " << sum << std::endl;
 
       Assert(dof_handler.n_locally_owned_dofs() == dof_handler.n_locally_owned_dofs_per_processor()[triangulation.locally_owned_subdomain()], ExcInternalError());
       Assert( dof_handler.n_locally_owned_dofs() == dof_handler.locally_owned_dofs().n_elements(), ExcInternalError());

diff --git a/tests/sharedtria/dof_01.with_metis=true.with_64bit_indices=off.mpirun=3.output b/tests/sharedtria/dof_01.with_metis=true.with_64bit_indices=off.mpirun=3.output
index ccb18a2933a0ca1db223063d15676339cb245cd9..ae56d843df0bbcef7b586f869f8b8478b3a6d6e7 100644 (file)
--- a/tests/sharedtria/dof_01.with_metis=true.with_64bit_indices=off.mpirun=3.output
+++ b/tests/sharedtria/dof_01.with_metis=true.with_64bit_indices=off.mpirun=3.output
@@ -1,50 +1,20 @@
 
 DEAL:0:2d::n_dofs: 818
-DEAL:0:2d::n_locally_owned_dofs: 301
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 301 261 256  sum: 818
 DEAL:0:2d::n_dofs: 1754
-DEAL:0:2d::n_locally_owned_dofs: 578
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 578 615 561  sum: 1754
 DEAL:0:2d::n_dofs: 3056
-DEAL:0:2d::n_locally_owned_dofs: 1011
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 1011 1091 954  sum: 3056
 DEAL:0:3d::n_dofs: 13282
-DEAL:0:3d::n_locally_owned_dofs: 4484
-DEAL:0:3d::n_locally_owned_dofs_per_processor: 4484 4322 4476  sum: 13282
 DEAL:0:3d::n_dofs: 41826
-DEAL:0:3d::n_locally_owned_dofs: 13898
-DEAL:0:3d::n_locally_owned_dofs_per_processor: 13898 13950 13978  sum: 41826
 
 DEAL:1:2d::n_dofs: 818
-DEAL:1:2d::n_locally_owned_dofs: 261
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 301 261 256  sum: 818
 DEAL:1:2d::n_dofs: 1754
-DEAL:1:2d::n_locally_owned_dofs: 615
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 578 615 561  sum: 1754
 DEAL:1:2d::n_dofs: 3056
-DEAL:1:2d::n_locally_owned_dofs: 1091
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 1011 1091 954  sum: 3056
 DEAL:1:3d::n_dofs: 13282
-DEAL:1:3d::n_locally_owned_dofs: 4322
-DEAL:1:3d::n_locally_owned_dofs_per_processor: 4484 4322 4476  sum: 13282
 DEAL:1:3d::n_dofs: 41826
-DEAL:1:3d::n_locally_owned_dofs: 13950
-DEAL:1:3d::n_locally_owned_dofs_per_processor: 13898 13950 13978  sum: 41826
 
 
 DEAL:2:2d::n_dofs: 818
-DEAL:2:2d::n_locally_owned_dofs: 256
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 301 261 256  sum: 818
 DEAL:2:2d::n_dofs: 1754
-DEAL:2:2d::n_locally_owned_dofs: 561
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 578 615 561  sum: 1754
 DEAL:2:2d::n_dofs: 3056
-DEAL:2:2d::n_locally_owned_dofs: 954
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 1011 1091 954  sum: 3056
 DEAL:2:3d::n_dofs: 13282
-DEAL:2:3d::n_locally_owned_dofs: 4476
-DEAL:2:3d::n_locally_owned_dofs_per_processor: 4484 4322 4476  sum: 13282
 DEAL:2:3d::n_dofs: 41826
-DEAL:2:3d::n_locally_owned_dofs: 13978
-DEAL:2:3d::n_locally_owned_dofs_per_processor: 13898 13950 13978  sum: 41826
 

diff --git a/tests/sharedtria/dof_01.with_metis=true.with_64bit_indices=off.mpirun=3.output.2 b/tests/sharedtria/dof_01.with_metis=true.with_64bit_indices=off.mpirun=3.output.2
deleted file mode 100644 (file)
index ab0b4ad..0000000
--- a/tests/sharedtria/dof_01.with_metis=true.with_64bit_indices=off.mpirun=3.output.2
+++ /dev/null
@@ -1,50 +0,0 @@
-
-DEAL:0:2d::n_dofs: 818
-DEAL:0:2d::n_locally_owned_dofs: 261
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 261 266 291  sum: 818
-DEAL:0:2d::n_dofs: 1754
-DEAL:0:2d::n_locally_owned_dofs: 558
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 558 599 597  sum: 1754
-DEAL:0:2d::n_dofs: 3056
-DEAL:0:2d::n_locally_owned_dofs: 976
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 976 1049 1031  sum: 3056
-DEAL:0:3d::n_dofs: 13282
-DEAL:0:3d::n_locally_owned_dofs: 4446
-DEAL:0:3d::n_locally_owned_dofs_per_processor: 4446 4502 4334  sum: 13282
-DEAL:0:3d::n_dofs: 41826
-DEAL:0:3d::n_locally_owned_dofs: 14429
-DEAL:0:3d::n_locally_owned_dofs_per_processor: 14429 13523 13874  sum: 41826
-
-DEAL:1:2d::n_dofs: 818
-DEAL:1:2d::n_locally_owned_dofs: 266
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 261 266 291  sum: 818
-DEAL:1:2d::n_dofs: 1754
-DEAL:1:2d::n_locally_owned_dofs: 599
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 558 599 597  sum: 1754
-DEAL:1:2d::n_dofs: 3056
-DEAL:1:2d::n_locally_owned_dofs: 1049
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 976 1049 1031  sum: 3056
-DEAL:1:3d::n_dofs: 13282
-DEAL:1:3d::n_locally_owned_dofs: 4502
-DEAL:1:3d::n_locally_owned_dofs_per_processor: 4446 4502 4334  sum: 13282
-DEAL:1:3d::n_dofs: 41826
-DEAL:1:3d::n_locally_owned_dofs: 13523
-DEAL:1:3d::n_locally_owned_dofs_per_processor: 14429 13523 13874  sum: 41826
-
-
-DEAL:2:2d::n_dofs: 818
-DEAL:2:2d::n_locally_owned_dofs: 291
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 261 266 291  sum: 818
-DEAL:2:2d::n_dofs: 1754
-DEAL:2:2d::n_locally_owned_dofs: 597
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 558 599 597  sum: 1754
-DEAL:2:2d::n_dofs: 3056
-DEAL:2:2d::n_locally_owned_dofs: 1031
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 976 1049 1031  sum: 3056
-DEAL:2:3d::n_dofs: 13282
-DEAL:2:3d::n_locally_owned_dofs: 4334
-DEAL:2:3d::n_locally_owned_dofs_per_processor: 4446 4502 4334  sum: 13282
-DEAL:2:3d::n_dofs: 41826
-DEAL:2:3d::n_locally_owned_dofs: 13874
-DEAL:2:3d::n_locally_owned_dofs_per_processor: 14429 13523 13874  sum: 41826
-

diff --git a/tests/sharedtria/dof_01.with_metis=true.with_64bit_indices=on.mpirun=3.output b/tests/sharedtria/dof_01.with_metis=true.with_64bit_indices=on.mpirun=3.output
index c18293988621f6e53852174aaf654dc74f560b9b..ae56d843df0bbcef7b586f869f8b8478b3a6d6e7 100644 (file)
--- a/tests/sharedtria/dof_01.with_metis=true.with_64bit_indices=on.mpirun=3.output
+++ b/tests/sharedtria/dof_01.with_metis=true.with_64bit_indices=on.mpirun=3.output
@@ -1,50 +1,20 @@
 
 DEAL:0:2d::n_dofs: 818
-DEAL:0:2d::n_locally_owned_dofs: 273
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 273 291 254  sum: 818
 DEAL:0:2d::n_dofs: 1754
-DEAL:0:2d::n_locally_owned_dofs: 549
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 549 621 584  sum: 1754
 DEAL:0:2d::n_dofs: 3056
-DEAL:0:2d::n_locally_owned_dofs: 1036
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 1036 997 1023  sum: 3056
 DEAL:0:3d::n_dofs: 13282
-DEAL:0:3d::n_locally_owned_dofs: 4491
-DEAL:0:3d::n_locally_owned_dofs_per_processor: 4491 4260 4531  sum: 13282
 DEAL:0:3d::n_dofs: 41826
-DEAL:0:3d::n_locally_owned_dofs: 13849
-DEAL:0:3d::n_locally_owned_dofs_per_processor: 13849 13994 13983  sum: 41826
 
 DEAL:1:2d::n_dofs: 818
-DEAL:1:2d::n_locally_owned_dofs: 291
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 273 291 254  sum: 818
 DEAL:1:2d::n_dofs: 1754
-DEAL:1:2d::n_locally_owned_dofs: 621
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 549 621 584  sum: 1754
 DEAL:1:2d::n_dofs: 3056
-DEAL:1:2d::n_locally_owned_dofs: 997
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 1036 997 1023  sum: 3056
 DEAL:1:3d::n_dofs: 13282
-DEAL:1:3d::n_locally_owned_dofs: 4260
-DEAL:1:3d::n_locally_owned_dofs_per_processor: 4491 4260 4531  sum: 13282
 DEAL:1:3d::n_dofs: 41826
-DEAL:1:3d::n_locally_owned_dofs: 13994
-DEAL:1:3d::n_locally_owned_dofs_per_processor: 13849 13994 13983  sum: 41826
 
 
 DEAL:2:2d::n_dofs: 818
-DEAL:2:2d::n_locally_owned_dofs: 254
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 273 291 254  sum: 818
 DEAL:2:2d::n_dofs: 1754
-DEAL:2:2d::n_locally_owned_dofs: 584
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 549 621 584  sum: 1754
 DEAL:2:2d::n_dofs: 3056
-DEAL:2:2d::n_locally_owned_dofs: 1023
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 1036 997 1023  sum: 3056
 DEAL:2:3d::n_dofs: 13282
-DEAL:2:3d::n_locally_owned_dofs: 4531
-DEAL:2:3d::n_locally_owned_dofs_per_processor: 4491 4260 4531  sum: 13282
 DEAL:2:3d::n_dofs: 41826
-DEAL:2:3d::n_locally_owned_dofs: 13983
-DEAL:2:3d::n_locally_owned_dofs_per_processor: 13849 13994 13983  sum: 41826
 

diff --git a/tests/sharedtria/dof_02.cc b/tests/sharedtria/dof_02.cc
index 03afa41cabeb0aa4e6e728f68d36e5ffbf34126c..84c74d0230321905375f686310eaf290eb56b382 100644 (file)
--- a/tests/sharedtria/dof_02.cc
+++ b/tests/sharedtria/dof_02.cc
@@ -95,18 +95,18 @@ void test()
       DoFRenumbering::component_wise(dof_handler);
 
       deallog
-          << "n_dofs: " << dof_handler.n_dofs() << std::endl
-          << "n_locally_owned_dofs: " << dof_handler.n_locally_owned_dofs() << std::endl;
-
-      deallog << "n_locally_owned_dofs_per_processor: ";
-      std::vector<types::global_dof_index> v = dof_handler.n_locally_owned_dofs_per_processor();
-      unsigned int sum = 0;
-      for (unsigned int i=0; i<v.size(); ++i)
-        {
-          deallog << v[i] << " ";
-          sum += v[i];
-        }
-      deallog << " sum: " << sum << std::endl;
+          << "n_dofs: " << dof_handler.n_dofs() << std::endl;
+//          << "n_locally_owned_dofs: " << dof_handler.n_locally_owned_dofs() << std::endl;
+//
+//      deallog << "n_locally_owned_dofs_per_processor: ";
+//      std::vector<types::global_dof_index> v = dof_handler.n_locally_owned_dofs_per_processor();
+//      unsigned int sum = 0;
+//      for (unsigned int i=0; i<v.size(); ++i)
+//        {
+//          deallog << v[i] << " ";
+//          sum += v[i];
+//        }
+//      deallog << " sum: " << sum << std::endl;
 
       Assert(dof_handler.n_locally_owned_dofs() == dof_handler.n_locally_owned_dofs_per_processor()[triangulation.locally_owned_subdomain()], ExcInternalError());
       Assert( dof_handler.n_locally_owned_dofs() == dof_handler.locally_owned_dofs().n_elements(), ExcInternalError());

diff --git a/tests/sharedtria/dof_02.with_metis=true.with_64bit_indices=off.mpirun=3.output b/tests/sharedtria/dof_02.with_metis=true.with_64bit_indices=off.mpirun=3.output
index ccb18a2933a0ca1db223063d15676339cb245cd9..ae56d843df0bbcef7b586f869f8b8478b3a6d6e7 100644 (file)
--- a/tests/sharedtria/dof_02.with_metis=true.with_64bit_indices=off.mpirun=3.output
+++ b/tests/sharedtria/dof_02.with_metis=true.with_64bit_indices=off.mpirun=3.output
@@ -1,50 +1,20 @@
 
 DEAL:0:2d::n_dofs: 818
-DEAL:0:2d::n_locally_owned_dofs: 301
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 301 261 256  sum: 818
 DEAL:0:2d::n_dofs: 1754
-DEAL:0:2d::n_locally_owned_dofs: 578
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 578 615 561  sum: 1754
 DEAL:0:2d::n_dofs: 3056
-DEAL:0:2d::n_locally_owned_dofs: 1011
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 1011 1091 954  sum: 3056
 DEAL:0:3d::n_dofs: 13282
-DEAL:0:3d::n_locally_owned_dofs: 4484
-DEAL:0:3d::n_locally_owned_dofs_per_processor: 4484 4322 4476  sum: 13282
 DEAL:0:3d::n_dofs: 41826
-DEAL:0:3d::n_locally_owned_dofs: 13898
-DEAL:0:3d::n_locally_owned_dofs_per_processor: 13898 13950 13978  sum: 41826
 
 DEAL:1:2d::n_dofs: 818
-DEAL:1:2d::n_locally_owned_dofs: 261
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 301 261 256  sum: 818
 DEAL:1:2d::n_dofs: 1754
-DEAL:1:2d::n_locally_owned_dofs: 615
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 578 615 561  sum: 1754
 DEAL:1:2d::n_dofs: 3056
-DEAL:1:2d::n_locally_owned_dofs: 1091
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 1011 1091 954  sum: 3056
 DEAL:1:3d::n_dofs: 13282
-DEAL:1:3d::n_locally_owned_dofs: 4322
-DEAL:1:3d::n_locally_owned_dofs_per_processor: 4484 4322 4476  sum: 13282
 DEAL:1:3d::n_dofs: 41826
-DEAL:1:3d::n_locally_owned_dofs: 13950
-DEAL:1:3d::n_locally_owned_dofs_per_processor: 13898 13950 13978  sum: 41826
 
 
 DEAL:2:2d::n_dofs: 818
-DEAL:2:2d::n_locally_owned_dofs: 256
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 301 261 256  sum: 818
 DEAL:2:2d::n_dofs: 1754
-DEAL:2:2d::n_locally_owned_dofs: 561
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 578 615 561  sum: 1754
 DEAL:2:2d::n_dofs: 3056
-DEAL:2:2d::n_locally_owned_dofs: 954
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 1011 1091 954  sum: 3056
 DEAL:2:3d::n_dofs: 13282
-DEAL:2:3d::n_locally_owned_dofs: 4476
-DEAL:2:3d::n_locally_owned_dofs_per_processor: 4484 4322 4476  sum: 13282
 DEAL:2:3d::n_dofs: 41826
-DEAL:2:3d::n_locally_owned_dofs: 13978
-DEAL:2:3d::n_locally_owned_dofs_per_processor: 13898 13950 13978  sum: 41826
 

diff --git a/tests/sharedtria/dof_02.with_metis=true.with_64bit_indices=on.mpirun=3.output b/tests/sharedtria/dof_02.with_metis=true.with_64bit_indices=on.mpirun=3.output
index c18293988621f6e53852174aaf654dc74f560b9b..ae56d843df0bbcef7b586f869f8b8478b3a6d6e7 100644 (file)
--- a/tests/sharedtria/dof_02.with_metis=true.with_64bit_indices=on.mpirun=3.output
+++ b/tests/sharedtria/dof_02.with_metis=true.with_64bit_indices=on.mpirun=3.output
@@ -1,50 +1,20 @@
 
 DEAL:0:2d::n_dofs: 818
-DEAL:0:2d::n_locally_owned_dofs: 273
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 273 291 254  sum: 818
 DEAL:0:2d::n_dofs: 1754
-DEAL:0:2d::n_locally_owned_dofs: 549
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 549 621 584  sum: 1754
 DEAL:0:2d::n_dofs: 3056
-DEAL:0:2d::n_locally_owned_dofs: 1036
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 1036 997 1023  sum: 3056
 DEAL:0:3d::n_dofs: 13282
-DEAL:0:3d::n_locally_owned_dofs: 4491
-DEAL:0:3d::n_locally_owned_dofs_per_processor: 4491 4260 4531  sum: 13282
 DEAL:0:3d::n_dofs: 41826
-DEAL:0:3d::n_locally_owned_dofs: 13849
-DEAL:0:3d::n_locally_owned_dofs_per_processor: 13849 13994 13983  sum: 41826
 
 DEAL:1:2d::n_dofs: 818
-DEAL:1:2d::n_locally_owned_dofs: 291
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 273 291 254  sum: 818
 DEAL:1:2d::n_dofs: 1754
-DEAL:1:2d::n_locally_owned_dofs: 621
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 549 621 584  sum: 1754
 DEAL:1:2d::n_dofs: 3056
-DEAL:1:2d::n_locally_owned_dofs: 997
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 1036 997 1023  sum: 3056
 DEAL:1:3d::n_dofs: 13282
-DEAL:1:3d::n_locally_owned_dofs: 4260
-DEAL:1:3d::n_locally_owned_dofs_per_processor: 4491 4260 4531  sum: 13282
 DEAL:1:3d::n_dofs: 41826
-DEAL:1:3d::n_locally_owned_dofs: 13994
-DEAL:1:3d::n_locally_owned_dofs_per_processor: 13849 13994 13983  sum: 41826
 
 
 DEAL:2:2d::n_dofs: 818
-DEAL:2:2d::n_locally_owned_dofs: 254
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 273 291 254  sum: 818
 DEAL:2:2d::n_dofs: 1754
-DEAL:2:2d::n_locally_owned_dofs: 584
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 549 621 584  sum: 1754
 DEAL:2:2d::n_dofs: 3056
-DEAL:2:2d::n_locally_owned_dofs: 1023
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 1036 997 1023  sum: 3056
 DEAL:2:3d::n_dofs: 13282
-DEAL:2:3d::n_locally_owned_dofs: 4531
-DEAL:2:3d::n_locally_owned_dofs_per_processor: 4491 4260 4531  sum: 13282
 DEAL:2:3d::n_dofs: 41826
-DEAL:2:3d::n_locally_owned_dofs: 13983
-DEAL:2:3d::n_locally_owned_dofs_per_processor: 13849 13994 13983  sum: 41826
 

diff --git a/tests/sharedtria/dof_03.cc b/tests/sharedtria/dof_03.cc
index 9d557302e745b9174ff4cddf8eec283efe0ff183..14f74fd11670f07d041c8de48edfadbf17b43d96 100644 (file)
--- a/tests/sharedtria/dof_03.cc
+++ b/tests/sharedtria/dof_03.cc
@@ -95,18 +95,18 @@ void test()
       dof_handler.distribute_dofs (fe);
 
       deallog
-          << "n_dofs: " << dof_handler.n_dofs() << std::endl
-          << "n_locally_owned_dofs: " << dof_handler.n_locally_owned_dofs() << std::endl;
-
-      deallog << "n_locally_owned_dofs_per_processor: ";
-      std::vector<types::global_dof_index> v = dof_handler.n_locally_owned_dofs_per_processor();
-      unsigned int sum = 0;
-      for (unsigned int i=0; i<v.size(); ++i)
-        {
-          deallog << v[i] << " ";
-          sum += v[i];
-        }
-      deallog << " sum: " << sum << std::endl;
+          << "n_dofs: " << dof_handler.n_dofs() << std::endl;
+//          << "n_locally_owned_dofs: " << dof_handler.n_locally_owned_dofs() << std::endl;
+//
+//      deallog << "n_locally_owned_dofs_per_processor: ";
+//      std::vector<types::global_dof_index> v = dof_handler.n_locally_owned_dofs_per_processor();
+//      unsigned int sum = 0;
+//      for (unsigned int i=0; i<v.size(); ++i)
+//        {
+//          deallog << v[i] << " ";
+//          sum += v[i];
+//        }
+//      deallog << " sum: " << sum << std::endl;
 
       Assert(dof_handler.n_locally_owned_dofs() == dof_handler.n_locally_owned_dofs_per_processor()[triangulation.locally_owned_subdomain()], ExcInternalError());
       Assert( dof_handler.n_locally_owned_dofs() == dof_handler.locally_owned_dofs().n_elements(), ExcInternalError());

diff --git a/tests/sharedtria/dof_03.with_metis=true.with_64bit_indices=off.mpirun=3.output b/tests/sharedtria/dof_03.with_metis=true.with_64bit_indices=off.mpirun=3.output
index ccb18a2933a0ca1db223063d15676339cb245cd9..ae56d843df0bbcef7b586f869f8b8478b3a6d6e7 100644 (file)
--- a/tests/sharedtria/dof_03.with_metis=true.with_64bit_indices=off.mpirun=3.output
+++ b/tests/sharedtria/dof_03.with_metis=true.with_64bit_indices=off.mpirun=3.output
@@ -1,50 +1,20 @@
 
 DEAL:0:2d::n_dofs: 818
-DEAL:0:2d::n_locally_owned_dofs: 301
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 301 261 256  sum: 818
 DEAL:0:2d::n_dofs: 1754
-DEAL:0:2d::n_locally_owned_dofs: 578
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 578 615 561  sum: 1754
 DEAL:0:2d::n_dofs: 3056
-DEAL:0:2d::n_locally_owned_dofs: 1011
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 1011 1091 954  sum: 3056
 DEAL:0:3d::n_dofs: 13282
-DEAL:0:3d::n_locally_owned_dofs: 4484
-DEAL:0:3d::n_locally_owned_dofs_per_processor: 4484 4322 4476  sum: 13282
 DEAL:0:3d::n_dofs: 41826
-DEAL:0:3d::n_locally_owned_dofs: 13898
-DEAL:0:3d::n_locally_owned_dofs_per_processor: 13898 13950 13978  sum: 41826
 
 DEAL:1:2d::n_dofs: 818
-DEAL:1:2d::n_locally_owned_dofs: 261
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 301 261 256  sum: 818
 DEAL:1:2d::n_dofs: 1754
-DEAL:1:2d::n_locally_owned_dofs: 615
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 578 615 561  sum: 1754
 DEAL:1:2d::n_dofs: 3056
-DEAL:1:2d::n_locally_owned_dofs: 1091
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 1011 1091 954  sum: 3056
 DEAL:1:3d::n_dofs: 13282
-DEAL:1:3d::n_locally_owned_dofs: 4322
-DEAL:1:3d::n_locally_owned_dofs_per_processor: 4484 4322 4476  sum: 13282
 DEAL:1:3d::n_dofs: 41826
-DEAL:1:3d::n_locally_owned_dofs: 13950
-DEAL:1:3d::n_locally_owned_dofs_per_processor: 13898 13950 13978  sum: 41826
 
 
 DEAL:2:2d::n_dofs: 818
-DEAL:2:2d::n_locally_owned_dofs: 256
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 301 261 256  sum: 818
 DEAL:2:2d::n_dofs: 1754
-DEAL:2:2d::n_locally_owned_dofs: 561
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 578 615 561  sum: 1754
 DEAL:2:2d::n_dofs: 3056
-DEAL:2:2d::n_locally_owned_dofs: 954
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 1011 1091 954  sum: 3056
 DEAL:2:3d::n_dofs: 13282
-DEAL:2:3d::n_locally_owned_dofs: 4476
-DEAL:2:3d::n_locally_owned_dofs_per_processor: 4484 4322 4476  sum: 13282
 DEAL:2:3d::n_dofs: 41826
-DEAL:2:3d::n_locally_owned_dofs: 13978
-DEAL:2:3d::n_locally_owned_dofs_per_processor: 13898 13950 13978  sum: 41826
 

diff --git a/tests/sharedtria/dof_04.cc b/tests/sharedtria/dof_04.cc
index 1965b72001588860d27e28c4844d08249e6eff27..00ba70296e32337248d94bb65e8aa651a4c9f325 100644 (file)
--- a/tests/sharedtria/dof_04.cc
+++ b/tests/sharedtria/dof_04.cc
@@ -97,18 +97,18 @@ void test()
       DoFRenumbering::component_wise(dof_handler);
 
       deallog
-          << "n_dofs: " << dof_handler.n_dofs() << std::endl
-          << "n_locally_owned_dofs: " << dof_handler.n_locally_owned_dofs() << std::endl;
-
-      deallog << "n_locally_owned_dofs_per_processor: ";
-      std::vector<types::global_dof_index> v = dof_handler.n_locally_owned_dofs_per_processor();
-      unsigned int sum = 0;
-      for (unsigned int i=0; i<v.size(); ++i)
-        {
-          deallog << v[i] << " ";
-          sum += v[i];
-        }
-      deallog << " sum: " << sum << std::endl;
+          << "n_dofs: " << dof_handler.n_dofs() << std::endl;
+//          << "n_locally_owned_dofs: " << dof_handler.n_locally_owned_dofs() << std::endl;
+//
+//      deallog << "n_locally_owned_dofs_per_processor: ";
+//      std::vector<types::global_dof_index> v = dof_handler.n_locally_owned_dofs_per_processor();
+//      unsigned int sum = 0;
+//      for (unsigned int i=0; i<v.size(); ++i)
+//        {
+//          deallog << v[i] << " ";
+//          sum += v[i];
+//        }
+//      deallog << " sum: " << sum << std::endl;
 
       Assert(dof_handler.n_locally_owned_dofs() == dof_handler.n_locally_owned_dofs_per_processor()[triangulation.locally_owned_subdomain()], ExcInternalError());
       Assert( dof_handler.n_locally_owned_dofs() == dof_handler.locally_owned_dofs().n_elements(), ExcInternalError());

diff --git a/tests/sharedtria/dof_04.with_metis=true.with_64bit_indices=off.mpirun=3.output b/tests/sharedtria/dof_04.with_metis=true.with_64bit_indices=off.mpirun=3.output
index 40e7378f114e6f60e05877cbb815e43f468cf6bb..ae56d843df0bbcef7b586f869f8b8478b3a6d6e7 100644 (file)
--- a/tests/sharedtria/dof_04.with_metis=true.with_64bit_indices=off.mpirun=3.output
+++ b/tests/sharedtria/dof_04.with_metis=true.with_64bit_indices=off.mpirun=3.output
@@ -1,50 +1,20 @@
 
 DEAL:0:2d::n_dofs: 818
-DEAL:0:2d::n_locally_owned_dofs: 289
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 289 297 232  sum: 818
 DEAL:0:2d::n_dofs: 1754
-DEAL:0:2d::n_locally_owned_dofs: 578
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 578 588 588  sum: 1754
 DEAL:0:2d::n_dofs: 3056
-DEAL:0:2d::n_locally_owned_dofs: 1023
-DEAL:0:2d::n_locally_owned_dofs_per_processor: 1023 1013 1020  sum: 3056
 DEAL:0:3d::n_dofs: 13282
-DEAL:0:3d::n_locally_owned_dofs: 4446
-DEAL:0:3d::n_locally_owned_dofs_per_processor: 4446 4386 4450  sum: 13282
 DEAL:0:3d::n_dofs: 41826
-DEAL:0:3d::n_locally_owned_dofs: 13862
-DEAL:0:3d::n_locally_owned_dofs_per_processor: 13862 14131 13833  sum: 41826
 
 DEAL:1:2d::n_dofs: 818
-DEAL:1:2d::n_locally_owned_dofs: 297
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 289 297 232  sum: 818
 DEAL:1:2d::n_dofs: 1754
-DEAL:1:2d::n_locally_owned_dofs: 588
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 578 588 588  sum: 1754
 DEAL:1:2d::n_dofs: 3056
-DEAL:1:2d::n_locally_owned_dofs: 1013
-DEAL:1:2d::n_locally_owned_dofs_per_processor: 1023 1013 1020  sum: 3056
 DEAL:1:3d::n_dofs: 13282
-DEAL:1:3d::n_locally_owned_dofs: 4386
-DEAL:1:3d::n_locally_owned_dofs_per_processor: 4446 4386 4450  sum: 13282
 DEAL:1:3d::n_dofs: 41826
-DEAL:1:3d::n_locally_owned_dofs: 14131
-DEAL:1:3d::n_locally_owned_dofs_per_processor: 13862 14131 13833  sum: 41826
 
 
 DEAL:2:2d::n_dofs: 818
-DEAL:2:2d::n_locally_owned_dofs: 232
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 289 297 232  sum: 818
 DEAL:2:2d::n_dofs: 1754
-DEAL:2:2d::n_locally_owned_dofs: 588
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 578 588 588  sum: 1754
 DEAL:2:2d::n_dofs: 3056
-DEAL:2:2d::n_locally_owned_dofs: 1020
-DEAL:2:2d::n_locally_owned_dofs_per_processor: 1023 1013 1020  sum: 3056
 DEAL:2:3d::n_dofs: 13282
-DEAL:2:3d::n_locally_owned_dofs: 4450
-DEAL:2:3d::n_locally_owned_dofs_per_processor: 4446 4386 4450  sum: 13282
 DEAL:2:3d::n_dofs: 41826
-DEAL:2:3d::n_locally_owned_dofs: 13833
-DEAL:2:3d::n_locally_owned_dofs_per_processor: 13862 14131 13833  sum: 41826
 

diff --git a/tests/sharedtria/tria_01.cc b/tests/sharedtria/tria_01.cc
index 85b9ed7a8b745dfc9814a7690a2963d738decf51..93d6f22130839ab27cc91d956c76616dff8b73fc 100644 (file)
--- a/tests/sharedtria/tria_01.cc
+++ b/tests/sharedtria/tria_01.cc
@@ -59,6 +59,15 @@ void test()
 {
   parallel::shared::Triangulation<dim> tr(MPI_COMM_WORLD);
 
+  AssertThrow( tr.with_artificial_cells() == false,
+               ExcInternalError());
+
+  const std::vector<unsigned int> &
+  true_subdomain_ids_of_cells = tr.get_true_subdomain_ids_of_cells();
+
+  AssertThrow (true_subdomain_ids_of_cells.size() == tr.n_active_cells(),
+               ExcInternalError());
+
 
   GridGenerator::hyper_cube(tr);
   tr.begin_active()->set_refine_flag();
@@ -81,11 +90,15 @@ void test()
     deallog << v[i] << " ";
     deallog << std::endl;*/
 
-  deallog << "subdomains: ";
+  // untill parmetis is stable, do not output partitioning
+  //deallog << "subdomains: ";
   typename  parallel::shared::Triangulation<dim>::active_cell_iterator it=tr.begin_active();
-  for (; it!=tr.end(); ++it)
+  for (unsigned int index=0; it!=tr.end(); ++it,++index)
     {
-      deallog << it->subdomain_id() << " ";
+      // check that true subdomain_ids are the same as those, stored in cell->subdomain_id()
+      AssertThrow(true_subdomain_ids_of_cells[index] == it->subdomain_id(),
+                  ExcInternalError());
+      //deallog << it->subdomain_id() << " ";
     }
   deallog << std::endl;
 

diff --git a/tests/sharedtria/tria_01.with_metis=true.with_64bit_indices=off.mpirun=3.output b/tests/sharedtria/tria_01.with_metis=true.with_64bit_indices=off.mpirun=3.output
index 4c4808a145f951ed71de00e390346b2b484cb19a..e470e96bf88c6a477f37084a359682fff279cdf1 100644 (file)
--- a/tests/sharedtria/tria_01.with_metis=true.with_64bit_indices=off.mpirun=3.output
+++ b/tests/sharedtria/tria_01.with_metis=true.with_64bit_indices=off.mpirun=3.output
@@ -4,26 +4,26 @@ DEAL:0:2d:: locally_owned_subdomain(): 0
  n_levels: 3
  n_global_levels: 3
 
-DEAL:0:2d::subdomains: 0 1 0 2 2 1 1 
+DEAL:0:2d::
 DEAL:0:3d:: locally_owned_subdomain(): 0
  n_active_cells: 15
  n_levels: 3
  n_global_levels: 3
 
-DEAL:0:3d::subdomains: 0 1 0 2 0 0 0 2 2 1 1 2 2 1 1 
+DEAL:0:3d::
 
 DEAL:1:2d:: locally_owned_subdomain(): 1
  n_active_cells: 7
  n_levels: 3
  n_global_levels: 3
 
-DEAL:1:2d::subdomains: 0 1 0 2 2 1 1 
+DEAL:1:2d::
 DEAL:1:3d:: locally_owned_subdomain(): 1
  n_active_cells: 15
  n_levels: 3
  n_global_levels: 3
 
-DEAL:1:3d::subdomains: 0 1 0 2 0 0 0 2 2 1 1 2 2 1 1 
+DEAL:1:3d::
 
 
 DEAL:2:2d:: locally_owned_subdomain(): 2
@@ -31,11 +31,11 @@ DEAL:2:2d:: locally_owned_subdomain(): 2
  n_levels: 3
  n_global_levels: 3
 
-DEAL:2:2d::subdomains: 0 1 0 2 2 1 1 
+DEAL:2:2d::
 DEAL:2:3d:: locally_owned_subdomain(): 2
  n_active_cells: 15
  n_levels: 3
  n_global_levels: 3
 
-DEAL:2:3d::subdomains: 0 1 0 2 0 0 0 2 2 1 1 2 2 1 1 
+DEAL:2:3d::
 

diff --git a/tests/sharedtria/tria_01.with_metis=true.with_64bit_indices=off.mpirun=3.output.2 b/tests/sharedtria/tria_01.with_metis=true.with_64bit_indices=off.mpirun=3.output.2
deleted file mode 100644 (file)
index c7b9a98..0000000
--- a/tests/sharedtria/tria_01.with_metis=true.with_64bit_indices=off.mpirun=3.output.2
+++ /dev/null
@@ -1,41 +0,0 @@
-
-DEAL:0:2d:: locally_owned_subdomain(): 0
- n_active_cells: 7
- n_levels: 3
- n_global_levels: 3
-
-DEAL:0:2d::subdomains: 2 1 2 0 0 1 1 
-DEAL:0:3d:: locally_owned_subdomain(): 0
- n_active_cells: 15
- n_levels: 3
- n_global_levels: 3
-
-DEAL:0:3d::subdomains: 2 0 0 1 0 0 0 2 2 2 2 1 1 1 1 
-
-DEAL:1:2d:: locally_owned_subdomain(): 1
- n_active_cells: 7
- n_levels: 3
- n_global_levels: 3
-
-DEAL:1:2d::subdomains: 2 1 2 0 0 1 1 
-DEAL:1:3d:: locally_owned_subdomain(): 1
- n_active_cells: 15
- n_levels: 3
- n_global_levels: 3
-
-DEAL:1:3d::subdomains: 2 0 0 1 0 0 0 2 2 2 2 1 1 1 1 
-
-
-DEAL:2:2d:: locally_owned_subdomain(): 2
- n_active_cells: 7
- n_levels: 3
- n_global_levels: 3
-
-DEAL:2:2d::subdomains: 2 1 2 0 0 1 1 
-DEAL:2:3d:: locally_owned_subdomain(): 2
- n_active_cells: 15
- n_levels: 3
- n_global_levels: 3
-
-DEAL:2:3d::subdomains: 2 0 0 1 0 0 0 2 2 2 2 1 1 1 1 
-

diff --git a/tests/sharedtria/tria_01.with_metis=true.with_64bit_indices=on.mpirun=3.output b/tests/sharedtria/tria_01.with_metis=true.with_64bit_indices=on.mpirun=3.output
index 4c4808a145f951ed71de00e390346b2b484cb19a..e470e96bf88c6a477f37084a359682fff279cdf1 100644 (file)
--- a/tests/sharedtria/tria_01.with_metis=true.with_64bit_indices=on.mpirun=3.output
+++ b/tests/sharedtria/tria_01.with_metis=true.with_64bit_indices=on.mpirun=3.output
@@ -4,26 +4,26 @@ DEAL:0:2d:: locally_owned_subdomain(): 0
  n_levels: 3
  n_global_levels: 3
 
-DEAL:0:2d::subdomains: 0 1 0 2 2 1 1 
+DEAL:0:2d::
 DEAL:0:3d:: locally_owned_subdomain(): 0
  n_active_cells: 15
  n_levels: 3
  n_global_levels: 3
 
-DEAL:0:3d::subdomains: 0 1 0 2 0 0 0 2 2 1 1 2 2 1 1 
+DEAL:0:3d::
 
 DEAL:1:2d:: locally_owned_subdomain(): 1
  n_active_cells: 7
  n_levels: 3
  n_global_levels: 3
 
-DEAL:1:2d::subdomains: 0 1 0 2 2 1 1 
+DEAL:1:2d::
 DEAL:1:3d:: locally_owned_subdomain(): 1
  n_active_cells: 15
  n_levels: 3
  n_global_levels: 3
 
-DEAL:1:3d::subdomains: 0 1 0 2 0 0 0 2 2 1 1 2 2 1 1 
+DEAL:1:3d::
 
 
 DEAL:2:2d:: locally_owned_subdomain(): 2
@@ -31,11 +31,11 @@ DEAL:2:2d:: locally_owned_subdomain(): 2
  n_levels: 3
  n_global_levels: 3
 
-DEAL:2:2d::subdomains: 0 1 0 2 2 1 1 
+DEAL:2:2d::
 DEAL:2:3d:: locally_owned_subdomain(): 2
  n_active_cells: 15
  n_levels: 3
  n_global_levels: 3
 
-DEAL:2:3d::subdomains: 0 1 0 2 0 0 0 2 2 1 1 2 2 1 1 
+DEAL:2:3d::
 

diff --git a/tests/sharedtria/tria_02.cc b/tests/sharedtria/tria_02.cc
index 16352122c3d4057b174fe3ab2806416ec10caced..ae8be13332c2bfbdd42ba0484ea5383405dca8ae 100644 (file)
--- a/tests/sharedtria/tria_02.cc
+++ b/tests/sharedtria/tria_02.cc
@@ -63,6 +63,14 @@ void test()
                                           Triangulation<dim>::none,
                                           /*artificial*/true);
 
+  AssertThrow( tr.with_artificial_cells() == true,
+               ExcInternalError());
+
+  const std::vector<unsigned int> &
+  true_subdomain_ids_of_cells = tr.get_true_subdomain_ids_of_cells();
+
+  AssertThrow (true_subdomain_ids_of_cells.size() == tr.n_active_cells(),
+               ExcInternalError());
 
   GridGenerator::hyper_cube(tr);
   tr.refine_global();
@@ -86,18 +94,23 @@ void test()
     deallog << v[i] << " ";
     deallog << std::endl;*/
 
-  deallog << "subdomains: ";
+  // untill parmetis is stable, do not output partitioning
+  //deallog << "subdomains: ";
   typename  parallel::shared::Triangulation<dim>::active_cell_iterator it=tr.begin_active();
-  for (; it!=tr.end(); ++it)
+  for (unsigned int index=0; it!=tr.end(); ++it,++index)
     {
-      deallog << (int) it->subdomain_id() << " ";
+      // check that true subdomain_ids are the same as those, stored in cell->subdomain_id()
+      AssertThrow( (it->is_artificial() == true) ||
+                   (true_subdomain_ids_of_cells[index] == it->subdomain_id()),
+                   ExcInternalError());
+      //deallog << (int) it->subdomain_id() << " ";
     }
   deallog << std::endl;
 
-  const std::string filename = ("mesh_" +
-                                Utilities::int_to_string(dim)+
-                                "D_");
-  write_mesh(tr, filename.c_str());
+//  const std::string filename = ("mesh_" +
+//                                Utilities::int_to_string(dim)+
+//                                "D_");
+//  write_mesh(tr, filename.c_str());
 }
 
 

diff --git a/tests/sharedtria/tria_02.with_metis=true.with_64bit_indices=off.mpirun=3.output b/tests/sharedtria/tria_02.with_metis=true.with_64bit_indices=off.mpirun=3.output
index 027bf51dc5bf09d634067e09a50aa9730785a4d1..0e97c55ec5a7b5f5142ab8cd933de79f4d2105e3 100644 (file)
--- a/tests/sharedtria/tria_02.with_metis=true.with_64bit_indices=off.mpirun=3.output
+++ b/tests/sharedtria/tria_02.with_metis=true.with_64bit_indices=off.mpirun=3.output
@@ -4,26 +4,26 @@ DEAL:0:2d:: locally_owned_subdomain(): 0
  n_levels: 3
  n_global_levels: 3
 
-DEAL:0:2d::subdomains: 1 1 0 0 0 0 2 -2 1 -2 
+DEAL:0:2d::
 DEAL:0:3d:: locally_owned_subdomain(): 0
  n_active_cells: 22
  n_levels: 3
  n_global_levels: 3
 
-DEAL:0:3d::subdomains: 2 0 2 0 2 0 -2 1 -2 2 -2 1 -2 2 1 1 1 0 1 0 0 0 
+DEAL:0:3d::
 
 DEAL:1:2d:: locally_owned_subdomain(): 1
  n_active_cells: 10
  n_levels: 3
  n_global_levels: 3
 
-DEAL:1:2d::subdomains: 1 1 -2 0 0 0 2 2 1 2 
+DEAL:1:2d::
 DEAL:1:3d:: locally_owned_subdomain(): 1
  n_active_cells: 22
  n_levels: 3
  n_global_levels: 3
 
-DEAL:1:3d::subdomains: 2 0 2 0 -2 -2 1 1 2 2 2 1 2 2 1 1 1 0 1 0 0 0 
+DEAL:1:3d::
 
 
 DEAL:2:2d:: locally_owned_subdomain(): 2
@@ -31,11 +31,11 @@ DEAL:2:2d:: locally_owned_subdomain(): 2
  n_levels: 3
  n_global_levels: 3
 
-DEAL:2:2d::subdomains: -2 1 -2 0 -2 0 2 2 1 2 
+DEAL:2:2d::
 DEAL:2:3d:: locally_owned_subdomain(): 2
  n_active_cells: 22
  n_levels: 3
  n_global_levels: 3
 
-DEAL:2:3d::subdomains: 2 0 2 0 2 0 1 1 2 2 2 1 2 2 1 -2 1 -2 1 -2 0 -2 
+DEAL:2:3d::