From ff66dc857788994b999a7b6dbfe8317f69960dea Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sun, 1 Dec 2019 11:30:04 -0500 Subject: [PATCH] Remove restriction from Particles::Generators tests --- tests/particles/generators_01.cc | 4 +--- ...1.with_p4est=true.mpirun=1.output => generators_01.output} | 0 tests/particles/generators_02.cc | 4 +--- ...2.with_p4est=true.mpirun=1.output => generators_02.output} | 0 tests/particles/generators_03.cc | 4 +--- ...=true.mpirun=1.debug.output => generators_03.debug.output} | 0 ...e.mpirun=1.release.output => generators_03.release.output} | 0 tests/particles/generators_04.cc | 4 +--- ...4.with_p4est=true.mpirun=1.output => generators_04.output} | 0 9 files changed, 4 insertions(+), 12 deletions(-) rename tests/particles/{generators_01.with_p4est=true.mpirun=1.output => generators_01.output} (100%) rename tests/particles/{generators_02.with_p4est=true.mpirun=1.output => generators_02.output} (100%) rename tests/particles/{generators_03.with_p4est=true.mpirun=1.debug.output => generators_03.debug.output} (100%) rename tests/particles/{generators_03.with_p4est=true.mpirun=1.release.output => generators_03.release.output} (100%) rename tests/particles/{generators_04.with_p4est=true.mpirun=1.output => generators_04.output} (100%) diff --git a/tests/particles/generators_01.cc b/tests/particles/generators_01.cc index 0d08e3ee74..21a35261ce 100644 --- a/tests/particles/generators_01.cc +++ b/tests/particles/generators_01.cc @@ -35,7 +35,7 @@ void test() { { - parallel::distributed::Triangulation tr(MPI_COMM_WORLD); + Triangulation tr; GridGenerator::hyper_cube(tr); MappingQ mapping(1); @@ -66,8 +66,6 @@ test() int main(int argc, char *argv[]) { - Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - initlog(); deallog.push("2d/2d"); diff --git a/tests/particles/generators_01.with_p4est=true.mpirun=1.output b/tests/particles/generators_01.output similarity index 100% rename from tests/particles/generators_01.with_p4est=true.mpirun=1.output rename to tests/particles/generators_01.output diff --git a/tests/particles/generators_02.cc b/tests/particles/generators_02.cc index b0b8a2aea9..91e1b9f076 100644 --- a/tests/particles/generators_02.cc +++ b/tests/particles/generators_02.cc @@ -35,7 +35,7 @@ void test() { { - parallel::distributed::Triangulation tr(MPI_COMM_WORLD); + Triangulation tr; GridGenerator::hyper_cube(tr); tr.refine_global(1); @@ -71,8 +71,6 @@ test() int main(int argc, char *argv[]) { - Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - initlog(); deallog.push("2d/2d"); diff --git a/tests/particles/generators_02.with_p4est=true.mpirun=1.output b/tests/particles/generators_02.output similarity index 100% rename from tests/particles/generators_02.with_p4est=true.mpirun=1.output rename to tests/particles/generators_02.output diff --git a/tests/particles/generators_03.cc b/tests/particles/generators_03.cc index 9d65df4eda..486f30a515 100644 --- a/tests/particles/generators_03.cc +++ b/tests/particles/generators_03.cc @@ -39,7 +39,7 @@ void test() { { - parallel::distributed::Triangulation tr(MPI_COMM_WORLD); + Triangulation tr; GridGenerator::hyper_shell(tr, Point(), 0.5, 1.0); @@ -73,8 +73,6 @@ test() int main(int argc, char *argv[]) { - Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - initlog(); deallog.push("2d/2d"); diff --git a/tests/particles/generators_03.with_p4est=true.mpirun=1.debug.output b/tests/particles/generators_03.debug.output similarity index 100% rename from tests/particles/generators_03.with_p4est=true.mpirun=1.debug.output rename to tests/particles/generators_03.debug.output diff --git a/tests/particles/generators_03.with_p4est=true.mpirun=1.release.output b/tests/particles/generators_03.release.output similarity index 100% rename from tests/particles/generators_03.with_p4est=true.mpirun=1.release.output rename to tests/particles/generators_03.release.output diff --git a/tests/particles/generators_04.cc b/tests/particles/generators_04.cc index 9e3054bb4a..bfadaf254c 100644 --- a/tests/particles/generators_04.cc +++ b/tests/particles/generators_04.cc @@ -34,7 +34,7 @@ void test() { { - parallel::distributed::Triangulation tr(MPI_COMM_WORLD); + Triangulation tr; GridGenerator::hyper_cube(tr); MappingQ mapping(1); @@ -64,8 +64,6 @@ test() int main(int argc, char *argv[]) { - Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - initlog(); deallog.push("2d/2d"); diff --git a/tests/particles/generators_04.with_p4est=true.mpirun=1.output b/tests/particles/generators_04.output similarity index 100% rename from tests/particles/generators_04.with_p4est=true.mpirun=1.output rename to tests/particles/generators_04.output -- 2.39.5