]> https://gitweb.dealii.org/ - dealii.git/commitdiff
fix matrix-free unit tests
authorDenis Davydov <davydden@gmail.com>
Sun, 26 Mar 2017 20:35:56 +0000 (22:35 +0200)
committerDenis Davydov <davydden@gmail.com>
Sun, 26 Mar 2017 20:35:56 +0000 (22:35 +0200)
18 files changed:
tests/matrix_free/copy.cc
tests/matrix_free/copy_feevaluation.cc
tests/matrix_free/get_functions_multife.cc
tests/matrix_free/get_functions_multife2.cc
tests/matrix_free/integrate_functions.cc
tests/matrix_free/integrate_functions_multife.cc
tests/matrix_free/integrate_functions_multife2.cc
tests/matrix_free/matrix_vector_20.cc
tests/matrix_free/matrix_vector_21.cc
tests/matrix_free/matrix_vector_curl.cc
tests/matrix_free/matrix_vector_div.cc
tests/matrix_free/matrix_vector_stokes.cc
tests/matrix_free/matrix_vector_stokes_base.cc
tests/matrix_free/matrix_vector_stokes_noflux.cc
tests/matrix_free/matrix_vector_stokes_notempl.cc
tests/matrix_free/matrix_vector_stokes_qdg0.cc
tests/matrix_free/matrix_vector_stokes_qdg0b.cc
tests/matrix_free/thread_correctness.cc

index d0232715852d22a3383b71913dafc476dbd6c18f..6d8487f86cdd36c40ca9b24089f96af0fbf3035d 100644 (file)
@@ -80,7 +80,7 @@ void sub_test()
       {
         const QGauss<1> quad (fe_degree+1);
         mf_data.reinit (dof, constraints, quad,
-                        typename MatrixFree<dim,number>::AdditionalData(MPI_COMM_SELF,MatrixFree<dim,number>::AdditionalData::none));
+                        typename MatrixFree<dim,number>::AdditionalData(MatrixFree<dim,number>::AdditionalData::none));
       }
 
       MatrixFreeTest<dim,fe_degree,number> mf_ref (mf_data);
index 6f724c263da79ee7d51dd401f20fbfc972073576..461b7348b62d4fc07aa4dcfc62cb562710f694cc 100644 (file)
@@ -313,8 +313,7 @@ void test ()
     // no parallelism
     mf_data.reinit (mapping, dofs, constraints, quad,
                     typename MatrixFree<dim>::AdditionalData
-                    (MPI_COMM_WORLD,
-                     MatrixFree<dim>::AdditionalData::none));
+                    (MatrixFree<dim>::AdditionalData::none));
   }
 
   system_matrix.vmult (solution, system_rhs);
index 5c2154f55a0b8b5709b248653a1b9a7986946c38..f44fd238f69fb6d679bba7f6b7f64414a5b4dbb6 100644 (file)
@@ -262,8 +262,7 @@ void test ()
       quad.push_back(QGauss<1>(fe_degree+1+no));
     mf_data.reinit (dof, constraints, quad,
                     typename MatrixFree<dim,number>::AdditionalData
-                    (MPI_COMM_SELF,
-                     MatrixFree<dim,number>::AdditionalData::none));
+                    (MatrixFree<dim,number>::AdditionalData::none));
   }
 
   MatrixFreeTest<dim,fe_degree,fe_degree+1,number> mf (mf_data);
@@ -295,4 +294,3 @@ int main ()
     deallog.pop();
   }
 }
-
index 4f333ae861f54156f6e52e42ca0935083bd82166..848273cdb97c33325f446440dfc4df8318f43057 100644 (file)
@@ -314,8 +314,7 @@ void test ()
     quad.push_back (QGauss<1>(fe_degree+1));
     mf_data.reinit (dof, constraints, quad,
                     typename MatrixFree<dim,number>::AdditionalData
-                    (MPI_COMM_SELF,
-                     MatrixFree<dim,number>::AdditionalData::none));
+                    (MatrixFree<dim,number>::AdditionalData::none));
   }
 
   MatrixFreeTest<dim,fe_degree,fe_degree+1,number> mf (mf_data);
@@ -347,4 +346,3 @@ int main ()
     deallog.pop();
   }
 }
-
index 753984e3c5e3b821ea1ca584b0fd83c750e26907..89d9afb9ffc082741923dc4328f61d4a0c089fdd 100644 (file)
@@ -198,7 +198,7 @@ void test ()
   {
     const QGauss<1> quad (fe_degree+1);
     mf_data.reinit (dof, constraints, quad,
-                    typename MatrixFree<dim,number>::AdditionalData(MPI_COMM_SELF,MatrixFree<dim,number>::AdditionalData::none));
+                    typename MatrixFree<dim,number>::AdditionalData(MatrixFree<dim,number>::AdditionalData::none));
   }
 
   MatrixFreeTest<dim,fe_degree,number> mf (mf_data);
index eaca2a4dfb708f4d8cf7b7ece790f3d15d89b8e1..fd13063f198d59d68ab76bf49600f056550369bd 100644 (file)
@@ -307,7 +307,7 @@ void test ()
     for (unsigned int no=0; no<2; ++no)
       quad.push_back(QGauss<1>(fe_degree+1+no));
     mf_data.reinit (dof, constraints, quad,
-                    typename MatrixFree<dim,number>::AdditionalData(MPI_COMM_SELF,MatrixFree<dim,number>::AdditionalData::none));
+                    typename MatrixFree<dim,number>::AdditionalData(MatrixFree<dim,number>::AdditionalData::none));
   }
 
   MatrixFreeTest<dim,fe_degree,number> mf (mf_data);
index f441096cfb8c3d43710db516659651903bd8c228..fd712020b17c55d4cf10c3f12bce6018080d7da3 100644 (file)
@@ -298,7 +298,7 @@ void test ()
     quad.push_back (QGauss<1>(1));
     quad.push_back (QGauss<1>(fe_degree+1));
     mf_data.reinit (dof, constraints, quad,
-                    typename MatrixFree<dim,number>::AdditionalData(MPI_COMM_SELF,MatrixFree<dim,number>::AdditionalData::none));
+                    typename MatrixFree<dim,number>::AdditionalData(MatrixFree<dim,number>::AdditionalData::none));
   }
 
   MatrixFreeTest<dim,fe_degree,number> mf (mf_data);
@@ -351,4 +351,3 @@ int main ()
     deallog.pop();
   }
 }
-
index 085245037384d7c9a2bfeb52be96fa13cc5dc6e2..5883845c97ccf0e5441e97128226a2f65277a069 100644 (file)
@@ -168,7 +168,6 @@ void test ()
   {
     const QGauss<1> quad (fe_degree+1);
     typename MatrixFree<dim,number>::AdditionalData data;
-    data.mpi_communicator = MPI_COMM_WORLD;
     data.tasks_parallel_scheme =
       MatrixFree<dim,number>::AdditionalData::partition_color;
     data.tasks_block_size = 7;
index 51867f9bfb7e81d564f092ae00edca74cb7ac6ee..021b9e8798a9f555c294521c2b7f84bedc3bcb5f 100644 (file)
@@ -159,7 +159,6 @@ void test ()
   {
     const QGauss<1> quad (fe_degree+1);
     typename MatrixFree<dim,number>::AdditionalData data;
-    data.mpi_communicator = MPI_COMM_WORLD;
     data.tasks_parallel_scheme =
       MatrixFree<dim,number>::AdditionalData::partition_color;
     data.tasks_block_size = 7;
index a465ed80a0cdf50a4110020db6096431cb88f1b3..ccb452396f48f3140b364f4cb6ac282f3024a735 100644 (file)
@@ -255,8 +255,7 @@ void test ()
     QGauss<1> quad(fe_degree+1);
     mf_data.reinit (dof_handler_sca, constraints, quad,
                     typename MatrixFree<dim>::AdditionalData
-                    (MPI_COMM_WORLD,
-                     MatrixFree<dim>::AdditionalData::none));
+                    (MatrixFree<dim>::AdditionalData::none));
   }
 
   system_matrix.vmult (solution, system_rhs);
index 31ed6bf555b882ef504e63306d564ccb45b6763e..a5380eb612c666b6fd2771f5ad3baee2bae4a980 100644 (file)
@@ -254,8 +254,7 @@ void test ()
     QGauss<1> quad(fe_degree+1);
     mf_data.reinit (dof_handler_sca, constraints, quad,
                     typename MatrixFree<dim>::AdditionalData
-                    (MPI_COMM_WORLD,
-                     MatrixFree<dim>::AdditionalData::none));
+                    (MatrixFree<dim>::AdditionalData::none));
   }
 
   system_matrix.vmult (solution, system_rhs);
@@ -295,4 +294,3 @@ int main ()
     deallog.pop();
   }
 }
-
index bbe7eef4c31405323b232512020e008bb3ee9297..5cb39ac9ff14307a20a79d5e21e0ae98c4e8da7a 100644 (file)
@@ -284,8 +284,7 @@ void test ()
     QGauss<1> quad(fe_degree+2);
     mf_data.reinit (dofs, constraints, quad,
                     typename MatrixFree<dim>::AdditionalData
-                    (MPI_COMM_WORLD,
-                     MatrixFree<dim>::AdditionalData::none));
+                    (MatrixFree<dim>::AdditionalData::none));
   }
 
   system_matrix.vmult (solution, system_rhs);
@@ -327,4 +326,3 @@ int main ()
     deallog.pop();
   }
 }
-
index 26ed95f6b3be3fe8e6ec1bf6fa6bd8a5b82ef48f..8e8eaf60ab4bf7642de5837d5be7060af3f02f20 100644 (file)
@@ -255,8 +255,7 @@ test()
     // no parallelism
     mf_data->reinit (dofs, constraints, quad,
                      typename MatrixFree<dim>::AdditionalData
-                     (MPI_COMM_WORLD,
-                      MatrixFree<dim>::AdditionalData::none));
+                     (MatrixFree<dim>::AdditionalData::none));
   }
   system_matrix.vmult (solution, system_rhs);
 
index dcd2e5fb6efa5f8e0a16d23d60fdb8a2299d277d..7e1fa4fa17c0ede30b66de8da4690cb95deb0fbd 100644 (file)
@@ -310,8 +310,7 @@ void test ()
     // no parallelism
     mf_data.reinit (mapping, dofs, constraints, quad,
                     typename MatrixFree<dim>::AdditionalData
-                    (MPI_COMM_WORLD,
-                     MatrixFree<dim>::AdditionalData::none));
+                    (MatrixFree<dim>::AdditionalData::none));
   }
 
   system_matrix.vmult (solution, system_rhs);
index 0e17648af1670d99630dcc3480eb9b46c352ad3e..ce8500dbe4cece15297db88b1f673917dbf78849 100644 (file)
@@ -307,8 +307,7 @@ void test (const unsigned int fe_degree)
     // no parallelism
     mf_data.reinit (mapping, dofs, constraints, quad,
                     typename MatrixFree<dim>::AdditionalData
-                    (MPI_COMM_WORLD,
-                     MatrixFree<dim>::AdditionalData::none));
+                    (MatrixFree<dim>::AdditionalData::none));
   }
 
   system_matrix.vmult (solution, system_rhs);
index d021a47b414fed39cf3f3e8d0e7ce6ea861e7a71..4f7cde12042add11d7fa6fd4b35300b972f66822 100644 (file)
@@ -286,8 +286,7 @@ void test ()
     QGauss<1> quad(fe_degree+2);
     mf_data.reinit (dofs, constraints, quad,
                     typename MatrixFree<dim>::AdditionalData
-                    (MPI_COMM_WORLD,
-                     MatrixFree<dim>::AdditionalData::none));
+                    (MatrixFree<dim>::AdditionalData::none));
   }
 
   system_matrix.vmult (solution, system_rhs);
@@ -328,4 +327,3 @@ int main ()
     deallog.pop();
   }
 }
-
index ec5facf37347787c5055b8e811ee51b023402b06..f8290a101617ca4210e35f90a44ae8c824215592 100644 (file)
@@ -287,8 +287,7 @@ void test (const unsigned int fe_degree)
     QGauss<1> quad(fe_degree+2);
     mf_data.reinit (dofs, constraints, quad,
                     typename MatrixFree<dim>::AdditionalData
-                    (MPI_COMM_WORLD,
-                     MatrixFree<dim>::AdditionalData::none));
+                    (MatrixFree<dim>::AdditionalData::none));
   }
 
   system_matrix.vmult (solution, system_rhs);
index b04c47e4f15795cdf2cdb26090e94e061ce4119b..8030d11ff7d6e92f8a1e1ad34366757d3b1abb30 100644 (file)
@@ -83,20 +83,18 @@ void sub_test()
       {
         const QGauss<1> quad (fe_degree+1);
         mf_data.reinit (dof, constraints, quad,
-                        typename MatrixFree<dim,number>::AdditionalData(MPI_COMM_SELF,MatrixFree<dim,number>::AdditionalData::none));
+                        typename MatrixFree<dim,number>::AdditionalData(MatrixFree<dim,number>::AdditionalData::none));
 
         // choose block size of 3 which introduces
         // some irregularity to the blocks (stress the
         // non-overlapping computation harder)
         mf_data_color.reinit (dof, constraints, quad,
                               typename MatrixFree<dim,number>::AdditionalData
-                              (MPI_COMM_SELF,
-                               MatrixFree<dim,number>::AdditionalData::partition_color,
+                              (MatrixFree<dim,number>::AdditionalData::partition_color,
                                3));
         mf_data_partition.reinit (dof, constraints, quad,
                                   typename MatrixFree<dim,number>::AdditionalData
-                                  (MPI_COMM_SELF,
-                                   MatrixFree<dim,number>::AdditionalData::partition_partition,
+                                  (MatrixFree<dim,number>::AdditionalData::partition_partition,
                                    3));
       }
 

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.