From: maier Date: Fri, 13 Sep 2013 15:16:20 +0000 (+0000) Subject: Convert mpi tests X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a91153e9a6eb58adec312d7ba4740fadd4381cd5;p=dealii-svn.git Convert mpi tests git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30688 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/gla/Makefile b/tests/gla/Makefile deleted file mode 100644 index b1be076ca3..0000000000 --- a/tests/gla/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -############################################################ -# $Id: Makefile 17098 2008-10-03 19:27:13Z bangerth $ -# Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 by the deal.II authors -############################################################ - -############################################################ -# Include general settings for including DEAL libraries -############################################################ - -include ../Makefile.paths -include $D/common/Make.global_options - -default: run-tests - -############################################################ - -# all .cc-files are tests by default. - -ifeq ($(USE_CONTRIB_TRILINOS),no) - tests_x_1 = $(shell for i in *.cc ; do \ - if grep -q TrilinosWrappers $$i ; then \ - : ; \ - else \ - echo $$i ; \ - fi ; done) -else - tests_x_1 = $(wildcard *.cc) -endif - -tests = $(shell echo $(addsuffix /ncpu_*, $(basename $(tests_x_1)))) - - -############################################################ - - -OVERRIDE_OUTPUT_RULE = yes -include ../Makefile.rules -include Makefile.depend - - -Makefile.mpi.tests: Makefile $(shell echo *.cc) $(shell echo */*/cmp/generic) - @echo =====Targets======= $@ - @(for i in $(basename $(wildcard *.cc)) ; do \ - echo "$$i/exe : $$i/obj.g.\$$(OBJEXT) \$$(libraries)"; \ - done ; \ - for i in $(basename $(wildcard *.cc)) ; do \ - for j in $$i/ncpu_*; do \ - echo "$$j/output : $$i/exe" ; \ - done ; \ - done) \ - > $@ - -include Makefile.mpi.tests - -# override the rule from ../Makefile.rules by running things with -# mpirun -np X -get_ncpus = $(shell echo $(1) | $(PERL) -pi -e 's/.*ncpu_(\d+).*/\1/g;') -get_exe = $(shell echo $(1) | $(PERL) -pi -e 's/ncpu_.*/exe/g;') - -%/output: - @echo =====Running==MPI== $@ - @echo Running > $(dir $@)/status - @$(ULIMIT) -t 2400 ; \ - mpirun -np $(call get_ncpus, $@) ./$(call get_exe, $@) ; \ - if test ! $$? = 0 ; then rm $@ ; false ; fi - @perl -pi $(normalize) $@ - diff --git a/tests/gla/block_mat_01.cc b/tests/gla/block_mat_01.cc index e71a50da03..5587b43f45 100644 --- a/tests/gla/block_mat_01.cc +++ b/tests/gla/block_mat_01.cc @@ -92,7 +92,7 @@ void test () int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); diff --git a/tests/gla/block_mat_01/ncpu_10/cmp/generic b/tests/gla/block_mat_01.ncpu_10.output similarity index 100% rename from tests/gla/block_mat_01/ncpu_10/cmp/generic rename to tests/gla/block_mat_01.ncpu_10.output diff --git a/tests/gla/block_mat_01/ncpu_4/cmp/generic b/tests/gla/block_mat_01.ncpu_4.output similarity index 100% rename from tests/gla/block_mat_01/ncpu_4/cmp/generic rename to tests/gla/block_mat_01.ncpu_4.output diff --git a/tests/gla/block_mat_02.cc b/tests/gla/block_mat_02.cc index 03de0fc6b8..5fb7777d5b 100644 --- a/tests/gla/block_mat_02.cc +++ b/tests/gla/block_mat_02.cc @@ -227,7 +227,7 @@ void test_LA_Trilinos () int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); diff --git a/tests/gla/block_mat_02/ncpu_1/cmp/generic b/tests/gla/block_mat_02.with_trilinos=true.ncpu_1.output similarity index 100% rename from tests/gla/block_mat_02/ncpu_1/cmp/generic rename to tests/gla/block_mat_02.with_trilinos=true.ncpu_1.output diff --git a/tests/gla/block_mat_02/ncpu_2/cmp/generic b/tests/gla/block_mat_02.with_trilinos=true.ncpu_2.output similarity index 100% rename from tests/gla/block_mat_02/ncpu_2/cmp/generic rename to tests/gla/block_mat_02.with_trilinos=true.ncpu_2.output diff --git a/tests/gla/block_mat_02/ncpu_4/cmp/generic b/tests/gla/block_mat_02.with_trilinos=true.ncpu_4.output similarity index 100% rename from tests/gla/block_mat_02/ncpu_4/cmp/generic rename to tests/gla/block_mat_02.with_trilinos=true.ncpu_4.output diff --git a/tests/gla/block_mat_03.cc b/tests/gla/block_mat_03.cc index 8a46835da2..a68306a478 100644 --- a/tests/gla/block_mat_03.cc +++ b/tests/gla/block_mat_03.cc @@ -224,7 +224,7 @@ A.reinit(sp); int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); diff --git a/tests/gla/block_mat_03/ncpu_1/cmp/generic b/tests/gla/block_mat_03.with_trilinos=true.ncpu_1.output similarity index 100% rename from tests/gla/block_mat_03/ncpu_1/cmp/generic rename to tests/gla/block_mat_03.with_trilinos=true.ncpu_1.output diff --git a/tests/gla/block_mat_03/ncpu_2/cmp/generic b/tests/gla/block_mat_03.with_trilinos=true.ncpu_2.output similarity index 100% rename from tests/gla/block_mat_03/ncpu_2/cmp/generic rename to tests/gla/block_mat_03.with_trilinos=true.ncpu_2.output diff --git a/tests/gla/block_vec_01.cc b/tests/gla/block_vec_01.cc index e96be453c9..81b312ce41 100644 --- a/tests/gla/block_vec_01.cc +++ b/tests/gla/block_vec_01.cc @@ -84,7 +84,7 @@ void test () int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); test(); diff --git a/tests/gla/block_vec_01/ncpu_10/cmp/generic b/tests/gla/block_vec_01.ncpu_10.output similarity index 100% rename from tests/gla/block_vec_01/ncpu_10/cmp/generic rename to tests/gla/block_vec_01.ncpu_10.output diff --git a/tests/gla/block_vec_01/ncpu_4/cmp/generic b/tests/gla/block_vec_01.ncpu_4.output similarity index 100% rename from tests/gla/block_vec_01/ncpu_4/cmp/generic rename to tests/gla/block_vec_01.ncpu_4.output diff --git a/tests/gla/block_vec_02.cc b/tests/gla/block_vec_02.cc index 9fcad3fafb..864627576a 100644 --- a/tests/gla/block_vec_02.cc +++ b/tests/gla/block_vec_02.cc @@ -94,7 +94,7 @@ void test () int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); test(); diff --git a/tests/gla/block_vec_02/ncpu_2/cmp/generic b/tests/gla/block_vec_02.ncpu_2.output similarity index 100% rename from tests/gla/block_vec_02/ncpu_2/cmp/generic rename to tests/gla/block_vec_02.ncpu_2.output diff --git a/tests/gla/block_vec_02/ncpu_4/cmp/generic b/tests/gla/block_vec_02.ncpu_4.output similarity index 100% rename from tests/gla/block_vec_02/ncpu_4/cmp/generic rename to tests/gla/block_vec_02.ncpu_4.output diff --git a/tests/gla/block_vec_03.cc b/tests/gla/block_vec_03.cc index cd895ed9be..2901792e5e 100644 --- a/tests/gla/block_vec_03.cc +++ b/tests/gla/block_vec_03.cc @@ -92,7 +92,7 @@ void test () int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); test(); diff --git a/tests/gla/block_vec_03/ncpu_2/cmp/generic b/tests/gla/block_vec_03.ncpu_2.output similarity index 100% rename from tests/gla/block_vec_03/ncpu_2/cmp/generic rename to tests/gla/block_vec_03.ncpu_2.output diff --git a/tests/gla/block_vec_03/ncpu_4/cmp/generic b/tests/gla/block_vec_03.ncpu_4.output similarity index 100% rename from tests/gla/block_vec_03/ncpu_4/cmp/generic rename to tests/gla/block_vec_03.ncpu_4.output diff --git a/tests/gla/block_vec_04.cc b/tests/gla/block_vec_04.cc index ee5398d942..ab9a30ec8b 100644 --- a/tests/gla/block_vec_04.cc +++ b/tests/gla/block_vec_04.cc @@ -89,7 +89,7 @@ void test () int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); test(); diff --git a/tests/gla/block_vec_04/ncpu_2/cmp/generic b/tests/gla/block_vec_04.ncpu_2.output similarity index 100% rename from tests/gla/block_vec_04/ncpu_2/cmp/generic rename to tests/gla/block_vec_04.ncpu_2.output diff --git a/tests/gla/extract_subvector_to.cc b/tests/gla/extract_subvector_to.cc index e96721758c..cea07dfcc4 100644 --- a/tests/gla/extract_subvector_to.cc +++ b/tests/gla/extract_subvector_to.cc @@ -66,7 +66,7 @@ void test (Vector &vector) int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { { deallog.push("deal.II"); diff --git a/tests/gla/extract_subvector_to/ncpu_1/cmp/generic b/tests/gla/extract_subvector_to.with_trilinos=true.ncpu_1.output similarity index 100% rename from tests/gla/extract_subvector_to/ncpu_1/cmp/generic rename to tests/gla/extract_subvector_to.with_trilinos=true.ncpu_1.output diff --git a/tests/gla/extract_subvector_to_parallel.cc b/tests/gla/extract_subvector_to_parallel.cc index 80b5569363..dda88b8a15 100644 --- a/tests/gla/extract_subvector_to_parallel.cc +++ b/tests/gla/extract_subvector_to_parallel.cc @@ -74,7 +74,7 @@ void test (Vector &vector) int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); const unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); { IndexSet local (10); diff --git a/tests/gla/extract_subvector_to_parallel/ncpu_2/cmp/generic b/tests/gla/extract_subvector_to_parallel.with_trilinos=true.ncpu_2.output similarity index 100% rename from tests/gla/extract_subvector_to_parallel/ncpu_2/cmp/generic rename to tests/gla/extract_subvector_to_parallel.with_trilinos=true.ncpu_2.output diff --git a/tests/gla/mat_01.cc b/tests/gla/mat_01.cc index 21803813c2..65e592b477 100644 --- a/tests/gla/mat_01.cc +++ b/tests/gla/mat_01.cc @@ -89,7 +89,7 @@ void test () int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); test(); diff --git a/tests/gla/mat_01/ncpu_10/cmp/generic b/tests/gla/mat_01.ncpu_10.output similarity index 100% rename from tests/gla/mat_01/ncpu_10/cmp/generic rename to tests/gla/mat_01.ncpu_10.output diff --git a/tests/gla/mat_01/ncpu_4/cmp/generic b/tests/gla/mat_01.ncpu_4.output similarity index 100% rename from tests/gla/mat_01/ncpu_4/cmp/generic rename to tests/gla/mat_01.ncpu_4.output diff --git a/tests/gla/mat_02.cc b/tests/gla/mat_02.cc index 52f499c98b..0faed2dc3c 100644 --- a/tests/gla/mat_02.cc +++ b/tests/gla/mat_02.cc @@ -89,7 +89,7 @@ void test () int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); test(); diff --git a/tests/gla/mat_02/ncpu_2/cmp/generic b/tests/gla/mat_02.ncpu_2.output similarity index 100% rename from tests/gla/mat_02/ncpu_2/cmp/generic rename to tests/gla/mat_02.ncpu_2.output diff --git a/tests/gla/mat_03.cc b/tests/gla/mat_03.cc index 02e30102a7..39589bb058 100644 --- a/tests/gla/mat_03.cc +++ b/tests/gla/mat_03.cc @@ -111,7 +111,7 @@ void test () int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); diff --git a/tests/gla/mat_03/ncpu_2/cmp/generic b/tests/gla/mat_03.ncpu_2.output similarity index 100% rename from tests/gla/mat_03/ncpu_2/cmp/generic rename to tests/gla/mat_03.ncpu_2.output diff --git a/tests/gla/mat_04.cc b/tests/gla/mat_04.cc index 78f0a0f845..01fc9e1511 100644 --- a/tests/gla/mat_04.cc +++ b/tests/gla/mat_04.cc @@ -153,7 +153,7 @@ void test_trilinos_alternative () int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); diff --git a/tests/gla/mat_04/ncpu_2/cmp/generic b/tests/gla/mat_04.with_trilinos=true.ncpu_2.output similarity index 100% rename from tests/gla/mat_04/ncpu_2/cmp/generic rename to tests/gla/mat_04.with_trilinos=true.ncpu_2.output diff --git a/tests/gla/vec_00.cc b/tests/gla/vec_00.cc index 1ccfb00af1..3d42e13d64 100644 --- a/tests/gla/vec_00.cc +++ b/tests/gla/vec_00.cc @@ -89,7 +89,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("vec_00").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/gla/vec_00/ncpu_10/cmp/generic b/tests/gla/vec_00.ncpu_10.output similarity index 100% rename from tests/gla/vec_00/ncpu_10/cmp/generic rename to tests/gla/vec_00.ncpu_10.output diff --git a/tests/gla/vec_00/ncpu_4/cmp/generic b/tests/gla/vec_00.ncpu_4.output similarity index 100% rename from tests/gla/vec_00/ncpu_4/cmp/generic rename to tests/gla/vec_00.ncpu_4.output diff --git a/tests/gla/vec_01.cc b/tests/gla/vec_01.cc index 6ff6788bae..7944ebcb0c 100644 --- a/tests/gla/vec_01.cc +++ b/tests/gla/vec_01.cc @@ -94,7 +94,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("vec_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/gla/vec_01/ncpu_10/cmp/generic b/tests/gla/vec_01.ncpu_10.output similarity index 100% rename from tests/gla/vec_01/ncpu_10/cmp/generic rename to tests/gla/vec_01.ncpu_10.output diff --git a/tests/gla/vec_01/ncpu_4/cmp/generic b/tests/gla/vec_01.ncpu_4.output similarity index 100% rename from tests/gla/vec_01/ncpu_4/cmp/generic rename to tests/gla/vec_01.ncpu_4.output diff --git a/tests/gla/vec_02.cc b/tests/gla/vec_02.cc index 8997016cce..6b9d3e058b 100644 --- a/tests/gla/vec_02.cc +++ b/tests/gla/vec_02.cc @@ -106,7 +106,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("vec_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/gla/vec_02/ncpu_10/cmp/generic b/tests/gla/vec_02.ncpu_10.output similarity index 100% rename from tests/gla/vec_02/ncpu_10/cmp/generic rename to tests/gla/vec_02.ncpu_10.output diff --git a/tests/gla/vec_02/ncpu_4/cmp/generic b/tests/gla/vec_02.ncpu_4.output similarity index 100% rename from tests/gla/vec_02/ncpu_4/cmp/generic rename to tests/gla/vec_02.ncpu_4.output diff --git a/tests/gla/vec_03.cc b/tests/gla/vec_03.cc index b765b27bc4..9e497320bc 100644 --- a/tests/gla/vec_03.cc +++ b/tests/gla/vec_03.cc @@ -95,7 +95,7 @@ void test () int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); test(); diff --git a/tests/gla/vec_03/ncpu_10/cmp/generic b/tests/gla/vec_03.ncpu_10.output similarity index 100% rename from tests/gla/vec_03/ncpu_10/cmp/generic rename to tests/gla/vec_03.ncpu_10.output diff --git a/tests/gla/vec_03/ncpu_4/cmp/generic b/tests/gla/vec_03.ncpu_4.output similarity index 100% rename from tests/gla/vec_03/ncpu_4/cmp/generic rename to tests/gla/vec_03.ncpu_4.output diff --git a/tests/gla/vec_04.cc b/tests/gla/vec_04.cc index 4576121544..db355fe4a9 100644 --- a/tests/gla/vec_04.cc +++ b/tests/gla/vec_04.cc @@ -97,7 +97,7 @@ void test () int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); test(); diff --git a/tests/gla/vec_04/ncpu_2/cmp/generic b/tests/gla/vec_04.ncpu_2.output similarity index 100% rename from tests/gla/vec_04/ncpu_2/cmp/generic rename to tests/gla/vec_04.ncpu_2.output diff --git a/tests/gla/vec_04/ncpu_4/cmp/generic b/tests/gla/vec_04.ncpu_4.output similarity index 100% rename from tests/gla/vec_04/ncpu_4/cmp/generic rename to tests/gla/vec_04.ncpu_4.output diff --git a/tests/gla/vec_05.cc b/tests/gla/vec_05.cc index fee6b4ee23..db5b503f24 100644 --- a/tests/gla/vec_05.cc +++ b/tests/gla/vec_05.cc @@ -95,7 +95,7 @@ void test () int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); test(); diff --git a/tests/gla/vec_05/ncpu_2/cmp/generic b/tests/gla/vec_05.ncpu_2.output similarity index 100% rename from tests/gla/vec_05/ncpu_2/cmp/generic rename to tests/gla/vec_05.ncpu_2.output diff --git a/tests/gla/vec_05/ncpu_4/cmp/generic b/tests/gla/vec_05.ncpu_4.output similarity index 100% rename from tests/gla/vec_05/ncpu_4/cmp/generic rename to tests/gla/vec_05.ncpu_4.output diff --git a/tests/gla/vec_06.cc b/tests/gla/vec_06.cc index 562dbecd46..3f9dea4fb0 100644 --- a/tests/gla/vec_06.cc +++ b/tests/gla/vec_06.cc @@ -82,7 +82,7 @@ void test () int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); { deallog.push("PETSc"); test(); diff --git a/tests/gla/vec_06/ncpu_10/cmp/generic b/tests/gla/vec_06.ncpu_10.output similarity index 100% rename from tests/gla/vec_06/ncpu_10/cmp/generic rename to tests/gla/vec_06.ncpu_10.output diff --git a/tests/gla/vec_06/ncpu_4/cmp/generic b/tests/gla/vec_06.ncpu_4.output similarity index 100% rename from tests/gla/vec_06/ncpu_4/cmp/generic rename to tests/gla/vec_06.ncpu_4.output diff --git a/tests/mpi/Makefile b/tests/mpi/Makefile deleted file mode 100644 index 218ec45652..0000000000 --- a/tests/mpi/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -############################################################ -# $Id: Makefile 17098 2008-10-03 19:27:13Z bangerth $ -# Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013 by the deal.II authors -############################################################ - -############################################################ -# Include general settings for including DEAL libraries -############################################################ - -include ../Makefile.paths -include $D/common/Make.global_options - -default: run-tests - -############################################################ - -# all .cc-files are tests by default. After that, find out which tests -# require unconfigured prerequisites and eliminate those. - -tests_all = $(wildcard *.cc) -ifeq ($(USE_CONTRIB_PETSC),no) - tests1 = $(foreach file, $(tests_all), $(shell grep -L PETScWrappers $(file))) -else - tests1 = $(tests_all) -endif - -ifeq ($(USE_CONTRIB_TRILINOS),no) - tests2 = $(foreach file, $(tests1), $(shell grep -L TrilinosWrappers $(file))) -else - tests2 = $(tests1) -endif - -tests_cc = $(tests2) -tests_base = $(basename $(tests2)) -tests = $(foreach file, $(tests_base), $(wildcard $(file)/ncpu_*)) -test: - @echo $(tests) -############################################################ - - -OVERRIDE_OUTPUT_RULE = yes -include ../Makefile.rules --include Makefile.depend - - -Makefile.mpi.tests: Makefile $(wildcard *.cc) $(shell echo */*/cmp/generic) - @echo =====Targets======= $@ - @(for i in $(tests_base) ; do \ - echo "$$i/exe : $$i/obj.g.\$$(OBJEXT) \$$(libraries)"; \ - done ; \ - for i in $(tests_base) ; do \ - for j in $$i/ncpu_*; do \ - echo "$$j/output : $$i/exe" ; \ - done ; \ - done) \ - > $@ - --include Makefile.mpi.tests - -# override the rule from ../Makefile.rules by running things with -# mpirun -np X -get_ncpus = $(shell echo $(1) | $(PERL) -pi -e 's/.*ncpu_(\d+).*/\1/g;') -get_exe = $(shell echo $(1) | $(PERL) -pi -e 's/ncpu_.*/exe/g;') - -%/output: - @echo =====Running==MPI== $@ - @echo Running > $(dir $@)/status - @$(ULIMIT) -t 2400 ; \ - mpirun -np $(call get_ncpus, $@) ./$(call get_exe, $@) ; \ - if test ! $$? = 0 ; then rm -f $@ ; false ; fi - @perl -pi $(normalize) $@ - diff --git a/tests/mpi/blockvec_01.cc b/tests/mpi/blockvec_01.cc index a764e0efef..0ed5b503e6 100644 --- a/tests/mpi/blockvec_01.cc +++ b/tests/mpi/blockvec_01.cc @@ -63,7 +63,7 @@ void test () deallog << "size[1]: " << v.block(1).size() << std::endl; { - std::ofstream file((JobIdentifier::base_name(__FILE__)+"/ncpu_" + Utilities::int_to_string(Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD)) + "/dat." + Utilities::int_to_string(myid)).c_str()); + std::ofstream file (("dat." + Utilities::int_to_string(myid)).c_str()); file << "**** proc " << myid << std::endl; v.print(file); @@ -75,7 +75,7 @@ void test () { for (unsigned int i=0; i &fe) if (numprocs==1) // renumber DoFs { std::map > dofmap; - std::ifstream f("mesh_worker_matrix_01/ordering.2"); + std::ifstream f(SOURCE_DIR "/mesh_worker_matrix_01/ordering.2"); while (!f.eof()) { CellId id; @@ -281,7 +281,7 @@ test(const FiniteElement &fe) int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); - MPILogInitAll i(__FILE__); + MPILogInitAll i(); FE_DGP<2> p0(0); FE_Q<2> q1(1); diff --git a/tests/mpi/mesh_worker_matrix_01/ncpu_1/cmp/generic b/tests/mpi/mesh_worker_matrix_01.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/mesh_worker_matrix_01/ncpu_1/cmp/generic rename to tests/mpi/mesh_worker_matrix_01.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/mesh_worker_matrix_01/ncpu_2/cmp/generic b/tests/mpi/mesh_worker_matrix_01.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/mesh_worker_matrix_01/ncpu_2/cmp/generic rename to tests/mpi/mesh_worker_matrix_01.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/mg_01.cc b/tests/mpi/mg_01.cc index a409435543..00a96f3bd9 100644 --- a/tests/mpi/mg_01.cc +++ b/tests/mpi/mg_01.cc @@ -109,7 +109,7 @@ void test() int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); deallog.push("2d"); test<2>(); diff --git a/tests/mpi/mg_01/ncpu_10/cmp/generic b/tests/mpi/mg_01.mpirun=10.output similarity index 100% rename from tests/mpi/mg_01/ncpu_10/cmp/generic rename to tests/mpi/mg_01.mpirun=10.output diff --git a/tests/mpi/mg_01/ncpu_4/cmp/generic b/tests/mpi/mg_01.mpirun=4.output similarity index 100% rename from tests/mpi/mg_01/ncpu_4/cmp/generic rename to tests/mpi/mg_01.mpirun=4.output diff --git a/tests/mpi/mg_02.cc b/tests/mpi/mg_02.cc index 171f110fac..7f8f19db52 100644 --- a/tests/mpi/mg_02.cc +++ b/tests/mpi/mg_02.cc @@ -113,7 +113,7 @@ void test() int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); deallog.push("2d"); test<2>(); diff --git a/tests/mpi/mg_02/ncpu_10/cmp/generic b/tests/mpi/mg_02.mpirun=10.output similarity index 100% rename from tests/mpi/mg_02/ncpu_10/cmp/generic rename to tests/mpi/mg_02.mpirun=10.output diff --git a/tests/mpi/mg_02/ncpu_4/cmp/generic b/tests/mpi/mg_02.mpirun=4.output similarity index 100% rename from tests/mpi/mg_02/ncpu_4/cmp/generic rename to tests/mpi/mg_02.mpirun=4.output diff --git a/tests/mpi/mg_03.cc b/tests/mpi/mg_03.cc index 0b5ce46215..328ed82532 100644 --- a/tests/mpi/mg_03.cc +++ b/tests/mpi/mg_03.cc @@ -118,7 +118,7 @@ void test() int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); deallog.push("2d"); test<2>(); diff --git a/tests/mpi/mg_03/ncpu_1/cmp/generic b/tests/mpi/mg_03.mpirun=1.output similarity index 100% rename from tests/mpi/mg_03/ncpu_1/cmp/generic rename to tests/mpi/mg_03.mpirun=1.output diff --git a/tests/mpi/mg_03/ncpu_10/cmp/generic b/tests/mpi/mg_03.mpirun=10.output similarity index 100% rename from tests/mpi/mg_03/ncpu_10/cmp/generic rename to tests/mpi/mg_03.mpirun=10.output diff --git a/tests/mpi/mg_03/ncpu_4/cmp/generic b/tests/mpi/mg_03.mpirun=4.output similarity index 100% rename from tests/mpi/mg_03/ncpu_4/cmp/generic rename to tests/mpi/mg_03.mpirun=4.output diff --git a/tests/mpi/mg_04.cc b/tests/mpi/mg_04.cc index e8b104a628..40d5daf1bd 100644 --- a/tests/mpi/mg_04.cc +++ b/tests/mpi/mg_04.cc @@ -114,7 +114,7 @@ void test() int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); deallog.push("2d"); test<2>(); diff --git a/tests/mpi/mg_04/ncpu_1/cmp/generic b/tests/mpi/mg_04.mpirun=1.output similarity index 100% rename from tests/mpi/mg_04/ncpu_1/cmp/generic rename to tests/mpi/mg_04.mpirun=1.output diff --git a/tests/mpi/mg_04/ncpu_10/cmp/generic b/tests/mpi/mg_04.mpirun=10.output similarity index 100% rename from tests/mpi/mg_04/ncpu_10/cmp/generic rename to tests/mpi/mg_04.mpirun=10.output diff --git a/tests/mpi/mg_04/ncpu_2/cmp/generic b/tests/mpi/mg_04.mpirun=2.output similarity index 100% rename from tests/mpi/mg_04/ncpu_2/cmp/generic rename to tests/mpi/mg_04.mpirun=2.output diff --git a/tests/mpi/mg_04/ncpu_4/cmp/generic b/tests/mpi/mg_04.mpirun=4.output similarity index 100% rename from tests/mpi/mg_04/ncpu_4/cmp/generic rename to tests/mpi/mg_04.mpirun=4.output diff --git a/tests/mpi/mg_05.cc b/tests/mpi/mg_05.cc index a4880bbefb..15f47f1a78 100644 --- a/tests/mpi/mg_05.cc +++ b/tests/mpi/mg_05.cc @@ -156,7 +156,7 @@ void test() int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); deallog.push("2d"); test<2>(); diff --git a/tests/mpi/mg_05/ncpu_10/cmp/generic b/tests/mpi/mg_05.mpirun=10.output similarity index 100% rename from tests/mpi/mg_05/ncpu_10/cmp/generic rename to tests/mpi/mg_05.mpirun=10.output diff --git a/tests/mpi/multigrid_adaptive.cc b/tests/mpi/multigrid_adaptive.cc index 72b519329e..95d256af9e 100644 --- a/tests/mpi/multigrid_adaptive.cc +++ b/tests/mpi/multigrid_adaptive.cc @@ -507,7 +507,7 @@ namespace Step50 int main (int argc, char *argv[]) { dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); - mpi_initlog(__FILE__); + mpi_initlog(); try { diff --git a/tests/mpi/multigrid_adaptive/ncpu_1/cmp/generic b/tests/mpi/multigrid_adaptive.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/multigrid_adaptive/ncpu_1/cmp/generic rename to tests/mpi/multigrid_adaptive.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/multigrid_adaptive/ncpu_4/cmp/generic b/tests/mpi/multigrid_adaptive.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/multigrid_adaptive/ncpu_4/cmp/generic rename to tests/mpi/multigrid_adaptive.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/multigrid_uniform.cc b/tests/mpi/multigrid_uniform.cc index 4c2b36faac..50af594234 100644 --- a/tests/mpi/multigrid_uniform.cc +++ b/tests/mpi/multigrid_uniform.cc @@ -501,7 +501,7 @@ namespace Step50 int main (int argc, char *argv[]) { dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); - mpi_initlog(__FILE__); + mpi_initlog(); try { diff --git a/tests/mpi/multigrid_uniform/ncpu_1/cmp/generic b/tests/mpi/multigrid_uniform.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/multigrid_uniform/ncpu_1/cmp/generic rename to tests/mpi/multigrid_uniform.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/multigrid_uniform/ncpu_4/cmp/generic b/tests/mpi/multigrid_uniform.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/multigrid_uniform/ncpu_4/cmp/generic rename to tests/mpi/multigrid_uniform.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/no_flux_constraints.cc b/tests/mpi/no_flux_constraints.cc index e3a5ce17cc..d400e9d659 100644 --- a/tests/mpi/no_flux_constraints.cc +++ b/tests/mpi/no_flux_constraints.cc @@ -179,7 +179,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("no_flux_constraints").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/no_flux_constraints/ncpu_9/cmp/generic b/tests/mpi/no_flux_constraints.with_trilinos=true.mpirun=9.output similarity index 100% rename from tests/mpi/no_flux_constraints/ncpu_9/cmp/generic rename to tests/mpi/no_flux_constraints.with_trilinos=true.mpirun=9.output diff --git a/tests/mpi/no_flux_constraints_02.cc b/tests/mpi/no_flux_constraints_02.cc index 9f4c3e3891..8b94eae39a 100644 --- a/tests/mpi/no_flux_constraints_02.cc +++ b/tests/mpi/no_flux_constraints_02.cc @@ -223,7 +223,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("no_flux_constraints_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/no_flux_constraints_02/ncpu_1/cmp/generic b/tests/mpi/no_flux_constraints_02.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/no_flux_constraints_02/ncpu_1/cmp/generic rename to tests/mpi/no_flux_constraints_02.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/no_flux_constraints_02/ncpu_9/cmp/generic b/tests/mpi/no_flux_constraints_02.with_trilinos=true.mpirun=9.output similarity index 100% rename from tests/mpi/no_flux_constraints_02/ncpu_9/cmp/generic rename to tests/mpi/no_flux_constraints_02.with_trilinos=true.mpirun=9.output diff --git a/tests/mpi/no_flux_constraints_03.cc b/tests/mpi/no_flux_constraints_03.cc index 0ea73accaf..a9d119f759 100644 --- a/tests/mpi/no_flux_constraints_03.cc +++ b/tests/mpi/no_flux_constraints_03.cc @@ -196,7 +196,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("no_flux_constraints_03").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/no_flux_constraints_03/ncpu_1/cmp/generic b/tests/mpi/no_flux_constraints_03.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/no_flux_constraints_03/ncpu_1/cmp/generic rename to tests/mpi/no_flux_constraints_03.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/no_flux_constraints_03/ncpu_9/cmp/generic b/tests/mpi/no_flux_constraints_03.with_trilinos=true.mpirun=9.output similarity index 100% rename from tests/mpi/no_flux_constraints_03/ncpu_9/cmp/generic rename to tests/mpi/no_flux_constraints_03.with_trilinos=true.mpirun=9.output diff --git a/tests/mpi/normal_flux_constraints.cc b/tests/mpi/normal_flux_constraints.cc index e71a35f256..bc71dcd088 100644 --- a/tests/mpi/normal_flux_constraints.cc +++ b/tests/mpi/normal_flux_constraints.cc @@ -178,7 +178,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("normal_flux_constraints").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/normal_flux_constraints/ncpu_9/cmp/generic b/tests/mpi/normal_flux_constraints.with_trilinos=true.mpirun=9.output similarity index 100% rename from tests/mpi/normal_flux_constraints/ncpu_9/cmp/generic rename to tests/mpi/normal_flux_constraints.with_trilinos=true.mpirun=9.output diff --git a/tests/mpi/p4est_2d_coarse_01.cc b/tests/mpi/p4est_2d_coarse_01.cc index 095bf8208b..90246d3ae3 100644 --- a/tests/mpi/p4est_2d_coarse_01.cc +++ b/tests/mpi/p4est_2d_coarse_01.cc @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_coarse_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_coarse_01/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_coarse_01.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_coarse_01/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_coarse_01.mpirun=10.output diff --git a/tests/mpi/p4est_2d_coarse_01/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_coarse_01.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_coarse_01/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_coarse_01.mpirun=4.output diff --git a/tests/mpi/p4est_2d_constraintmatrix_01.cc b/tests/mpi/p4est_2d_constraintmatrix_01.cc index de0360a56d..764af6614c 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_01.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_01.cc @@ -104,7 +104,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_constraintmatrix_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_constraintmatrix_01/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_constraintmatrix_01.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_constraintmatrix_01/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_constraintmatrix_01.mpirun=10.output diff --git a/tests/mpi/p4est_2d_constraintmatrix_01/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_constraintmatrix_01.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_constraintmatrix_01/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_constraintmatrix_01.mpirun=4.output diff --git a/tests/mpi/p4est_2d_constraintmatrix_02.cc b/tests/mpi/p4est_2d_constraintmatrix_02.cc index bf88a996f8..b42ef8a71c 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_02.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_02.cc @@ -104,7 +104,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_constraintmatrix_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_constraintmatrix_02/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_constraintmatrix_02.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_constraintmatrix_02/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_constraintmatrix_02.mpirun=10.output diff --git a/tests/mpi/p4est_2d_constraintmatrix_02/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_constraintmatrix_02.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_constraintmatrix_02/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_constraintmatrix_02.mpirun=4.output diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.cc b/tests/mpi/p4est_2d_constraintmatrix_03.cc index fc8a52dd8f..c3b4afa984 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_03.cc @@ -234,7 +234,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_constraintmatrix_03").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_constraintmatrix_03/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_constraintmatrix_03.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_constraintmatrix_03/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_constraintmatrix_03.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/p4est_2d_constraintmatrix_03/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_constraintmatrix_03.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_constraintmatrix_03/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_constraintmatrix_03.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/p4est_2d_constraintmatrix_04.cc b/tests/mpi/p4est_2d_constraintmatrix_04.cc index bb60437849..0fd11247bd 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_04.cc @@ -329,7 +329,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_constraintmatrix_04").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_constraintmatrix_04/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_constraintmatrix_04.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_constraintmatrix_04/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_constraintmatrix_04.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/p4est_2d_constraintmatrix_04/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_constraintmatrix_04.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_constraintmatrix_04/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_constraintmatrix_04.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/p4est_2d_constraintmatrix_05.cc b/tests/mpi/p4est_2d_constraintmatrix_05.cc index 40f5ec46b3..d18b60429a 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_05.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_05.cc @@ -107,7 +107,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_constraintmatrix_05").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_constraintmatrix_05/ncpu_2/cmp/generic b/tests/mpi/p4est_2d_constraintmatrix_05.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/p4est_2d_constraintmatrix_05/ncpu_2/cmp/generic rename to tests/mpi/p4est_2d_constraintmatrix_05.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/p4est_2d_dofhandler_01.cc b/tests/mpi/p4est_2d_dofhandler_01.cc index a9f4849fdf..b7e7e6f551 100644 --- a/tests/mpi/p4est_2d_dofhandler_01.cc +++ b/tests/mpi/p4est_2d_dofhandler_01.cc @@ -95,7 +95,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_dofhandler_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_dofhandler_01/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_dofhandler_01.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_dofhandler_01/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_dofhandler_01.mpirun=10.output diff --git a/tests/mpi/p4est_2d_dofhandler_01/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_dofhandler_01.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_dofhandler_01/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_dofhandler_01.mpirun=4.output diff --git a/tests/mpi/p4est_2d_dofhandler_02.cc b/tests/mpi/p4est_2d_dofhandler_02.cc index ee405ebce4..dc10d4bb8c 100644 --- a/tests/mpi/p4est_2d_dofhandler_02.cc +++ b/tests/mpi/p4est_2d_dofhandler_02.cc @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_dofhandler_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_dofhandler_02/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_dofhandler_02.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_dofhandler_02/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_dofhandler_02.mpirun=10.output diff --git a/tests/mpi/p4est_2d_dofhandler_02/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_dofhandler_02.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_dofhandler_02/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_dofhandler_02.mpirun=4.output diff --git a/tests/mpi/p4est_2d_dofhandler_03.cc b/tests/mpi/p4est_2d_dofhandler_03.cc index ec67bb81e6..e97752de3e 100644 --- a/tests/mpi/p4est_2d_dofhandler_03.cc +++ b/tests/mpi/p4est_2d_dofhandler_03.cc @@ -127,7 +127,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_dofhandler_03").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_dofhandler_03/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_dofhandler_03.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_dofhandler_03/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_dofhandler_03.mpirun=10.output diff --git a/tests/mpi/p4est_2d_dofhandler_03/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_dofhandler_03.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_dofhandler_03/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_dofhandler_03.mpirun=4.output diff --git a/tests/mpi/p4est_2d_dofhandler_04.cc b/tests/mpi/p4est_2d_dofhandler_04.cc index 25e17bb583..12f4ae3c94 100644 --- a/tests/mpi/p4est_2d_dofhandler_04.cc +++ b/tests/mpi/p4est_2d_dofhandler_04.cc @@ -137,7 +137,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_dofhandler_04").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_dofhandler_04/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_dofhandler_04.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_dofhandler_04/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_dofhandler_04.mpirun=10.output diff --git a/tests/mpi/p4est_2d_dofhandler_04/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_dofhandler_04.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_dofhandler_04/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_dofhandler_04.mpirun=4.output diff --git a/tests/mpi/p4est_2d_dofhandler_05.cc b/tests/mpi/p4est_2d_dofhandler_05.cc index acb00a71c3..d8b41b3ae8 100644 --- a/tests/mpi/p4est_2d_dofhandler_05.cc +++ b/tests/mpi/p4est_2d_dofhandler_05.cc @@ -75,7 +75,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_dofhandler_05").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_dofhandler_05/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_dofhandler_05.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_dofhandler_05/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_dofhandler_05.mpirun=10.output diff --git a/tests/mpi/p4est_2d_dofhandler_05/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_dofhandler_05.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_dofhandler_05/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_dofhandler_05.mpirun=4.output diff --git a/tests/mpi/p4est_2d_ghost_01.cc b/tests/mpi/p4est_2d_ghost_01.cc index 626684e29e..a87dd15062 100644 --- a/tests/mpi/p4est_2d_ghost_01.cc +++ b/tests/mpi/p4est_2d_ghost_01.cc @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_ghost_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_ghost_01/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_ghost_01.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_ghost_01/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_ghost_01.mpirun=10.output diff --git a/tests/mpi/p4est_2d_ghost_01/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_ghost_01.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_ghost_01/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_ghost_01.mpirun=4.output diff --git a/tests/mpi/p4est_2d_ghost_02.cc b/tests/mpi/p4est_2d_ghost_02.cc index 8539c27e21..5adf8c811e 100644 --- a/tests/mpi/p4est_2d_ghost_02.cc +++ b/tests/mpi/p4est_2d_ghost_02.cc @@ -125,7 +125,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_ghost_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_ghost_02/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_ghost_02.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_ghost_02/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_ghost_02.mpirun=10.output diff --git a/tests/mpi/p4est_2d_ghost_02/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_ghost_02.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_ghost_02/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_ghost_02.mpirun=4.output diff --git a/tests/mpi/p4est_2d_refine_01.cc b/tests/mpi/p4est_2d_refine_01.cc index f4709b2a11..3bcf053da6 100644 --- a/tests/mpi/p4est_2d_refine_01.cc +++ b/tests/mpi/p4est_2d_refine_01.cc @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_refine_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_refine_01/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_refine_01.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_refine_01/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_refine_01.mpirun=10.output diff --git a/tests/mpi/p4est_2d_refine_01/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_refine_01.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_refine_01/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_refine_01.mpirun=4.output diff --git a/tests/mpi/p4est_2d_refine_02.cc b/tests/mpi/p4est_2d_refine_02.cc index 65c3787151..f73783a3c7 100644 --- a/tests/mpi/p4est_2d_refine_02.cc +++ b/tests/mpi/p4est_2d_refine_02.cc @@ -92,7 +92,7 @@ void test() int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); deallog.push("2d"); test<2>(); diff --git a/tests/mpi/p4est_2d_refine_02/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_refine_02.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_refine_02/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_refine_02.mpirun=10.output diff --git a/tests/mpi/p4est_2d_refine_02/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_refine_02.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_refine_02/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_refine_02.mpirun=4.output diff --git a/tests/mpi/p4est_2d_refine_03.cc b/tests/mpi/p4est_2d_refine_03.cc index 2d3e86fc4a..b9de49010d 100644 --- a/tests/mpi/p4est_2d_refine_03.cc +++ b/tests/mpi/p4est_2d_refine_03.cc @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_refine_03").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_refine_03/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_refine_03.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_refine_03/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_refine_03.mpirun=10.output diff --git a/tests/mpi/p4est_2d_refine_03/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_refine_03.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_refine_03/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_refine_03.mpirun=4.output diff --git a/tests/mpi/p4est_2d_renumber_01.cc b/tests/mpi/p4est_2d_renumber_01.cc index 2ee57c1428..becfc5823a 100644 --- a/tests/mpi/p4est_2d_renumber_01.cc +++ b/tests/mpi/p4est_2d_renumber_01.cc @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_renumber_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_renumber_01/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_renumber_01.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_renumber_01/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_renumber_01.mpirun=10.output diff --git a/tests/mpi/p4est_2d_renumber_01/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_renumber_01.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_renumber_01/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_renumber_01.mpirun=4.output diff --git a/tests/mpi/p4est_2d_renumber_02.cc b/tests/mpi/p4est_2d_renumber_02.cc index 73af9407b9..bcc9483662 100644 --- a/tests/mpi/p4est_2d_renumber_02.cc +++ b/tests/mpi/p4est_2d_renumber_02.cc @@ -124,7 +124,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_renumber_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_renumber_02/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_renumber_02.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_renumber_02/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_renumber_02.mpirun=10.output diff --git a/tests/mpi/p4est_2d_renumber_02/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_renumber_02.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_renumber_02/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_renumber_02.mpirun=4.output diff --git a/tests/mpi/p4est_2d_simple.cc b/tests/mpi/p4est_2d_simple.cc index a94c17c09a..6688efdf46 100644 --- a/tests/mpi/p4est_2d_simple.cc +++ b/tests/mpi/p4est_2d_simple.cc @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_2d_simple").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_2d_simple/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_simple.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_2d_simple/ncpu_10/cmp/generic rename to tests/mpi/p4est_2d_simple.mpirun=10.output diff --git a/tests/mpi/p4est_2d_simple/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_simple.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_2d_simple/ncpu_4/cmp/generic rename to tests/mpi/p4est_2d_simple.mpirun=4.output diff --git a/tests/mpi/p4est_3d_constraintmatrix_01.cc b/tests/mpi/p4est_3d_constraintmatrix_01.cc index 802c97f28d..895e260490 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_01.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_01.cc @@ -114,7 +114,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_3d_constraintmatrix_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_3d_constraintmatrix_01/ncpu_10/cmp/generic b/tests/mpi/p4est_3d_constraintmatrix_01.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_3d_constraintmatrix_01/ncpu_10/cmp/generic rename to tests/mpi/p4est_3d_constraintmatrix_01.mpirun=10.output diff --git a/tests/mpi/p4est_3d_constraintmatrix_01/ncpu_4/cmp/generic b/tests/mpi/p4est_3d_constraintmatrix_01.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_3d_constraintmatrix_01/ncpu_4/cmp/generic rename to tests/mpi/p4est_3d_constraintmatrix_01.mpirun=4.output diff --git a/tests/mpi/p4est_3d_constraintmatrix_02.cc b/tests/mpi/p4est_3d_constraintmatrix_02.cc index 3661d7195a..46d10f0563 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_02.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_02.cc @@ -142,7 +142,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_3d_constraintmatrix_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_3d_constraintmatrix_02/ncpu_10/cmp/generic b/tests/mpi/p4est_3d_constraintmatrix_02.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_3d_constraintmatrix_02/ncpu_10/cmp/generic rename to tests/mpi/p4est_3d_constraintmatrix_02.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/p4est_3d_constraintmatrix_02/ncpu_4/cmp/generic b/tests/mpi/p4est_3d_constraintmatrix_02.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_3d_constraintmatrix_02/ncpu_4/cmp/generic rename to tests/mpi/p4est_3d_constraintmatrix_02.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/p4est_3d_constraintmatrix_03.cc b/tests/mpi/p4est_3d_constraintmatrix_03.cc index 98164f7cd4..7f4b39f851 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_03.cc @@ -325,7 +325,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_3d_constraintmatrix_03").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_3d_constraintmatrix_03/ncpu_10/cmp/generic b/tests/mpi/p4est_3d_constraintmatrix_03.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_3d_constraintmatrix_03/ncpu_10/cmp/generic rename to tests/mpi/p4est_3d_constraintmatrix_03.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/p4est_3d_constraintmatrix_03/ncpu_4/cmp/generic b/tests/mpi/p4est_3d_constraintmatrix_03.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_3d_constraintmatrix_03/ncpu_4/cmp/generic rename to tests/mpi/p4est_3d_constraintmatrix_03.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/p4est_3d_constraintmatrix_04.cc b/tests/mpi/p4est_3d_constraintmatrix_04.cc index 1d3ca34a56..49e11d0112 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_04.cc @@ -102,7 +102,7 @@ int main(int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_3d_constraintmatrix_04").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_3d_constraintmatrix_04/ncpu_2/cmp/generic b/tests/mpi/p4est_3d_constraintmatrix_04.mpirun=2.output similarity index 100% rename from tests/mpi/p4est_3d_constraintmatrix_04/ncpu_2/cmp/generic rename to tests/mpi/p4est_3d_constraintmatrix_04.mpirun=2.output diff --git a/tests/mpi/p4est_3d_ghost_01.cc b/tests/mpi/p4est_3d_ghost_01.cc index 54f183c7ed..56329089ad 100644 --- a/tests/mpi/p4est_3d_ghost_01.cc +++ b/tests/mpi/p4est_3d_ghost_01.cc @@ -137,7 +137,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_3d_ghost_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_3d_ghost_01/ncpu_10/cmp/generic b/tests/mpi/p4est_3d_ghost_01.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_3d_ghost_01/ncpu_10/cmp/generic rename to tests/mpi/p4est_3d_ghost_01.mpirun=10.output diff --git a/tests/mpi/p4est_3d_ghost_01/ncpu_4/cmp/generic b/tests/mpi/p4est_3d_ghost_01.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_3d_ghost_01/ncpu_4/cmp/generic rename to tests/mpi/p4est_3d_ghost_01.mpirun=4.output diff --git a/tests/mpi/p4est_3d_refine_01.cc b/tests/mpi/p4est_3d_refine_01.cc index 66922e3900..484cc12dcb 100644 --- a/tests/mpi/p4est_3d_refine_01.cc +++ b/tests/mpi/p4est_3d_refine_01.cc @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_3d_refine_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_3d_refine_01/ncpu_10/cmp/generic b/tests/mpi/p4est_3d_refine_01.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_3d_refine_01/ncpu_10/cmp/generic rename to tests/mpi/p4est_3d_refine_01.mpirun=10.output diff --git a/tests/mpi/p4est_3d_refine_01/ncpu_4/cmp/generic b/tests/mpi/p4est_3d_refine_01.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_3d_refine_01/ncpu_4/cmp/generic rename to tests/mpi/p4est_3d_refine_01.mpirun=4.output diff --git a/tests/mpi/p4est_3d_refine_02.cc b/tests/mpi/p4est_3d_refine_02.cc index 39f89d45e9..de4443d0c9 100644 --- a/tests/mpi/p4est_3d_refine_02.cc +++ b/tests/mpi/p4est_3d_refine_02.cc @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_3d_refine_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_3d_refine_02/ncpu_10/cmp/generic b/tests/mpi/p4est_3d_refine_02.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_3d_refine_02/ncpu_10/cmp/generic rename to tests/mpi/p4est_3d_refine_02.mpirun=10.output diff --git a/tests/mpi/p4est_3d_refine_02/ncpu_4/cmp/generic b/tests/mpi/p4est_3d_refine_02.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_3d_refine_02/ncpu_4/cmp/generic rename to tests/mpi/p4est_3d_refine_02.mpirun=4.output diff --git a/tests/mpi/p4est_3d_refine_03.cc b/tests/mpi/p4est_3d_refine_03.cc index 63ed4d0d7d..2bb309a444 100644 --- a/tests/mpi/p4est_3d_refine_03.cc +++ b/tests/mpi/p4est_3d_refine_03.cc @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_3d_refine_03").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_3d_refine_03/ncpu_10/cmp/generic b/tests/mpi/p4est_3d_refine_03.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_3d_refine_03/ncpu_10/cmp/generic rename to tests/mpi/p4est_3d_refine_03.mpirun=10.output diff --git a/tests/mpi/p4est_3d_refine_03/ncpu_4/cmp/generic b/tests/mpi/p4est_3d_refine_03.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_3d_refine_03/ncpu_4/cmp/generic rename to tests/mpi/p4est_3d_refine_03.mpirun=4.output diff --git a/tests/mpi/p4est_3d_refine_04.cc b/tests/mpi/p4est_3d_refine_04.cc index 48adcb1466..ada144f81c 100644 --- a/tests/mpi/p4est_3d_refine_04.cc +++ b/tests/mpi/p4est_3d_refine_04.cc @@ -126,7 +126,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_3d_refine_04").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_3d_refine_04/ncpu_1/cmp/generic b/tests/mpi/p4est_3d_refine_04.mpirun=1.output similarity index 100% rename from tests/mpi/p4est_3d_refine_04/ncpu_1/cmp/generic rename to tests/mpi/p4est_3d_refine_04.mpirun=1.output diff --git a/tests/mpi/p4est_3d_refine_04/ncpu_10/cmp/generic b/tests/mpi/p4est_3d_refine_04.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_3d_refine_04/ncpu_10/cmp/generic rename to tests/mpi/p4est_3d_refine_04.mpirun=10.output diff --git a/tests/mpi/p4est_3d_refine_04/ncpu_24/cmp/generic b/tests/mpi/p4est_3d_refine_04.mpirun=24.output similarity index 100% rename from tests/mpi/p4est_3d_refine_04/ncpu_24/cmp/generic rename to tests/mpi/p4est_3d_refine_04.mpirun=24.output diff --git a/tests/mpi/p4est_3d_refine_04/ncpu_4/cmp/generic b/tests/mpi/p4est_3d_refine_04.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_3d_refine_04/ncpu_4/cmp/generic rename to tests/mpi/p4est_3d_refine_04.mpirun=4.output diff --git a/tests/mpi/p4est_data_out_01.cc b/tests/mpi/p4est_data_out_01.cc index 7f0a30b325..9470826178 100644 --- a/tests/mpi/p4est_data_out_01.cc +++ b/tests/mpi/p4est_data_out_01.cc @@ -92,7 +92,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_data_out_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_data_out_01/ncpu_10/cmp/generic b/tests/mpi/p4est_data_out_01.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_data_out_01/ncpu_10/cmp/generic rename to tests/mpi/p4est_data_out_01.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/p4est_data_out_01/ncpu_4/cmp/generic b/tests/mpi/p4est_data_out_01.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_data_out_01/ncpu_4/cmp/generic rename to tests/mpi/p4est_data_out_01.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/p4est_get_subdomain_association.cc b/tests/mpi/p4est_get_subdomain_association.cc index 4442c57d15..50cdcf1b4b 100644 --- a/tests/mpi/p4est_get_subdomain_association.cc +++ b/tests/mpi/p4est_get_subdomain_association.cc @@ -87,7 +87,7 @@ int main(int argc, char *argv[]) if (myid == 1) { - std::ofstream logfile(output_file_for_mpi("p4est_get_subdomain_association").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_get_subdomain_association/ncpu_10/cmp/generic b/tests/mpi/p4est_get_subdomain_association.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_get_subdomain_association/ncpu_10/cmp/generic rename to tests/mpi/p4est_get_subdomain_association.mpirun=10.output diff --git a/tests/mpi/p4est_get_subdomain_association/ncpu_4/cmp/generic b/tests/mpi/p4est_get_subdomain_association.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_get_subdomain_association/ncpu_4/cmp/generic rename to tests/mpi/p4est_get_subdomain_association.mpirun=4.output diff --git a/tests/mpi/p4est_max_refine.cc b/tests/mpi/p4est_max_refine.cc index 5cb7726a12..6091620e28 100644 --- a/tests/mpi/p4est_max_refine.cc +++ b/tests/mpi/p4est_max_refine.cc @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_max_refine").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.depth_file(3); diff --git a/tests/mpi/p4est_max_refine/ncpu_1/cmp/generic b/tests/mpi/p4est_max_refine.mpirun=1.output similarity index 100% rename from tests/mpi/p4est_max_refine/ncpu_1/cmp/generic rename to tests/mpi/p4est_max_refine.mpirun=1.output diff --git a/tests/mpi/p4est_save_01.cc b/tests/mpi/p4est_save_01.cc index ea61c0fd76..29d6927ad0 100644 --- a/tests/mpi/p4est_save_01.cc +++ b/tests/mpi/p4est_save_01.cc @@ -116,7 +116,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_save_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_save_01/ncpu_10/cmp/generic b/tests/mpi/p4est_save_01.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_save_01/ncpu_10/cmp/generic rename to tests/mpi/p4est_save_01.mpirun=10.output diff --git a/tests/mpi/p4est_save_01/ncpu_4/cmp/generic b/tests/mpi/p4est_save_01.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_save_01/ncpu_4/cmp/generic rename to tests/mpi/p4est_save_01.mpirun=4.output diff --git a/tests/mpi/p4est_save_02.cc b/tests/mpi/p4est_save_02.cc index 8e16a96114..2c1801beb3 100644 --- a/tests/mpi/p4est_save_02.cc +++ b/tests/mpi/p4est_save_02.cc @@ -171,7 +171,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("p4est_save_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/p4est_save_02/ncpu_10/cmp/generic b/tests/mpi/p4est_save_02.with_petsc=true.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_save_02/ncpu_10/cmp/generic rename to tests/mpi/p4est_save_02.with_petsc=true.mpirun=10.output diff --git a/tests/mpi/p4est_save_02/ncpu_4/cmp/generic b/tests/mpi/p4est_save_02.with_petsc=true.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_save_02/ncpu_4/cmp/generic rename to tests/mpi/p4est_save_02.with_petsc=true.mpirun=4.output diff --git a/tests/mpi/p4est_save_03.cc b/tests/mpi/p4est_save_03.cc index e8b5724c8b..886654220d 100644 --- a/tests/mpi/p4est_save_03.cc +++ b/tests/mpi/p4est_save_03.cc @@ -184,7 +184,7 @@ int main (int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile (output_file_for_mpi ("p4est_save_03").c_str()); + std::ofstream logfile ("output"); deallog.attach (logfile); deallog.depth_console (0); deallog.threshold_double (1.e-10); diff --git a/tests/mpi/p4est_save_03/ncpu_10/cmp/generic b/tests/mpi/p4est_save_03.with_petsc=true.mpirun=10.output similarity index 100% rename from tests/mpi/p4est_save_03/ncpu_10/cmp/generic rename to tests/mpi/p4est_save_03.with_petsc=true.mpirun=10.output diff --git a/tests/mpi/p4est_save_03/ncpu_4/cmp/generic b/tests/mpi/p4est_save_03.with_petsc=true.mpirun=4.output similarity index 100% rename from tests/mpi/p4est_save_03/ncpu_4/cmp/generic rename to tests/mpi/p4est_save_03.with_petsc=true.mpirun=4.output diff --git a/tests/mpi/parallel_block_vector_01.cc b/tests/mpi/parallel_block_vector_01.cc index 6efa357d4b..22e3414aca 100644 --- a/tests/mpi/parallel_block_vector_01.cc +++ b/tests/mpi/parallel_block_vector_01.cc @@ -241,7 +241,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_block_vector_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_block_vector_01/ncpu_1/cmp/generic b/tests/mpi/parallel_block_vector_01.mpirun=1.output similarity index 100% rename from tests/mpi/parallel_block_vector_01/ncpu_1/cmp/generic rename to tests/mpi/parallel_block_vector_01.mpirun=1.output diff --git a/tests/mpi/parallel_block_vector_01/ncpu_10/cmp/generic b/tests/mpi/parallel_block_vector_01.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_block_vector_01/ncpu_10/cmp/generic rename to tests/mpi/parallel_block_vector_01.mpirun=10.output diff --git a/tests/mpi/parallel_block_vector_01/ncpu_4/cmp/generic b/tests/mpi/parallel_block_vector_01.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_block_vector_01/ncpu_4/cmp/generic rename to tests/mpi/parallel_block_vector_01.mpirun=4.output diff --git a/tests/mpi/parallel_partitioner_01.cc b/tests/mpi/parallel_partitioner_01.cc index 2c2256298f..7d866499cb 100644 --- a/tests/mpi/parallel_partitioner_01.cc +++ b/tests/mpi/parallel_partitioner_01.cc @@ -127,7 +127,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_partitioner_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_partitioner_01/ncpu_10/cmp/generic b/tests/mpi/parallel_partitioner_01.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_partitioner_01/ncpu_10/cmp/generic rename to tests/mpi/parallel_partitioner_01.mpirun=10.output diff --git a/tests/mpi/parallel_partitioner_01/ncpu_4/cmp/generic b/tests/mpi/parallel_partitioner_01.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_partitioner_01/ncpu_4/cmp/generic rename to tests/mpi/parallel_partitioner_01.mpirun=4.output diff --git a/tests/mpi/parallel_partitioner_02.cc b/tests/mpi/parallel_partitioner_02.cc index acdfc411e3..f19efc8b29 100644 --- a/tests/mpi/parallel_partitioner_02.cc +++ b/tests/mpi/parallel_partitioner_02.cc @@ -100,7 +100,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_partitioner_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_partitioner_02/ncpu_10/cmp/generic b/tests/mpi/parallel_partitioner_02.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_partitioner_02/ncpu_10/cmp/generic rename to tests/mpi/parallel_partitioner_02.mpirun=10.output diff --git a/tests/mpi/parallel_partitioner_02/ncpu_4/cmp/generic b/tests/mpi/parallel_partitioner_02.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_partitioner_02/ncpu_4/cmp/generic rename to tests/mpi/parallel_partitioner_02.mpirun=4.output diff --git a/tests/mpi/parallel_partitioner_03.cc b/tests/mpi/parallel_partitioner_03.cc index b5774dd292..c91f5013ad 100644 --- a/tests/mpi/parallel_partitioner_03.cc +++ b/tests/mpi/parallel_partitioner_03.cc @@ -106,7 +106,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_partitioner_03").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_partitioner_03/ncpu_10/cmp/generic b/tests/mpi/parallel_partitioner_03.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_partitioner_03/ncpu_10/cmp/generic rename to tests/mpi/parallel_partitioner_03.mpirun=10.output diff --git a/tests/mpi/parallel_partitioner_03/ncpu_4/cmp/generic b/tests/mpi/parallel_partitioner_03.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_partitioner_03/ncpu_4/cmp/generic rename to tests/mpi/parallel_partitioner_03.mpirun=4.output diff --git a/tests/mpi/parallel_partitioner_04.cc b/tests/mpi/parallel_partitioner_04.cc index 23bcee5d89..8406e2e72a 100644 --- a/tests/mpi/parallel_partitioner_04.cc +++ b/tests/mpi/parallel_partitioner_04.cc @@ -97,7 +97,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_partitioner_04").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_partitioner_04/ncpu_10/cmp/generic b/tests/mpi/parallel_partitioner_04.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_partitioner_04/ncpu_10/cmp/generic rename to tests/mpi/parallel_partitioner_04.mpirun=10.output diff --git a/tests/mpi/parallel_partitioner_04/ncpu_4/cmp/generic b/tests/mpi/parallel_partitioner_04.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_partitioner_04/ncpu_4/cmp/generic rename to tests/mpi/parallel_partitioner_04.mpirun=4.output diff --git a/tests/mpi/parallel_vector_01.cc b/tests/mpi/parallel_vector_01.cc index 88ac91fd94..dc37851248 100644 --- a/tests/mpi/parallel_vector_01.cc +++ b/tests/mpi/parallel_vector_01.cc @@ -77,7 +77,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_01/ncpu_10/cmp/generic b/tests/mpi/parallel_vector_01.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_vector_01/ncpu_10/cmp/generic rename to tests/mpi/parallel_vector_01.mpirun=10.output diff --git a/tests/mpi/parallel_vector_01/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_01.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_01/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_01.mpirun=4.output diff --git a/tests/mpi/parallel_vector_02.cc b/tests/mpi/parallel_vector_02.cc index ec3e2a961f..9222bb5e0b 100644 --- a/tests/mpi/parallel_vector_02.cc +++ b/tests/mpi/parallel_vector_02.cc @@ -88,7 +88,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_02/ncpu_10/cmp/generic b/tests/mpi/parallel_vector_02.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_vector_02/ncpu_10/cmp/generic rename to tests/mpi/parallel_vector_02.mpirun=10.output diff --git a/tests/mpi/parallel_vector_02/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_02.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_02/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_02.mpirun=4.output diff --git a/tests/mpi/parallel_vector_03.cc b/tests/mpi/parallel_vector_03.cc index 5c67d47868..c3565aa63c 100644 --- a/tests/mpi/parallel_vector_03.cc +++ b/tests/mpi/parallel_vector_03.cc @@ -89,7 +89,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_03").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_03/ncpu_10/cmp/generic b/tests/mpi/parallel_vector_03.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_vector_03/ncpu_10/cmp/generic rename to tests/mpi/parallel_vector_03.mpirun=10.output diff --git a/tests/mpi/parallel_vector_03/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_03.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_03/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_03.mpirun=4.output diff --git a/tests/mpi/parallel_vector_04.cc b/tests/mpi/parallel_vector_04.cc index bb736e34a8..fca8065188 100644 --- a/tests/mpi/parallel_vector_04.cc +++ b/tests/mpi/parallel_vector_04.cc @@ -111,7 +111,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_04").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_04/ncpu_10/cmp/generic b/tests/mpi/parallel_vector_04.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_vector_04/ncpu_10/cmp/generic rename to tests/mpi/parallel_vector_04.mpirun=10.output diff --git a/tests/mpi/parallel_vector_04/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_04.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_04/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_04.mpirun=4.output diff --git a/tests/mpi/parallel_vector_05.cc b/tests/mpi/parallel_vector_05.cc index f240d1de17..9ae94d86c5 100644 --- a/tests/mpi/parallel_vector_05.cc +++ b/tests/mpi/parallel_vector_05.cc @@ -80,7 +80,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_05").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_05/ncpu_10/cmp/generic b/tests/mpi/parallel_vector_05.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_vector_05/ncpu_10/cmp/generic rename to tests/mpi/parallel_vector_05.mpirun=10.output diff --git a/tests/mpi/parallel_vector_05/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_05.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_05/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_05.mpirun=4.output diff --git a/tests/mpi/parallel_vector_06.cc b/tests/mpi/parallel_vector_06.cc index d62928f395..5ce72302fb 100644 --- a/tests/mpi/parallel_vector_06.cc +++ b/tests/mpi/parallel_vector_06.cc @@ -229,7 +229,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_06").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_06/ncpu_1/cmp/generic b/tests/mpi/parallel_vector_06.mpirun=1.output similarity index 100% rename from tests/mpi/parallel_vector_06/ncpu_1/cmp/generic rename to tests/mpi/parallel_vector_06.mpirun=1.output diff --git a/tests/mpi/parallel_vector_06/ncpu_10/cmp/generic b/tests/mpi/parallel_vector_06.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_vector_06/ncpu_10/cmp/generic rename to tests/mpi/parallel_vector_06.mpirun=10.output diff --git a/tests/mpi/parallel_vector_06/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_06.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_06/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_06.mpirun=4.output diff --git a/tests/mpi/parallel_vector_07.cc b/tests/mpi/parallel_vector_07.cc index efeb4c8b74..df4fc6ba64 100644 --- a/tests/mpi/parallel_vector_07.cc +++ b/tests/mpi/parallel_vector_07.cc @@ -105,7 +105,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_07").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_07/ncpu_10/cmp/generic b/tests/mpi/parallel_vector_07.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_vector_07/ncpu_10/cmp/generic rename to tests/mpi/parallel_vector_07.mpirun=10.output diff --git a/tests/mpi/parallel_vector_07/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_07.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_07/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_07.mpirun=4.output diff --git a/tests/mpi/parallel_vector_08.cc b/tests/mpi/parallel_vector_08.cc index 7725acfd75..6805acc19f 100644 --- a/tests/mpi/parallel_vector_08.cc +++ b/tests/mpi/parallel_vector_08.cc @@ -152,7 +152,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_08").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_08/ncpu_10/cmp/generic b/tests/mpi/parallel_vector_08.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_vector_08/ncpu_10/cmp/generic rename to tests/mpi/parallel_vector_08.mpirun=10.output diff --git a/tests/mpi/parallel_vector_08/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_08.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_08/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_08.mpirun=4.output diff --git a/tests/mpi/parallel_vector_09.cc b/tests/mpi/parallel_vector_09.cc index 7077791c52..fc9c9ef8a3 100644 --- a/tests/mpi/parallel_vector_09.cc +++ b/tests/mpi/parallel_vector_09.cc @@ -126,7 +126,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_09").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_09/ncpu_10/cmp/generic b/tests/mpi/parallel_vector_09.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_vector_09/ncpu_10/cmp/generic rename to tests/mpi/parallel_vector_09.mpirun=10.output diff --git a/tests/mpi/parallel_vector_09/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_09.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_09/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_09.mpirun=4.output diff --git a/tests/mpi/parallel_vector_10.cc b/tests/mpi/parallel_vector_10.cc index 97be2bd2df..e01d391c65 100644 --- a/tests/mpi/parallel_vector_10.cc +++ b/tests/mpi/parallel_vector_10.cc @@ -78,7 +78,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_10").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_10/ncpu_10/cmp/generic b/tests/mpi/parallel_vector_10.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_vector_10/ncpu_10/cmp/generic rename to tests/mpi/parallel_vector_10.mpirun=10.output diff --git a/tests/mpi/parallel_vector_10/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_10.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_10/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_10.mpirun=4.output diff --git a/tests/mpi/parallel_vector_11.cc b/tests/mpi/parallel_vector_11.cc index 8ee6f0c984..7d35c6cf11 100644 --- a/tests/mpi/parallel_vector_11.cc +++ b/tests/mpi/parallel_vector_11.cc @@ -173,7 +173,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_11").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_11/ncpu_10/cmp/generic b/tests/mpi/parallel_vector_11.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_vector_11/ncpu_10/cmp/generic rename to tests/mpi/parallel_vector_11.mpirun=10.output diff --git a/tests/mpi/parallel_vector_11/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_11.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_11/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_11.mpirun=4.output diff --git a/tests/mpi/parallel_vector_12.cc b/tests/mpi/parallel_vector_12.cc index 5157c18fcd..5f8535006c 100644 --- a/tests/mpi/parallel_vector_12.cc +++ b/tests/mpi/parallel_vector_12.cc @@ -179,7 +179,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_12").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_12/ncpu_1/cmp/generic b/tests/mpi/parallel_vector_12.mpirun=1.output similarity index 100% rename from tests/mpi/parallel_vector_12/ncpu_1/cmp/generic rename to tests/mpi/parallel_vector_12.mpirun=1.output diff --git a/tests/mpi/parallel_vector_12/ncpu_10/cmp/generic b/tests/mpi/parallel_vector_12.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_vector_12/ncpu_10/cmp/generic rename to tests/mpi/parallel_vector_12.mpirun=10.output diff --git a/tests/mpi/parallel_vector_12/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_12.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_12/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_12.mpirun=4.output diff --git a/tests/mpi/parallel_vector_13.cc b/tests/mpi/parallel_vector_13.cc index 4abc873540..24149af17b 100644 --- a/tests/mpi/parallel_vector_13.cc +++ b/tests/mpi/parallel_vector_13.cc @@ -102,7 +102,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_13").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_13/ncpu_10/cmp/generic b/tests/mpi/parallel_vector_13.mpirun=10.output similarity index 100% rename from tests/mpi/parallel_vector_13/ncpu_10/cmp/generic rename to tests/mpi/parallel_vector_13.mpirun=10.output diff --git a/tests/mpi/parallel_vector_13/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_13.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_13/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_13.mpirun=4.output diff --git a/tests/mpi/parallel_vector_back_interpolate.cc b/tests/mpi/parallel_vector_back_interpolate.cc index fb3a6183f3..ef27d9737d 100644 --- a/tests/mpi/parallel_vector_back_interpolate.cc +++ b/tests/mpi/parallel_vector_back_interpolate.cc @@ -85,7 +85,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_back_interpolate").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_back_interpolate/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_back_interpolate.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_back_interpolate/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_back_interpolate.mpirun=4.output diff --git a/tests/mpi/parallel_vector_interpolate.cc b/tests/mpi/parallel_vector_interpolate.cc index 9d506085df..29fa68cd95 100644 --- a/tests/mpi/parallel_vector_interpolate.cc +++ b/tests/mpi/parallel_vector_interpolate.cc @@ -84,7 +84,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("parallel_vector_interpolate").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/parallel_vector_interpolate/ncpu_4/cmp/generic b/tests/mpi/parallel_vector_interpolate.mpirun=4.output similarity index 100% rename from tests/mpi/parallel_vector_interpolate/ncpu_4/cmp/generic rename to tests/mpi/parallel_vector_interpolate.mpirun=4.output diff --git a/tests/mpi/petsc_01.cc b/tests/mpi/petsc_01.cc index 6b043e565f..a3ba8644db 100644 --- a/tests/mpi/petsc_01.cc +++ b/tests/mpi/petsc_01.cc @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) { - std::ofstream logfile(output_file_for_mpi("petsc_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/petsc_01/ncpu_1/cmp/generic b/tests/mpi/petsc_01.with_petsc=true.mpirun=1.output similarity index 100% rename from tests/mpi/petsc_01/ncpu_1/cmp/generic rename to tests/mpi/petsc_01.with_petsc=true.mpirun=1.output diff --git a/tests/mpi/petsc_01/ncpu_10/cmp/generic b/tests/mpi/petsc_01.with_petsc=true.mpirun=10.output similarity index 100% rename from tests/mpi/petsc_01/ncpu_10/cmp/generic rename to tests/mpi/petsc_01.with_petsc=true.mpirun=10.output diff --git a/tests/mpi/petsc_01/ncpu_4/cmp/generic b/tests/mpi/petsc_01.with_petsc=true.mpirun=4.output similarity index 100% rename from tests/mpi/petsc_01/ncpu_4/cmp/generic rename to tests/mpi/petsc_01.with_petsc=true.mpirun=4.output diff --git a/tests/mpi/petsc_02.cc b/tests/mpi/petsc_02.cc index 0b8fea2dc7..8f52b85463 100644 --- a/tests/mpi/petsc_02.cc +++ b/tests/mpi/petsc_02.cc @@ -67,7 +67,7 @@ int main(int argc, char *argv[]) if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) { - std::ofstream logfile(output_file_for_mpi("petsc_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/petsc_02/ncpu_1/cmp/generic b/tests/mpi/petsc_02.with_petsc=true.mpirun=1.output similarity index 100% rename from tests/mpi/petsc_02/ncpu_1/cmp/generic rename to tests/mpi/petsc_02.with_petsc=true.mpirun=1.output diff --git a/tests/mpi/petsc_02/ncpu_10/cmp/generic b/tests/mpi/petsc_02.with_petsc=true.mpirun=10.output similarity index 100% rename from tests/mpi/petsc_02/ncpu_10/cmp/generic rename to tests/mpi/petsc_02.with_petsc=true.mpirun=10.output diff --git a/tests/mpi/petsc_02/ncpu_4/cmp/generic b/tests/mpi/petsc_02.with_petsc=true.mpirun=4.output similarity index 100% rename from tests/mpi/petsc_02/ncpu_4/cmp/generic rename to tests/mpi/petsc_02.with_petsc=true.mpirun=4.output diff --git a/tests/mpi/petsc_03.cc b/tests/mpi/petsc_03.cc index 7dc7581c31..b852693ce8 100644 --- a/tests/mpi/petsc_03.cc +++ b/tests/mpi/petsc_03.cc @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) { - std::ofstream logfile(output_file_for_mpi(JobIdentifier::base_name(__FILE__)).c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/petsc_03/ncpu_1/cmp/generic b/tests/mpi/petsc_03.with_petsc=true.mpirun=1.output similarity index 100% rename from tests/mpi/petsc_03/ncpu_1/cmp/generic rename to tests/mpi/petsc_03.with_petsc=true.mpirun=1.output diff --git a/tests/mpi/petsc_03/ncpu_10/cmp/generic b/tests/mpi/petsc_03.with_petsc=true.mpirun=10.output similarity index 100% rename from tests/mpi/petsc_03/ncpu_10/cmp/generic rename to tests/mpi/petsc_03.with_petsc=true.mpirun=10.output diff --git a/tests/mpi/petsc_03/ncpu_4/cmp/generic b/tests/mpi/petsc_03.with_petsc=true.mpirun=4.output similarity index 100% rename from tests/mpi/petsc_03/ncpu_4/cmp/generic rename to tests/mpi/petsc_03.with_petsc=true.mpirun=4.output diff --git a/tests/mpi/petsc_distribute_01.cc b/tests/mpi/petsc_distribute_01.cc index d803814ff6..fcb3986638 100644 --- a/tests/mpi/petsc_distribute_01.cc +++ b/tests/mpi/petsc_distribute_01.cc @@ -154,7 +154,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("petsc_distribute_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/petsc_distribute_01/ncpu_1/cmp/generic b/tests/mpi/petsc_distribute_01.with_petsc=true.mpirun=1.output similarity index 100% rename from tests/mpi/petsc_distribute_01/ncpu_1/cmp/generic rename to tests/mpi/petsc_distribute_01.with_petsc=true.mpirun=1.output diff --git a/tests/mpi/petsc_distribute_01/ncpu_10/cmp/generic b/tests/mpi/petsc_distribute_01.with_petsc=true.mpirun=10.output similarity index 100% rename from tests/mpi/petsc_distribute_01/ncpu_10/cmp/generic rename to tests/mpi/petsc_distribute_01.with_petsc=true.mpirun=10.output diff --git a/tests/mpi/petsc_distribute_01/ncpu_2/cmp/generic b/tests/mpi/petsc_distribute_01.with_petsc=true.mpirun=2.output similarity index 100% rename from tests/mpi/petsc_distribute_01/ncpu_2/cmp/generic rename to tests/mpi/petsc_distribute_01.with_petsc=true.mpirun=2.output diff --git a/tests/mpi/petsc_distribute_01/ncpu_4/cmp/generic b/tests/mpi/petsc_distribute_01.with_petsc=true.mpirun=4.output similarity index 100% rename from tests/mpi/petsc_distribute_01/ncpu_4/cmp/generic rename to tests/mpi/petsc_distribute_01.with_petsc=true.mpirun=4.output diff --git a/tests/mpi/petsc_distribute_01_block.cc b/tests/mpi/petsc_distribute_01_block.cc index 3c2fe3cfd2..8c8ef575d0 100644 --- a/tests/mpi/petsc_distribute_01_block.cc +++ b/tests/mpi/petsc_distribute_01_block.cc @@ -188,7 +188,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("petsc_distribute_01_block").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/petsc_distribute_01_block/ncpu_1/cmp/generic b/tests/mpi/petsc_distribute_01_block.with_petsc=true.mpirun=1.output similarity index 100% rename from tests/mpi/petsc_distribute_01_block/ncpu_1/cmp/generic rename to tests/mpi/petsc_distribute_01_block.with_petsc=true.mpirun=1.output diff --git a/tests/mpi/petsc_distribute_01_block/ncpu_10/cmp/generic b/tests/mpi/petsc_distribute_01_block.with_petsc=true.mpirun=10.output similarity index 100% rename from tests/mpi/petsc_distribute_01_block/ncpu_10/cmp/generic rename to tests/mpi/petsc_distribute_01_block.with_petsc=true.mpirun=10.output diff --git a/tests/mpi/petsc_distribute_01_block/ncpu_2/cmp/generic b/tests/mpi/petsc_distribute_01_block.with_petsc=true.mpirun=2.output similarity index 100% rename from tests/mpi/petsc_distribute_01_block/ncpu_2/cmp/generic rename to tests/mpi/petsc_distribute_01_block.with_petsc=true.mpirun=2.output diff --git a/tests/mpi/petsc_distribute_01_block/ncpu_4/cmp/generic b/tests/mpi/petsc_distribute_01_block.with_petsc=true.mpirun=4.output similarity index 100% rename from tests/mpi/petsc_distribute_01_block/ncpu_4/cmp/generic rename to tests/mpi/petsc_distribute_01_block.with_petsc=true.mpirun=4.output diff --git a/tests/mpi/petsc_distribute_01_inhomogenous.cc b/tests/mpi/petsc_distribute_01_inhomogenous.cc index 148de3facf..02bc807e2b 100644 --- a/tests/mpi/petsc_distribute_01_inhomogenous.cc +++ b/tests/mpi/petsc_distribute_01_inhomogenous.cc @@ -148,7 +148,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("petsc_distribute_01_inhomogenous").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/petsc_distribute_01_inhomogenous/ncpu_1/cmp/generic b/tests/mpi/petsc_distribute_01_inhomogenous.with_petsc=true.mpirun=1.output similarity index 100% rename from tests/mpi/petsc_distribute_01_inhomogenous/ncpu_1/cmp/generic rename to tests/mpi/petsc_distribute_01_inhomogenous.with_petsc=true.mpirun=1.output diff --git a/tests/mpi/petsc_distribute_01_inhomogenous/ncpu_10/cmp/generic b/tests/mpi/petsc_distribute_01_inhomogenous.with_petsc=true.mpirun=10.output similarity index 100% rename from tests/mpi/petsc_distribute_01_inhomogenous/ncpu_10/cmp/generic rename to tests/mpi/petsc_distribute_01_inhomogenous.with_petsc=true.mpirun=10.output diff --git a/tests/mpi/petsc_distribute_01_inhomogenous/ncpu_2/cmp/generic b/tests/mpi/petsc_distribute_01_inhomogenous.with_petsc=true.mpirun=2.output similarity index 100% rename from tests/mpi/petsc_distribute_01_inhomogenous/ncpu_2/cmp/generic rename to tests/mpi/petsc_distribute_01_inhomogenous.with_petsc=true.mpirun=2.output diff --git a/tests/mpi/petsc_distribute_01_inhomogenous/ncpu_4/cmp/generic b/tests/mpi/petsc_distribute_01_inhomogenous.with_petsc=true.mpirun=4.output similarity index 100% rename from tests/mpi/petsc_distribute_01_inhomogenous/ncpu_4/cmp/generic rename to tests/mpi/petsc_distribute_01_inhomogenous.with_petsc=true.mpirun=4.output diff --git a/tests/mpi/petsc_locally_owned_elements.cc b/tests/mpi/petsc_locally_owned_elements.cc index aed2b9b94b..2c0d06e47b 100644 --- a/tests/mpi/petsc_locally_owned_elements.cc +++ b/tests/mpi/petsc_locally_owned_elements.cc @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("petsc_locally_owned_elements").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/petsc_locally_owned_elements/ncpu_1/cmp/generic b/tests/mpi/petsc_locally_owned_elements.with_petsc=true.mpirun=1.output similarity index 100% rename from tests/mpi/petsc_locally_owned_elements/ncpu_1/cmp/generic rename to tests/mpi/petsc_locally_owned_elements.with_petsc=true.mpirun=1.output diff --git a/tests/mpi/petsc_locally_owned_elements/ncpu_10/cmp/generic b/tests/mpi/petsc_locally_owned_elements.with_petsc=true.mpirun=10.output similarity index 100% rename from tests/mpi/petsc_locally_owned_elements/ncpu_10/cmp/generic rename to tests/mpi/petsc_locally_owned_elements.with_petsc=true.mpirun=10.output diff --git a/tests/mpi/petsc_locally_owned_elements/ncpu_2/cmp/generic b/tests/mpi/petsc_locally_owned_elements.with_petsc=true.mpirun=2.output similarity index 100% rename from tests/mpi/petsc_locally_owned_elements/ncpu_2/cmp/generic rename to tests/mpi/petsc_locally_owned_elements.with_petsc=true.mpirun=2.output diff --git a/tests/mpi/petsc_locally_owned_elements/ncpu_4/cmp/generic b/tests/mpi/petsc_locally_owned_elements.with_petsc=true.mpirun=4.output similarity index 100% rename from tests/mpi/petsc_locally_owned_elements/ncpu_4/cmp/generic rename to tests/mpi/petsc_locally_owned_elements.with_petsc=true.mpirun=4.output diff --git a/tests/mpi/point_to_point_pattern_01.cc b/tests/mpi/point_to_point_pattern_01.cc index 74e3f0898f..cafdaff5a2 100644 --- a/tests/mpi/point_to_point_pattern_01.cc +++ b/tests/mpi/point_to_point_pattern_01.cc @@ -113,7 +113,7 @@ int main(int argc, char *argv[]) if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) { - std::ofstream logfile(output_file_for_mpi("point_to_point_pattern_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/point_to_point_pattern_01/ncpu_10/cmp/generic b/tests/mpi/point_to_point_pattern_01.mpirun=10.output similarity index 100% rename from tests/mpi/point_to_point_pattern_01/ncpu_10/cmp/generic rename to tests/mpi/point_to_point_pattern_01.mpirun=10.output diff --git a/tests/mpi/point_to_point_pattern_01/ncpu_3/cmp/generic b/tests/mpi/point_to_point_pattern_01.mpirun=3.output similarity index 100% rename from tests/mpi/point_to_point_pattern_01/ncpu_3/cmp/generic rename to tests/mpi/point_to_point_pattern_01.mpirun=3.output diff --git a/tests/mpi/point_to_point_pattern_01/ncpu_4/cmp/generic b/tests/mpi/point_to_point_pattern_01.mpirun=4.output similarity index 100% rename from tests/mpi/point_to_point_pattern_01/ncpu_4/cmp/generic rename to tests/mpi/point_to_point_pattern_01.mpirun=4.output diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc index 3a296c876b..61fae5edc6 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc @@ -137,7 +137,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("refine_and_coarsen_fixed_fraction_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_01/ncpu_10/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_fraction_01.mpirun=10.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_fraction_01/ncpu_10/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_fraction_01.mpirun=10.output diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_01/ncpu_4/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_fraction_01.mpirun=4.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_fraction_01/ncpu_4/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_fraction_01.mpirun=4.output diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc index fae48e3d1b..12e7ef2b98 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc @@ -147,7 +147,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("refine_and_coarsen_fixed_fraction_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_02/ncpu_10/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_fraction_02.mpirun=10.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_fraction_02/ncpu_10/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_fraction_02.mpirun=10.output diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_02/ncpu_4/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_fraction_02.mpirun=4.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_fraction_02/ncpu_4/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_fraction_02.mpirun=4.output diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc index f86c6d9ac8..272c0e5196 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc @@ -126,7 +126,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("refine_and_coarsen_fixed_fraction_03").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_03/ncpu_10/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_fraction_03.mpirun=10.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_fraction_03/ncpu_10/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_fraction_03.mpirun=10.output diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_03/ncpu_4/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_fraction_03.mpirun=4.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_fraction_03/ncpu_4/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_fraction_03.mpirun=4.output diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc index 093c09f62d..80de364730 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc @@ -144,7 +144,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("refine_and_coarsen_fixed_fraction_04").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_04/ncpu_1/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_fraction_04.mpirun=1.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_fraction_04/ncpu_1/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_fraction_04.mpirun=1.output diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc index f970e5f275..0f2c3a0495 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc @@ -141,7 +141,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("refine_and_coarsen_fixed_fraction_05").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_05/ncpu_1/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_fraction_05.mpirun=1.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_fraction_05/ncpu_1/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_fraction_05.mpirun=1.output diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc index dbbca1b607..7b71ff215c 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc @@ -68,7 +68,7 @@ void test() // now read indicators Vector indicators (tr.dealii::Triangulation<2>::n_active_cells()); { - std::ifstream in("refine_and_coarsen_fixed_fraction_06/indicators"); + std::ifstream in(SOURCE_DIR "/refine_and_coarsen_fixed_fraction_06/indicators"); for (unsigned int i=0; i> indicators(i); } @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("refine_and_coarsen_fixed_fraction_06").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_06/ncpu_1/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_fraction_06.mpirun=1.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_fraction_06/ncpu_1/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_fraction_06.mpirun=1.output diff --git a/tests/mpi/refine_and_coarsen_fixed_number_01.cc b/tests/mpi/refine_and_coarsen_fixed_number_01.cc index 0cf5ffead1..f96305910e 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_01.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_01.cc @@ -125,7 +125,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("refine_and_coarsen_fixed_number_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/refine_and_coarsen_fixed_number_01/ncpu_10/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_number_01.mpirun=10.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_number_01/ncpu_10/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_number_01.mpirun=10.output diff --git a/tests/mpi/refine_and_coarsen_fixed_number_01/ncpu_4/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_number_01.mpirun=4.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_number_01/ncpu_4/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_number_01.mpirun=4.output diff --git a/tests/mpi/refine_and_coarsen_fixed_number_02.cc b/tests/mpi/refine_and_coarsen_fixed_number_02.cc index 37ce0a6945..6b78821500 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_02.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_02.cc @@ -126,7 +126,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("refine_and_coarsen_fixed_number_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/refine_and_coarsen_fixed_number_02/ncpu_10/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_number_02.mpirun=10.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_number_02/ncpu_10/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_number_02.mpirun=10.output diff --git a/tests/mpi/refine_and_coarsen_fixed_number_02/ncpu_4/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_number_02.mpirun=4.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_number_02/ncpu_4/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_number_02.mpirun=4.output diff --git a/tests/mpi/refine_and_coarsen_fixed_number_03.cc b/tests/mpi/refine_and_coarsen_fixed_number_03.cc index 11ed30771e..44d0dc3308 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_03.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_03.cc @@ -115,7 +115,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("refine_and_coarsen_fixed_number_03").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/refine_and_coarsen_fixed_number_03/ncpu_10/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_number_03.mpirun=10.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_number_03/ncpu_10/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_number_03.mpirun=10.output diff --git a/tests/mpi/refine_and_coarsen_fixed_number_03/ncpu_4/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_number_03.mpirun=4.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_number_03/ncpu_4/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_number_03.mpirun=4.output diff --git a/tests/mpi/refine_and_coarsen_fixed_number_04.cc b/tests/mpi/refine_and_coarsen_fixed_number_04.cc index b9a6754428..72ce835ba7 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_04.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_04.cc @@ -144,7 +144,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("refine_and_coarsen_fixed_number_04").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/refine_and_coarsen_fixed_number_04/ncpu_1/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_number_04.mpirun=1.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_number_04/ncpu_1/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_number_04.mpirun=1.output diff --git a/tests/mpi/refine_and_coarsen_fixed_number_05.cc b/tests/mpi/refine_and_coarsen_fixed_number_05.cc index c0ca2d0401..bfbad030bf 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_05.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_05.cc @@ -141,7 +141,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("refine_and_coarsen_fixed_number_05").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/refine_and_coarsen_fixed_number_05/ncpu_1/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_number_05.mpirun=1.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_number_05/ncpu_1/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_number_05.mpirun=1.output diff --git a/tests/mpi/refine_and_coarsen_fixed_number_06.cc b/tests/mpi/refine_and_coarsen_fixed_number_06.cc index 3e5042bba0..7334e13efe 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_06.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_06.cc @@ -75,7 +75,7 @@ int main(int argc, char *argv[]) if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) { - std::ofstream logfile(output_file_for_mpi("refine_and_coarsen_fixed_number_06").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/refine_and_coarsen_fixed_number_06/ncpu_1/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_number_06.mpirun=1.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_number_06/ncpu_1/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_number_06.mpirun=1.output diff --git a/tests/mpi/refine_and_coarsen_fixed_number_06/ncpu_10/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_number_06.mpirun=10.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_number_06/ncpu_10/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_number_06.mpirun=10.output diff --git a/tests/mpi/refine_and_coarsen_fixed_number_06/ncpu_4/cmp/generic b/tests/mpi/refine_and_coarsen_fixed_number_06.mpirun=4.output similarity index 100% rename from tests/mpi/refine_and_coarsen_fixed_number_06/ncpu_4/cmp/generic rename to tests/mpi/refine_and_coarsen_fixed_number_06.mpirun=4.output diff --git a/tests/mpi/refinement_listener_01.cc b/tests/mpi/refinement_listener_01.cc index 0e01673f67..a0dfef9c72 100644 --- a/tests/mpi/refinement_listener_01.cc +++ b/tests/mpi/refinement_listener_01.cc @@ -95,7 +95,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("refinement_listener_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/refinement_listener_01/ncpu_10/cmp/generic b/tests/mpi/refinement_listener_01.mpirun=10.output similarity index 100% rename from tests/mpi/refinement_listener_01/ncpu_10/cmp/generic rename to tests/mpi/refinement_listener_01.mpirun=10.output diff --git a/tests/mpi/refinement_listener_01/ncpu_20/cmp/generic b/tests/mpi/refinement_listener_01.mpirun=20.output similarity index 100% rename from tests/mpi/refinement_listener_01/ncpu_20/cmp/generic rename to tests/mpi/refinement_listener_01.mpirun=20.output diff --git a/tests/mpi/refinement_listener_01/ncpu_4/cmp/generic b/tests/mpi/refinement_listener_01.mpirun=4.output similarity index 100% rename from tests/mpi/refinement_listener_01/ncpu_4/cmp/generic rename to tests/mpi/refinement_listener_01.mpirun=4.output diff --git a/tests/mpi/refinement_listener_02.cc b/tests/mpi/refinement_listener_02.cc index cc712d997e..6611e9546c 100644 --- a/tests/mpi/refinement_listener_02.cc +++ b/tests/mpi/refinement_listener_02.cc @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("refinement_listener_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/refinement_listener_02/ncpu_10/cmp/generic b/tests/mpi/refinement_listener_02.mpirun=10.output similarity index 100% rename from tests/mpi/refinement_listener_02/ncpu_10/cmp/generic rename to tests/mpi/refinement_listener_02.mpirun=10.output diff --git a/tests/mpi/refinement_listener_02/ncpu_20/cmp/generic b/tests/mpi/refinement_listener_02.mpirun=20.output similarity index 100% rename from tests/mpi/refinement_listener_02/ncpu_20/cmp/generic rename to tests/mpi/refinement_listener_02.mpirun=20.output diff --git a/tests/mpi/refinement_listener_02/ncpu_4/cmp/generic b/tests/mpi/refinement_listener_02.mpirun=4.output similarity index 100% rename from tests/mpi/refinement_listener_02/ncpu_4/cmp/generic rename to tests/mpi/refinement_listener_02.mpirun=4.output diff --git a/tests/mpi/renumber_z_order_01.cc b/tests/mpi/renumber_z_order_01.cc index 55206cdbfd..3309425504 100644 --- a/tests/mpi/renumber_z_order_01.cc +++ b/tests/mpi/renumber_z_order_01.cc @@ -131,7 +131,7 @@ int main (int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile (output_file_for_mpi ("renumber_z_order_01").c_str()); + std::ofstream logfile ("output"); deallog.attach (logfile); deallog.depth_console (0); deallog.threshold_double (1.e-10); diff --git a/tests/mpi/renumber_z_order_01/ncpu_1/cmp/generic b/tests/mpi/renumber_z_order_01.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/renumber_z_order_01/ncpu_1/cmp/generic rename to tests/mpi/renumber_z_order_01.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/renumber_z_order_01/ncpu_10/cmp/generic b/tests/mpi/renumber_z_order_01.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/renumber_z_order_01/ncpu_10/cmp/generic rename to tests/mpi/renumber_z_order_01.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/renumber_z_order_01/ncpu_4/cmp/generic b/tests/mpi/renumber_z_order_01.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/renumber_z_order_01/ncpu_4/cmp/generic rename to tests/mpi/renumber_z_order_01.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/renumber_z_order_02.cc b/tests/mpi/renumber_z_order_02.cc index 7875b8f9d2..f1facd0f45 100644 --- a/tests/mpi/renumber_z_order_02.cc +++ b/tests/mpi/renumber_z_order_02.cc @@ -138,7 +138,7 @@ int main (int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile (output_file_for_mpi ("renumber_z_order_02").c_str()); + std::ofstream logfile ("output"); deallog.attach (logfile); deallog.depth_console (0); deallog.threshold_double (1.e-10); diff --git a/tests/mpi/renumber_z_order_02/ncpu_1/cmp/generic b/tests/mpi/renumber_z_order_02.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/renumber_z_order_02/ncpu_1/cmp/generic rename to tests/mpi/renumber_z_order_02.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/renumber_z_order_02/ncpu_10/cmp/generic b/tests/mpi/renumber_z_order_02.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/renumber_z_order_02/ncpu_10/cmp/generic rename to tests/mpi/renumber_z_order_02.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/renumber_z_order_02/ncpu_4/cmp/generic b/tests/mpi/renumber_z_order_02.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/renumber_z_order_02/ncpu_4/cmp/generic rename to tests/mpi/renumber_z_order_02.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/simple_mpi_01.cc b/tests/mpi/simple_mpi_01.cc index c7e72409d4..c7e9055703 100644 --- a/tests/mpi/simple_mpi_01.cc +++ b/tests/mpi/simple_mpi_01.cc @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) { - std::ofstream logfile(output_file_for_mpi("simple_mpi_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/simple_mpi_01/ncpu_10/cmp/generic b/tests/mpi/simple_mpi_01.mpirun=10.output similarity index 100% rename from tests/mpi/simple_mpi_01/ncpu_10/cmp/generic rename to tests/mpi/simple_mpi_01.mpirun=10.output diff --git a/tests/mpi/simple_mpi_01/ncpu_3/cmp/generic b/tests/mpi/simple_mpi_01.mpirun=3.output similarity index 100% rename from tests/mpi/simple_mpi_01/ncpu_3/cmp/generic rename to tests/mpi/simple_mpi_01.mpirun=3.output diff --git a/tests/mpi/simple_mpi_01/ncpu_4/cmp/generic b/tests/mpi/simple_mpi_01.mpirun=4.output similarity index 100% rename from tests/mpi/simple_mpi_01/ncpu_4/cmp/generic rename to tests/mpi/simple_mpi_01.mpirun=4.output diff --git a/tests/mpi/solution_transfer_01.cc b/tests/mpi/solution_transfer_01.cc index 57373bb475..631d7aaf3c 100644 --- a/tests/mpi/solution_transfer_01.cc +++ b/tests/mpi/solution_transfer_01.cc @@ -113,7 +113,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("solution_transfer_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/solution_transfer_01/ncpu_10/cmp/generic b/tests/mpi/solution_transfer_01.with_petsc=true.mpirun=10.output similarity index 100% rename from tests/mpi/solution_transfer_01/ncpu_10/cmp/generic rename to tests/mpi/solution_transfer_01.with_petsc=true.mpirun=10.output diff --git a/tests/mpi/solution_transfer_01/ncpu_4/cmp/generic b/tests/mpi/solution_transfer_01.with_petsc=true.mpirun=4.output similarity index 100% rename from tests/mpi/solution_transfer_01/ncpu_4/cmp/generic rename to tests/mpi/solution_transfer_01.with_petsc=true.mpirun=4.output diff --git a/tests/mpi/step-39.cc b/tests/mpi/step-39.cc index 20c6b32868..65baacdee6 100644 --- a/tests/mpi/step-39.cc +++ b/tests/mpi/step-39.cc @@ -756,7 +756,7 @@ namespace Step39 int main(int argc, char *argv[]) { dealii::Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); - mpi_initlog(__FILE__, true); + mpi_initlog(true); using namespace dealii; using namespace Step39; diff --git a/tests/mpi/step-39/ncpu_1/cmp/generic b/tests/mpi/step-39.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/step-39/ncpu_1/cmp/generic rename to tests/mpi/step-39.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/step-39/ncpu_2/cmp/generic b/tests/mpi/step-39.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/step-39/ncpu_2/cmp/generic rename to tests/mpi/step-39.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/step-39/ncpu_6/cmp/generic b/tests/mpi/step-39.with_trilinos=true.mpirun=6.output similarity index 100% rename from tests/mpi/step-39/ncpu_6/cmp/generic rename to tests/mpi/step-39.with_trilinos=true.mpirun=6.output diff --git a/tests/mpi/step-40.cc b/tests/mpi/step-40.cc index 634545427f..9832ddd493 100644 --- a/tests/mpi/step-40.cc +++ b/tests/mpi/step-40.cc @@ -373,7 +373,7 @@ int main(int argc, char *argv[]) if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) { - std::ofstream logfile(output_file_for_mpi("step-40").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/step-40/ncpu_10/cmp/generic b/tests/mpi/step-40.with_petsc=true.mpirun=10.output similarity index 100% rename from tests/mpi/step-40/ncpu_10/cmp/generic rename to tests/mpi/step-40.with_petsc=true.mpirun=10.output diff --git a/tests/mpi/step-40/ncpu_3/cmp/generic b/tests/mpi/step-40.with_petsc=true.mpirun=3.output similarity index 100% rename from tests/mpi/step-40/ncpu_3/cmp/generic rename to tests/mpi/step-40.with_petsc=true.mpirun=3.output diff --git a/tests/mpi/step-40/ncpu_4/cmp/generic b/tests/mpi/step-40.with_petsc=true.mpirun=4.output similarity index 100% rename from tests/mpi/step-40/ncpu_4/cmp/generic rename to tests/mpi/step-40.with_petsc=true.mpirun=4.output diff --git a/tests/mpi/step-40_direct_solver.cc b/tests/mpi/step-40_direct_solver.cc index db5f417ac9..25c457a3f3 100644 --- a/tests/mpi/step-40_direct_solver.cc +++ b/tests/mpi/step-40_direct_solver.cc @@ -367,7 +367,7 @@ int main(int argc, char *argv[]) if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) { - std::ofstream logfile(output_file_for_mpi("step-40_direct_solver").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/step-40_direct_solver/ncpu_10/cmp/generic b/tests/mpi/step-40_direct_solver.with_petsc=true.mpirun=10.output similarity index 100% rename from tests/mpi/step-40_direct_solver/ncpu_10/cmp/generic rename to tests/mpi/step-40_direct_solver.with_petsc=true.mpirun=10.output diff --git a/tests/mpi/step-40_direct_solver/ncpu_3/cmp/generic b/tests/mpi/step-40_direct_solver.with_petsc=true.mpirun=3.output similarity index 100% rename from tests/mpi/step-40_direct_solver/ncpu_3/cmp/generic rename to tests/mpi/step-40_direct_solver.with_petsc=true.mpirun=3.output diff --git a/tests/mpi/step-40_direct_solver/ncpu_4/cmp/generic b/tests/mpi/step-40_direct_solver.with_petsc=true.mpirun=4.output similarity index 100% rename from tests/mpi/step-40_direct_solver/ncpu_4/cmp/generic rename to tests/mpi/step-40_direct_solver.with_petsc=true.mpirun=4.output diff --git a/tests/mpi/step-48.cc b/tests/mpi/step-48.cc index 8747064923..701cd04217 100644 --- a/tests/mpi/step-48.cc +++ b/tests/mpi/step-48.cc @@ -390,7 +390,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("step-48").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/step-48/ncpu_1/cmp/generic b/tests/mpi/step-48.mpirun=1.output similarity index 100% rename from tests/mpi/step-48/ncpu_1/cmp/generic rename to tests/mpi/step-48.mpirun=1.output diff --git a/tests/mpi/step-48/ncpu_10/cmp/generic b/tests/mpi/step-48.mpirun=10.output similarity index 100% rename from tests/mpi/step-48/ncpu_10/cmp/generic rename to tests/mpi/step-48.mpirun=10.output diff --git a/tests/mpi/step-48/ncpu_4/cmp/generic b/tests/mpi/step-48.mpirun=4.output similarity index 100% rename from tests/mpi/step-48/ncpu_4/cmp/generic rename to tests/mpi/step-48.mpirun=4.output diff --git a/tests/mpi/tria_01.cc b/tests/mpi/tria_01.cc index 82fa9e680c..9d9fb76150 100644 --- a/tests/mpi/tria_01.cc +++ b/tests/mpi/tria_01.cc @@ -77,7 +77,7 @@ void test() int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log(); deallog.push("2d"); test<2>(); diff --git a/tests/mpi/tria_01/ncpu_10/cmp/generic b/tests/mpi/tria_01.mpirun=10.output similarity index 100% rename from tests/mpi/tria_01/ncpu_10/cmp/generic rename to tests/mpi/tria_01.mpirun=10.output diff --git a/tests/mpi/tria_01/ncpu_2/cmp/generic b/tests/mpi/tria_01.mpirun=2.output similarity index 100% rename from tests/mpi/tria_01/ncpu_2/cmp/generic rename to tests/mpi/tria_01.mpirun=2.output diff --git a/tests/mpi/tria_01/ncpu_4/cmp/generic b/tests/mpi/tria_01.mpirun=4.output similarity index 100% rename from tests/mpi/tria_01/ncpu_4/cmp/generic rename to tests/mpi/tria_01.mpirun=4.output diff --git a/tests/mpi/tria_copy_triangulation.cc b/tests/mpi/tria_copy_triangulation.cc index 6c3f2a979e..3d1cde5ba9 100644 --- a/tests/mpi/tria_copy_triangulation.cc +++ b/tests/mpi/tria_copy_triangulation.cc @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("tria_copy_triangulation").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/tria_copy_triangulation/ncpu_1/cmp/generic b/tests/mpi/tria_copy_triangulation.mpirun=1.output similarity index 100% rename from tests/mpi/tria_copy_triangulation/ncpu_1/cmp/generic rename to tests/mpi/tria_copy_triangulation.mpirun=1.output diff --git a/tests/mpi/tria_copy_triangulation/ncpu_2/cmp/generic b/tests/mpi/tria_copy_triangulation.mpirun=2.output similarity index 100% rename from tests/mpi/tria_copy_triangulation/ncpu_2/cmp/generic rename to tests/mpi/tria_copy_triangulation.mpirun=2.output diff --git a/tests/mpi/tria_copy_triangulation/ncpu_4/cmp/generic b/tests/mpi/tria_copy_triangulation.mpirun=4.output similarity index 100% rename from tests/mpi/tria_copy_triangulation/ncpu_4/cmp/generic rename to tests/mpi/tria_copy_triangulation.mpirun=4.output diff --git a/tests/mpi/trilinos_01.cc b/tests/mpi/trilinos_01.cc index b74be93aee..7ea0230a6e 100644 --- a/tests/mpi/trilinos_01.cc +++ b/tests/mpi/trilinos_01.cc @@ -94,7 +94,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_01/ncpu_10/cmp/generic b/tests/mpi/trilinos_01.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/trilinos_01/ncpu_10/cmp/generic rename to tests/mpi/trilinos_01.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/trilinos_01/ncpu_4/cmp/generic b/tests/mpi/trilinos_01.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/trilinos_01/ncpu_4/cmp/generic rename to tests/mpi/trilinos_01.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/trilinos_02.cc b/tests/mpi/trilinos_02.cc index be9c781cb9..4309a03d66 100644 --- a/tests/mpi/trilinos_02.cc +++ b/tests/mpi/trilinos_02.cc @@ -91,7 +91,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_02/ncpu_10/cmp/generic b/tests/mpi/trilinos_02.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/trilinos_02/ncpu_10/cmp/generic rename to tests/mpi/trilinos_02.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/trilinos_02/ncpu_4/cmp/generic b/tests/mpi/trilinos_02.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/trilinos_02/ncpu_4/cmp/generic rename to tests/mpi/trilinos_02.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/trilinos_bug_5609.cc b/tests/mpi/trilinos_bug_5609.cc index 8d3348cb22..68ebb9135b 100644 --- a/tests/mpi/trilinos_bug_5609.cc +++ b/tests/mpi/trilinos_bug_5609.cc @@ -76,7 +76,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_bug_5609").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_bug_5609/ncpu_2/cmp/generic b/tests/mpi/trilinos_bug_5609.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_bug_5609/ncpu_2/cmp/generic rename to tests/mpi/trilinos_bug_5609.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/trilinos_compress_bug.cc b/tests/mpi/trilinos_compress_bug.cc index a61af36043..c481a1eb50 100644 --- a/tests/mpi/trilinos_compress_bug.cc +++ b/tests/mpi/trilinos_compress_bug.cc @@ -100,7 +100,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_compress_bug").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_compress_bug/ncpu_2/cmp/generic b/tests/mpi/trilinos_compress_bug.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_compress_bug/ncpu_2/cmp/generic rename to tests/mpi/trilinos_compress_bug.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/trilinos_distribute_01.cc b/tests/mpi/trilinos_distribute_01.cc index 69b688a02c..ed2fb4268e 100644 --- a/tests/mpi/trilinos_distribute_01.cc +++ b/tests/mpi/trilinos_distribute_01.cc @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_distribute_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/trilinos_distribute_01/ncpu_1/cmp/generic b/tests/mpi/trilinos_distribute_01.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/trilinos_distribute_01/ncpu_1/cmp/generic rename to tests/mpi/trilinos_distribute_01.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/trilinos_distribute_01/ncpu_10/cmp/generic b/tests/mpi/trilinos_distribute_01.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/trilinos_distribute_01/ncpu_10/cmp/generic rename to tests/mpi/trilinos_distribute_01.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/trilinos_distribute_01/ncpu_2/cmp/generic b/tests/mpi/trilinos_distribute_01.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_distribute_01/ncpu_2/cmp/generic rename to tests/mpi/trilinos_distribute_01.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/trilinos_distribute_01/ncpu_4/cmp/generic b/tests/mpi/trilinos_distribute_01.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/trilinos_distribute_01/ncpu_4/cmp/generic rename to tests/mpi/trilinos_distribute_01.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/trilinos_distribute_01_block.cc b/tests/mpi/trilinos_distribute_01_block.cc index 25f6c6420c..ece1fef939 100644 --- a/tests/mpi/trilinos_distribute_01_block.cc +++ b/tests/mpi/trilinos_distribute_01_block.cc @@ -192,7 +192,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_distribute_01_block").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/trilinos_distribute_01_block/ncpu_1/cmp/generic b/tests/mpi/trilinos_distribute_01_block.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/trilinos_distribute_01_block/ncpu_1/cmp/generic rename to tests/mpi/trilinos_distribute_01_block.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/trilinos_distribute_01_block/ncpu_10/cmp/generic b/tests/mpi/trilinos_distribute_01_block.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/trilinos_distribute_01_block/ncpu_10/cmp/generic rename to tests/mpi/trilinos_distribute_01_block.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/trilinos_distribute_01_block/ncpu_2/cmp/generic b/tests/mpi/trilinos_distribute_01_block.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_distribute_01_block/ncpu_2/cmp/generic rename to tests/mpi/trilinos_distribute_01_block.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/trilinos_distribute_01_block/ncpu_4/cmp/generic b/tests/mpi/trilinos_distribute_01_block.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/trilinos_distribute_01_block/ncpu_4/cmp/generic rename to tests/mpi/trilinos_distribute_01_block.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/trilinos_distribute_01_inhomogenous.cc b/tests/mpi/trilinos_distribute_01_inhomogenous.cc index ae48e7350a..1670936498 100644 --- a/tests/mpi/trilinos_distribute_01_inhomogenous.cc +++ b/tests/mpi/trilinos_distribute_01_inhomogenous.cc @@ -153,7 +153,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_distribute_01_inhomogenous").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/trilinos_distribute_01_inhomogenous/ncpu_1/cmp/generic b/tests/mpi/trilinos_distribute_01_inhomogenous.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/trilinos_distribute_01_inhomogenous/ncpu_1/cmp/generic rename to tests/mpi/trilinos_distribute_01_inhomogenous.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/trilinos_distribute_01_inhomogenous/ncpu_10/cmp/generic b/tests/mpi/trilinos_distribute_01_inhomogenous.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/trilinos_distribute_01_inhomogenous/ncpu_10/cmp/generic rename to tests/mpi/trilinos_distribute_01_inhomogenous.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/trilinos_distribute_01_inhomogenous/ncpu_2/cmp/generic b/tests/mpi/trilinos_distribute_01_inhomogenous.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_distribute_01_inhomogenous/ncpu_2/cmp/generic rename to tests/mpi/trilinos_distribute_01_inhomogenous.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/trilinos_distribute_01_inhomogenous/ncpu_4/cmp/generic b/tests/mpi/trilinos_distribute_01_inhomogenous.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/trilinos_distribute_01_inhomogenous/ncpu_4/cmp/generic rename to tests/mpi/trilinos_distribute_01_inhomogenous.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/trilinos_distribute_03.cc b/tests/mpi/trilinos_distribute_03.cc index 2ccf07d7a5..830020970b 100644 --- a/tests/mpi/trilinos_distribute_03.cc +++ b/tests/mpi/trilinos_distribute_03.cc @@ -67,7 +67,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_distribute_03").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/trilinos_distribute_03/ncpu_1/cmp/generic b/tests/mpi/trilinos_distribute_03.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/trilinos_distribute_03/ncpu_1/cmp/generic rename to tests/mpi/trilinos_distribute_03.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/trilinos_distribute_03/ncpu_2/cmp/generic b/tests/mpi/trilinos_distribute_03.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_distribute_03/ncpu_2/cmp/generic rename to tests/mpi/trilinos_distribute_03.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/trilinos_distribute_04.cc b/tests/mpi/trilinos_distribute_04.cc index 214a6414d6..b1d23fd612 100644 --- a/tests/mpi/trilinos_distribute_04.cc +++ b/tests/mpi/trilinos_distribute_04.cc @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_distribute_04").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/trilinos_distribute_04/ncpu_1/cmp/generic b/tests/mpi/trilinos_distribute_04.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/trilinos_distribute_04/ncpu_1/cmp/generic rename to tests/mpi/trilinos_distribute_04.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/trilinos_distribute_04/ncpu_2/cmp/generic b/tests/mpi/trilinos_distribute_04.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_distribute_04/ncpu_2/cmp/generic rename to tests/mpi/trilinos_distribute_04.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/trilinos_ghost_01.cc b/tests/mpi/trilinos_ghost_01.cc index 59236559d1..e32f0eca04 100644 --- a/tests/mpi/trilinos_ghost_01.cc +++ b/tests/mpi/trilinos_ghost_01.cc @@ -85,7 +85,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_ghost_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_ghost_01/ncpu_10/cmp/generic b/tests/mpi/trilinos_ghost_01.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/trilinos_ghost_01/ncpu_10/cmp/generic rename to tests/mpi/trilinos_ghost_01.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/trilinos_ghost_01/ncpu_4/cmp/generic b/tests/mpi/trilinos_ghost_01.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/trilinos_ghost_01/ncpu_4/cmp/generic rename to tests/mpi/trilinos_ghost_01.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/trilinos_ghost_02.cc b/tests/mpi/trilinos_ghost_02.cc index 0d62ca2ee2..18aaf32118 100644 --- a/tests/mpi/trilinos_ghost_02.cc +++ b/tests/mpi/trilinos_ghost_02.cc @@ -76,7 +76,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_ghost_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_ghost_02/ncpu_10/cmp/generic b/tests/mpi/trilinos_ghost_02.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/trilinos_ghost_02/ncpu_10/cmp/generic rename to tests/mpi/trilinos_ghost_02.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/trilinos_ghost_02/ncpu_4/cmp/generic b/tests/mpi/trilinos_ghost_02.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/trilinos_ghost_02/ncpu_4/cmp/generic rename to tests/mpi/trilinos_ghost_02.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/trilinos_ghost_03.cc b/tests/mpi/trilinos_ghost_03.cc index 7a9118e4c6..ce327a0580 100644 --- a/tests/mpi/trilinos_ghost_03.cc +++ b/tests/mpi/trilinos_ghost_03.cc @@ -92,7 +92,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_ghost_03").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_ghost_03/ncpu_10/cmp/generic b/tests/mpi/trilinos_ghost_03.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/trilinos_ghost_03/ncpu_10/cmp/generic rename to tests/mpi/trilinos_ghost_03.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/trilinos_ghost_03/ncpu_4/cmp/generic b/tests/mpi/trilinos_ghost_03.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/trilinos_ghost_03/ncpu_4/cmp/generic rename to tests/mpi/trilinos_ghost_03.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/trilinos_ghost_03_linfty.cc b/tests/mpi/trilinos_ghost_03_linfty.cc index ae7158f223..50e91e0852 100644 --- a/tests/mpi/trilinos_ghost_03_linfty.cc +++ b/tests/mpi/trilinos_ghost_03_linfty.cc @@ -91,7 +91,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_ghost_03_linfty").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_ghost_03_linfty/ncpu_10/cmp/generic b/tests/mpi/trilinos_ghost_03_linfty.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/trilinos_ghost_03_linfty/ncpu_10/cmp/generic rename to tests/mpi/trilinos_ghost_03_linfty.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/trilinos_ghost_03_linfty/ncpu_4/cmp/generic b/tests/mpi/trilinos_ghost_03_linfty.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/trilinos_ghost_03_linfty/ncpu_4/cmp/generic rename to tests/mpi/trilinos_ghost_03_linfty.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/trilinos_ghost_05.cc b/tests/mpi/trilinos_ghost_05.cc index 32e294ccd8..c131014af1 100644 --- a/tests/mpi/trilinos_ghost_05.cc +++ b/tests/mpi/trilinos_ghost_05.cc @@ -90,7 +90,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_ghost_05").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_ghost_05/ncpu_10/cmp/generic b/tests/mpi/trilinos_ghost_05.with_trilinos=true.mpirun=10.output similarity index 100% rename from tests/mpi/trilinos_ghost_05/ncpu_10/cmp/generic rename to tests/mpi/trilinos_ghost_05.with_trilinos=true.mpirun=10.output diff --git a/tests/mpi/trilinos_ghost_05/ncpu_4/cmp/generic b/tests/mpi/trilinos_ghost_05.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/trilinos_ghost_05/ncpu_4/cmp/generic rename to tests/mpi/trilinos_ghost_05.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/trilinos_locally_owned_elements_01.cc b/tests/mpi/trilinos_locally_owned_elements_01.cc index df7eed435f..3288bcc976 100644 --- a/tests/mpi/trilinos_locally_owned_elements_01.cc +++ b/tests/mpi/trilinos_locally_owned_elements_01.cc @@ -76,7 +76,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_locally_owned_elements_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/trilinos_locally_owned_elements_01/ncpu_2/cmp/generic b/tests/mpi/trilinos_locally_owned_elements_01.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_locally_owned_elements_01/ncpu_2/cmp/generic rename to tests/mpi/trilinos_locally_owned_elements_01.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/trilinos_matvec_01.cc b/tests/mpi/trilinos_matvec_01.cc index 38e43cb345..c47727cdc8 100644 --- a/tests/mpi/trilinos_matvec_01.cc +++ b/tests/mpi/trilinos_matvec_01.cc @@ -130,7 +130,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_matvec_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_matvec_01/ncpu_1/cmp/generic b/tests/mpi/trilinos_matvec_01.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/trilinos_matvec_01/ncpu_1/cmp/generic rename to tests/mpi/trilinos_matvec_01.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/trilinos_matvec_01/ncpu_2/cmp/generic b/tests/mpi/trilinos_matvec_01.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_matvec_01/ncpu_2/cmp/generic rename to tests/mpi/trilinos_matvec_01.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/trilinos_matvec_02.cc b/tests/mpi/trilinos_matvec_02.cc index 3b91ef83ad..3eec9e3c5f 100644 --- a/tests/mpi/trilinos_matvec_02.cc +++ b/tests/mpi/trilinos_matvec_02.cc @@ -130,7 +130,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_matvec_02").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_matvec_02/ncpu_1/cmp/generic b/tests/mpi/trilinos_matvec_02.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/trilinos_matvec_02/ncpu_1/cmp/generic rename to tests/mpi/trilinos_matvec_02.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/trilinos_matvec_02/ncpu_2/cmp/generic b/tests/mpi/trilinos_matvec_02.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_matvec_02/ncpu_2/cmp/generic rename to tests/mpi/trilinos_matvec_02.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/trilinos_matvec_03.cc b/tests/mpi/trilinos_matvec_03.cc index 2df37d5176..7daa065e65 100644 --- a/tests/mpi/trilinos_matvec_03.cc +++ b/tests/mpi/trilinos_matvec_03.cc @@ -152,7 +152,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_matvec_03").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_matvec_03/ncpu_2/cmp/generic b/tests/mpi/trilinos_matvec_03.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_matvec_03/ncpu_2/cmp/generic rename to tests/mpi/trilinos_matvec_03.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/trilinos_sparse_matrix_01.cc b/tests/mpi/trilinos_sparse_matrix_01.cc index f11130bc84..8fd0dbd079 100644 --- a/tests/mpi/trilinos_sparse_matrix_01.cc +++ b/tests/mpi/trilinos_sparse_matrix_01.cc @@ -125,7 +125,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_sparse_matrix_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_sparse_matrix_01/ncpu_1/cmp/generic b/tests/mpi/trilinos_sparse_matrix_01.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/trilinos_sparse_matrix_01/ncpu_1/cmp/generic rename to tests/mpi/trilinos_sparse_matrix_01.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/trilinos_sparse_matrix_01/ncpu_2/cmp/generic b/tests/mpi/trilinos_sparse_matrix_01.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_sparse_matrix_01/ncpu_2/cmp/generic rename to tests/mpi/trilinos_sparse_matrix_01.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/trilinos_sparse_matrix_mmult_01.cc b/tests/mpi/trilinos_sparse_matrix_mmult_01.cc index f6deedddfb..9293e23f85 100644 --- a/tests/mpi/trilinos_sparse_matrix_mmult_01.cc +++ b/tests/mpi/trilinos_sparse_matrix_mmult_01.cc @@ -156,7 +156,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_sparse_matrix_mmult_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_sparse_matrix_mmult_01/ncpu_1/cmp/generic b/tests/mpi/trilinos_sparse_matrix_mmult_01.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/trilinos_sparse_matrix_mmult_01/ncpu_1/cmp/generic rename to tests/mpi/trilinos_sparse_matrix_mmult_01.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/trilinos_sparse_matrix_mmult_01/ncpu_2/cmp/generic b/tests/mpi/trilinos_sparse_matrix_mmult_01.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_sparse_matrix_mmult_01/ncpu_2/cmp/generic rename to tests/mpi/trilinos_sparse_matrix_mmult_01.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/trilinos_sparse_matrix_print_01.cc b/tests/mpi/trilinos_sparse_matrix_print_01.cc index 712493ccf0..2e5d70ac83 100644 --- a/tests/mpi/trilinos_sparse_matrix_print_01.cc +++ b/tests/mpi/trilinos_sparse_matrix_print_01.cc @@ -94,7 +94,7 @@ int main (int argc, char **argv) // in parallel if ((n_procs == 1) || (myid == 1)) { - std::ofstream logfile(output_file_for_mpi("trilinos_sparse_matrix_print_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_sparse_matrix_print_01/ncpu_1/cmp/generic b/tests/mpi/trilinos_sparse_matrix_print_01.with_trilinos=true.mpirun=1.output similarity index 100% rename from tests/mpi/trilinos_sparse_matrix_print_01/ncpu_1/cmp/generic rename to tests/mpi/trilinos_sparse_matrix_print_01.with_trilinos=true.mpirun=1.output diff --git a/tests/mpi/trilinos_sparse_matrix_print_01/ncpu_2/cmp/generic b/tests/mpi/trilinos_sparse_matrix_print_01.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_sparse_matrix_print_01/ncpu_2/cmp/generic rename to tests/mpi/trilinos_sparse_matrix_print_01.with_trilinos=true.mpirun=2.output diff --git a/tests/mpi/trilinos_vector_ghosts_01.cc b/tests/mpi/trilinos_vector_ghosts_01.cc index 0b5a1f3110..e01185a88b 100644 --- a/tests/mpi/trilinos_vector_ghosts_01.cc +++ b/tests/mpi/trilinos_vector_ghosts_01.cc @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_vector_ghosts_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); test (); } diff --git a/tests/mpi/trilinos_vector_ghosts_01/ncpu_4/cmp/generic b/tests/mpi/trilinos_vector_ghosts_01.with_trilinos=true.mpirun=4.output similarity index 100% rename from tests/mpi/trilinos_vector_ghosts_01/ncpu_4/cmp/generic rename to tests/mpi/trilinos_vector_ghosts_01.with_trilinos=true.mpirun=4.output diff --git a/tests/mpi/trilinos_vector_reinit.cc b/tests/mpi/trilinos_vector_reinit.cc index cb10089551..bb1229d2b4 100644 --- a/tests/mpi/trilinos_vector_reinit.cc +++ b/tests/mpi/trilinos_vector_reinit.cc @@ -69,7 +69,7 @@ int main (int argc, char **argv) if (myid == 0) { - std::ofstream logfile(output_file_for_mpi("trilinos_vector_reinit").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(4); deallog.depth_console(0); diff --git a/tests/mpi/trilinos_vector_reinit/ncpu_2/cmp/generic b/tests/mpi/trilinos_vector_reinit.with_trilinos=true.mpirun=2.output similarity index 100% rename from tests/mpi/trilinos_vector_reinit/ncpu_2/cmp/generic rename to tests/mpi/trilinos_vector_reinit.with_trilinos=true.mpirun=2.output diff --git a/tests/tests.h b/tests/tests.h index 2bd335ed01..104ad88f88 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -97,30 +97,15 @@ initlog(bool console=false) } -// append the directory name with an output file name that indicates -// the number of MPI processes -inline std::string -output_file_for_mpi (const std::string &directory) -{ -#ifdef DEAL_II_WITH_MPI - return (directory + "/ncpu_" + - Utilities::int_to_string (Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD)) + - "/output"); -#else - return (directory + "/ncpu_1/output"); -#endif -} - - inline void -mpi_initlog(const char *filename, bool console=false) +mpi_initlog(bool console=false) { #ifdef DEAL_II_WITH_MPI unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); if (myid == 0) { - deallogname = output_file_for_mpi(JobIdentifier::base_name(filename)); + deallogname = "output"; deallogfile.open(deallogname.c_str()); deallog.attach(deallogfile); if (!console) @@ -139,15 +124,13 @@ mpi_initlog(const char *filename, bool console=false) /* helper class to include the deallogs of all processors on proc 0 */ -class MPILogInitAll +struct MPILogInitAll { -public: - MPILogInitAll(const char *filename, bool console=false) - : m_filename(filename) + MPILogInitAll(bool console=false) { #ifdef DEAL_II_WITH_MPI unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); - deallogname = output_file_for_mpi(JobIdentifier::base_name(filename)); + deallogname = "output"; if (myid != 0) deallogname = deallogname + Utilities::int_to_string(myid); deallogfile.open(deallogname.c_str()); @@ -184,13 +167,12 @@ public: check_petsc_allocations(); MPI_Barrier(MPI_COMM_WORLD); #endif - + if (myid==0) { for (unsigned int i=1; i