]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix shared::Triangulation tests 5625/head
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Sun, 3 Dec 2017 10:27:39 +0000 (11:27 +0100)
committerDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Fri, 15 Dec 2017 08:48:46 +0000 (09:48 +0100)
tests/mpi/blockwise_parallel_01.cc
tests/mpi/blockwise_parallel_01.mpirun=2.output
tests/mpi/locally_owned_dofs_per_subdomain.cc
tests/mpi/locally_owned_dofs_per_subdomain.mpirun=2.output
tests/mpi/locally_owned_dofs_per_subdomain_hp.cc
tests/mpi/locally_owned_dofs_per_subdomain_hp.mpirun=2.output
tests/physics/step-18-rotation_matrix.cc
tests/physics/step-18.cc

index 07fb23d2fdd99151ad1d7d9e207145fe9796398e..cde2742457fdb58b747afdb2ac3f1f5ec19de802 100644 (file)
@@ -56,9 +56,9 @@ void test()
     locally_owned_dofs_per_block[1] =
       locally_owned_dofs_per_subdomain[this_mpi_process].get_view(dofs_per_block, dh.n_dofs());
 
-    if (locally_owned_dofs_per_block[0] != locally_owned_dofs_per_block[1]))
-      ExcMessage("Locally owned dofs differ across blocks."));
-    }
+    if (locally_owned_dofs_per_block[0] != locally_owned_dofs_per_block[1])
+      AssertThrow(false, ExcMessage("Locally owned dofs differ across blocks."));
+  }
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     deallog << "OK for " << dim << "d" << std::endl;
index 5637e3faa065332082b47721493c0ffdf78b8707..76b868c7e15f3b031c7f6587a14bbf50333b6d23 100644 (file)
@@ -1,3 +1,5 @@
+
 DEAL:0::OK for 2d
 DEAL:0::OK for 3d
 
+
index e5bae01d787c900d872486825675d455964a647e..a1d87e9c0eb8508786ce99d3971dbf71e05fb0f7 100644 (file)
@@ -31,7 +31,7 @@ void test ()
   triangulation (MPI_COMM_WORLD,
                  ::Triangulation<dim>::none,
                  false,
-                 parallel::shared::Triangulation<dim>::partition_metis);
+                 parallel::shared::Triangulation<dim>::partition_zorder);
   GridGenerator::hyper_cube(triangulation, -1.0, 1.0);
 
   FE_Q<dim> fe(1);
index 481ba49a0dfd18989de70f4149cbfa972a2a2ddb..3c757e8d85bdd8b0dbf0dbf9220b5f62007b3bac 100644 (file)
@@ -2,18 +2,18 @@
 DEAL:0::dim=2
 DEAL:0::rank=0
 DEAL:0::  n_dofs=4
-DEAL:0::  n_locally_owned_dofs=4
+DEAL:0::  n_locally_owned_dofs=0
 DEAL:0::dim=3
 DEAL:0::rank=0
 DEAL:0::  n_dofs=8
-DEAL:0::  n_locally_owned_dofs=8
+DEAL:0::  n_locally_owned_dofs=0
 
 DEAL:1::dim=2
 DEAL:1::rank=1
 DEAL:1::  n_dofs=4
-DEAL:1::  n_locally_owned_dofs=0
+DEAL:1::  n_locally_owned_dofs=4
 DEAL:1::dim=3
 DEAL:1::rank=1
 DEAL:1::  n_dofs=8
-DEAL:1::  n_locally_owned_dofs=0
+DEAL:1::  n_locally_owned_dofs=8
 
index 68a072828a8b62216137bed3aaa1447fdab13c16..fb1b20efd25f9f5904ea272e972b8187b450e296 100644 (file)
 template <int dim>
 void test ()
 {
-  parallel::shared::Triangulation<dim> triangulation(MPI_COMM_WORLD);
+  parallel::shared::Triangulation<dim>
+  triangulation (MPI_COMM_WORLD,
+                 ::Triangulation<dim>::none,
+                 false,
+                 parallel::shared::Triangulation<dim>::partition_zorder);
   GridGenerator::hyper_cube(triangulation, -1.0, 1.0);
 
   hp::FECollection<dim> fe;
index 481ba49a0dfd18989de70f4149cbfa972a2a2ddb..3c757e8d85bdd8b0dbf0dbf9220b5f62007b3bac 100644 (file)
@@ -2,18 +2,18 @@
 DEAL:0::dim=2
 DEAL:0::rank=0
 DEAL:0::  n_dofs=4
-DEAL:0::  n_locally_owned_dofs=4
+DEAL:0::  n_locally_owned_dofs=0
 DEAL:0::dim=3
 DEAL:0::rank=0
 DEAL:0::  n_dofs=8
-DEAL:0::  n_locally_owned_dofs=8
+DEAL:0::  n_locally_owned_dofs=0
 
 DEAL:1::dim=2
 DEAL:1::rank=1
 DEAL:1::  n_dofs=4
-DEAL:1::  n_locally_owned_dofs=0
+DEAL:1::  n_locally_owned_dofs=4
 DEAL:1::dim=3
 DEAL:1::rank=1
 DEAL:1::  n_dofs=8
-DEAL:1::  n_locally_owned_dofs=0
+DEAL:1::  n_locally_owned_dofs=8
 
index e7fd5e81fa220d5952c1f7d928296ca58fd6cce6..389aa31b803cdcc727bd083a6953864ec153bcb3 100644 (file)
@@ -284,7 +284,7 @@ namespace Step18
     triangulation(MPI_COMM_WORLD,
                   ::Triangulation<dim>::none,
                   false,
-                  parallel::shared::Triangulation<dim>::partition_metis),
+                  parallel::shared::Triangulation<dim>::partition_zorder),
     fe (FE_Q<dim>(1), dim),
     dof_handler (triangulation),
     quadrature_formula (2),
index 9419b370556c59111ee27f915fea3f8f43b0a8e0..f13052e4ac8d9d6cd467e5f827482b842b0889e1 100644 (file)
@@ -311,7 +311,7 @@ namespace Step18
     triangulation(MPI_COMM_WORLD,
                   ::Triangulation<dim>::none,
                   false,
-                  parallel::shared::Triangulation<dim>::partition_metis),
+                  parallel::shared::Triangulation<dim>::partition_zorder),
     fe (FE_Q<dim>(1), dim),
     dof_handler (triangulation),
     quadrature_formula (2),

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.