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 (file)
index b1be076..0000000
--- 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 e71a50da03fb58b219f06dc1229733b0769a50a5..5587b43f45d12f881a4c095b2cac95b970e0afc0 100644 (file)
--- 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 03de0fc6b8a708319baa848dfc05fb4398395e1b..5fb7777d5bf43a5e389c72e835acdfa40f2136ea 100644 (file)
--- 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 8a46835da2b193ea414b8e8536e7294563005326..a68306a4785fe8fb60de1260d5546eeb1805b088 100644 (file)
--- 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 e96be453c9f4f0622b85275507b18447e66677a4..81b312ce41e40b2ad1289c4a18ee9d85a351429f 100644 (file)
--- 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<LA_PETSc>();

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 9fcad3fafbe8f8716ba445e3a864f8f255ae4011..864627576a6186cfcbefe6c161eb820689690b93 100644 (file)
--- 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<LA_PETSc>();

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 cd895ed9be83ed5fd16f65690f6f9380572da1e6..2901792e5ee92e5684d9aabce290e094ae2fe13f 100644 (file)
--- 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<LA_PETSc>();

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 ee5398d9424f99de3be2c4ec60e98000b47341b3..ab9a30ec8b5cf97126d6a6e311501c6f02b54bb6 100644 (file)
--- 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<LA_PETSc>();

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 e96721758cb002b1d92ab01dc6952fccce7de1eb..cea07dfcc477bdeee83d0b43cf0d44bf9d01e0c2 100644 (file)
--- 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 80b55693630dd5ae1a063c640c0d6fa8a2bc248a..dda88b8a155505b8a5b0178e9ca0ec8f3561fdda 100644 (file)
--- 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 21803813c221b801f3599674cce34eec64b4e666..65e592b4776f4c1a8f50791f5f7b0c84944c2c48 100644 (file)
--- 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<LA_PETSc>();

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 52f499c98b8d29ed490d7a7d2a46d453b260078c..0faed2dc3cdd467aa1b99281e4d4eee40407d422 100644 (file)
--- 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<LA_PETSc>();

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 02e30102a7759e1162d3f11de7d0246b8bc0665d..39589bb0580b2776bb543123e2355de4e53ec912 100644 (file)
--- 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 78f0a0f8453a00bd6170d812d256afe43d6fc603..01fc9e15116c0e09a03f6f5f9a6446a1676b52dd 100644 (file)
--- 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 1ccfb00af1480a11929cc950251ed1d8372be13d..3d42e13d645c977aa0a2e56a1520df091cd8c967 100644 (file)
--- 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 6ff6788baed481bdde62b8720fca6c2fd203a7c2..7944ebcb0c834b40b7b78f2a32349e4af6a23e23 100644 (file)
--- 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 8997016ccef0974080b038287d2262508ada8e10..6b9d3e058bfa1298b476b74b64311817b2db3968 100644 (file)
--- 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 b765b27bc4ca53bafe073818ce979240972676c8..9e497320bc3e8427fe5d11a1a06068c71a2cf553 100644 (file)
--- 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<LA_PETSc>();

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 457612154416a638d287b42da34a07d427634af3..db355fe4a999e1706a7bddc773f5bdb52da5d9b7 100644 (file)
--- 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<LA_PETSc>();

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 fee6b4ee235feb550ea6688f9182e3269b3856ea..db5b503f24e67536d7baa2c75eae71d21af1d74a 100644 (file)
--- 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<LA_PETSc>();

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 562dbecd464ca876de38f25d958031961a6c93da..3f9dea4fb09083e003b8c1be135f0ae01549d217 100644 (file)
--- 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<LA_PETSc>();

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 (file)
index 218ec45..0000000
--- 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 a764e0efef9cfc373ddbcc9944120da2e590c77f..0ed5b503e6b5fe7765fc9ae0d2cd6ccee030fe6a 100644 (file)
--- 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<Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD); ++i)
         {
-          cat_file((JobIdentifier::base_name(__FILE__)+"/ncpu_" + Utilities::int_to_string(Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD)) + "/dat." + Utilities::int_to_string(i)).c_str());
+          cat_file(("dat." + Utilities::int_to_string(i)).c_str());
         }
     }
 
@@ -109,7 +109,7 @@ int main (int argc, char **argv)
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("blockvec_01").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog << std::setprecision(4);
       deallog.depth_console(0);

diff --git a/tests/mpi/blockvec_01/ncpu_10/cmp/generic b/tests/mpi/blockvec_01.with_petsc=true.with_trilinos=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/blockvec_01/ncpu_10/cmp/generic
rename to tests/mpi/blockvec_01.with_petsc=true.with_trilinos=true.mpirun=10.output

diff --git a/tests/mpi/blockvec_01/ncpu_4/cmp/generic b/tests/mpi/blockvec_01.with_petsc=true.with_trilinos=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/blockvec_01/ncpu_4/cmp/generic
rename to tests/mpi/blockvec_01.with_petsc=true.with_trilinos=true.mpirun=4.output

diff --git a/tests/mpi/collective_01.cc b/tests/mpi/collective_01.cc
index e6c7d8c11677c992dd28492a6c69bf9dab13b0f3..84d572cbda26872277d953636d056bf0b6047e00 100644 (file)
--- a/tests/mpi/collective_01.cc
+++ b/tests/mpi/collective_01.cc
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("collective_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/collective_01/ncpu_1/cmp/generic b/tests/mpi/collective_01.mpirun=1.output
similarity index 100%
rename from tests/mpi/collective_01/ncpu_1/cmp/generic
rename to tests/mpi/collective_01.mpirun=1.output

diff --git a/tests/mpi/collective_01/ncpu_10/cmp/generic b/tests/mpi/collective_01.mpirun=10.output
similarity index 100%
rename from tests/mpi/collective_01/ncpu_10/cmp/generic
rename to tests/mpi/collective_01.mpirun=10.output

diff --git a/tests/mpi/collective_01/ncpu_4/cmp/generic b/tests/mpi/collective_01.mpirun=4.output
similarity index 100%
rename from tests/mpi/collective_01/ncpu_4/cmp/generic
rename to tests/mpi/collective_01.mpirun=4.output

diff --git a/tests/mpi/collective_02.cc b/tests/mpi/collective_02.cc
index 7e6807e0c86b863346ab3a0aeed6adae17d2321f..533ab7e48362ddf004c7a2b8d82d659b4cad1e00 100644 (file)
--- a/tests/mpi/collective_02.cc
+++ b/tests/mpi/collective_02.cc
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("collective_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/collective_02/ncpu_1/cmp/generic b/tests/mpi/collective_02.mpirun=1.output
similarity index 100%
rename from tests/mpi/collective_02/ncpu_1/cmp/generic
rename to tests/mpi/collective_02.mpirun=1.output

diff --git a/tests/mpi/collective_02/ncpu_10/cmp/generic b/tests/mpi/collective_02.mpirun=10.output
similarity index 100%
rename from tests/mpi/collective_02/ncpu_10/cmp/generic
rename to tests/mpi/collective_02.mpirun=10.output

diff --git a/tests/mpi/collective_02/ncpu_4/cmp/generic b/tests/mpi/collective_02.mpirun=4.output
similarity index 100%
rename from tests/mpi/collective_02/ncpu_4/cmp/generic
rename to tests/mpi/collective_02.mpirun=4.output

diff --git a/tests/mpi/collective_02_array.cc b/tests/mpi/collective_02_array.cc
index 29c864e5910a17058812fc749a7e157b6acd2cd8..c1b3d89c4269417bdd1f91117e30b5f2e75a5da2 100644 (file)
--- a/tests/mpi/collective_02_array.cc
+++ b/tests/mpi/collective_02_array.cc
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("collective_02_array").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog.depth_console(0);
       deallog.threshold_double(1.e-10);

diff --git a/tests/mpi/collective_02_array/ncpu_1/cmp/generic b/tests/mpi/collective_02_array.mpirun=1.output
similarity index 100%
rename from tests/mpi/collective_02_array/ncpu_1/cmp/generic
rename to tests/mpi/collective_02_array.mpirun=1.output

diff --git a/tests/mpi/collective_02_array/ncpu_10/cmp/generic b/tests/mpi/collective_02_array.mpirun=10.output
similarity index 100%
rename from tests/mpi/collective_02_array/ncpu_10/cmp/generic
rename to tests/mpi/collective_02_array.mpirun=10.output

diff --git a/tests/mpi/collective_02_array/ncpu_4/cmp/generic b/tests/mpi/collective_02_array.mpirun=4.output
similarity index 100%
rename from tests/mpi/collective_02_array/ncpu_4/cmp/generic
rename to tests/mpi/collective_02_array.mpirun=4.output

diff --git a/tests/mpi/collective_03.cc b/tests/mpi/collective_03.cc
index 5234930097b6ffad8f94f43545cd325f2c4e2a4b..2595a1a9612f3f9e7116932268424d9038880ad9 100644 (file)
--- a/tests/mpi/collective_03.cc
+++ b/tests/mpi/collective_03.cc
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("collective_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/collective_03/ncpu_1/cmp/generic b/tests/mpi/collective_03.mpirun=1.output
similarity index 100%
rename from tests/mpi/collective_03/ncpu_1/cmp/generic
rename to tests/mpi/collective_03.mpirun=1.output

diff --git a/tests/mpi/collective_03/ncpu_10/cmp/generic b/tests/mpi/collective_03.mpirun=10.output
similarity index 100%
rename from tests/mpi/collective_03/ncpu_10/cmp/generic
rename to tests/mpi/collective_03.mpirun=10.output

diff --git a/tests/mpi/collective_03/ncpu_4/cmp/generic b/tests/mpi/collective_03.mpirun=4.output
similarity index 100%
rename from tests/mpi/collective_03/ncpu_4/cmp/generic
rename to tests/mpi/collective_03.mpirun=4.output

diff --git a/tests/mpi/collective_03_array.cc b/tests/mpi/collective_03_array.cc
index 5020043760356a3a4fb5c1ad163af6c61f8f579e..39aa489f80b6701386a671a0d79a22dbe7bc36e2 100644 (file)
--- a/tests/mpi/collective_03_array.cc
+++ b/tests/mpi/collective_03_array.cc
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("collective_03_array").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog.depth_console(0);
       deallog.threshold_double(1.e-10);

diff --git a/tests/mpi/collective_03_array/ncpu_1/cmp/generic b/tests/mpi/collective_03_array.mpirun=1.output
similarity index 100%
rename from tests/mpi/collective_03_array/ncpu_1/cmp/generic
rename to tests/mpi/collective_03_array.mpirun=1.output

diff --git a/tests/mpi/collective_03_array/ncpu_10/cmp/generic b/tests/mpi/collective_03_array.mpirun=10.output
similarity index 100%
rename from tests/mpi/collective_03_array/ncpu_10/cmp/generic
rename to tests/mpi/collective_03_array.mpirun=10.output

diff --git a/tests/mpi/collective_03_array/ncpu_4/cmp/generic b/tests/mpi/collective_03_array.mpirun=4.output
similarity index 100%
rename from tests/mpi/collective_03_array/ncpu_4/cmp/generic
rename to tests/mpi/collective_03_array.mpirun=4.output

diff --git a/tests/mpi/compute_mean_value.cc b/tests/mpi/compute_mean_value.cc
index 255c3a684ee253e1d4094dd83244f9357f022adc..e38c57e5a8e70d703cc14df35df2ef9742103b78 100644 (file)
--- a/tests/mpi/compute_mean_value.cc
+++ b/tests/mpi/compute_mean_value.cc
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("compute_mean_value").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog.depth_console(0);
       deallog.threshold_double(1.e-10);

diff --git a/tests/mpi/compute_mean_value/ncpu_10/cmp/generic b/tests/mpi/compute_mean_value.with_trilinos=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/compute_mean_value/ncpu_10/cmp/generic
rename to tests/mpi/compute_mean_value.with_trilinos=true.mpirun=10.output

diff --git a/tests/mpi/compute_mean_value/ncpu_4/cmp/generic b/tests/mpi/compute_mean_value.with_trilinos=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/compute_mean_value/ncpu_4/cmp/generic
rename to tests/mpi/compute_mean_value.with_trilinos=true.mpirun=4.output

diff --git a/tests/mpi/constraint_matrix_condense_01.cc b/tests/mpi/constraint_matrix_condense_01.cc
index 3f7d52aae146ec63eb352fbef70f26166b01ec68..0840201e034e1ea44f79cc609a113e0944123137 100644 (file)
--- a/tests/mpi/constraint_matrix_condense_01.cc
+++ b/tests/mpi/constraint_matrix_condense_01.cc
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("constraint_matrix_condense_01").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog << std::setprecision(4);
       deallog.depth_console(0);

diff --git a/tests/mpi/constraint_matrix_condense_01/ncpu_1/cmp/generic b/tests/mpi/constraint_matrix_condense_01.with_petsc=true.mpirun=1.output
similarity index 100%
rename from tests/mpi/constraint_matrix_condense_01/ncpu_1/cmp/generic
rename to tests/mpi/constraint_matrix_condense_01.with_petsc=true.mpirun=1.output

diff --git a/tests/mpi/constraint_matrix_condense_01/ncpu_4/cmp/generic b/tests/mpi/constraint_matrix_condense_01.with_petsc=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/constraint_matrix_condense_01/ncpu_4/cmp/generic
rename to tests/mpi/constraint_matrix_condense_01.with_petsc=true.mpirun=4.output

diff --git a/tests/mpi/constraint_matrix_set_zero_01.cc b/tests/mpi/constraint_matrix_set_zero_01.cc
index 0d609bba582698d2683fa27d21d5783a7383bea2..842eb2d7547660648018861d878f31d4b01e81c3 100644 (file)
--- a/tests/mpi/constraint_matrix_set_zero_01.cc
+++ b/tests/mpi/constraint_matrix_set_zero_01.cc
@@ -78,7 +78,7 @@ void test ()
 int main(int argc, char *argv[])
 {
   Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
-  MPILogInitAll log(__FILE__);
+  MPILogInitAll log();
 
   test();
   return 0;

diff --git a/tests/mpi/constraint_matrix_set_zero_01/ncpu_1/cmp/generic b/tests/mpi/constraint_matrix_set_zero_01.with_petsc=true.mpirun=1.output
similarity index 100%
rename from tests/mpi/constraint_matrix_set_zero_01/ncpu_1/cmp/generic
rename to tests/mpi/constraint_matrix_set_zero_01.with_petsc=true.mpirun=1.output

diff --git a/tests/mpi/constraint_matrix_set_zero_01/ncpu_2/cmp/generic b/tests/mpi/constraint_matrix_set_zero_01.with_petsc=true.mpirun=2.output
similarity index 100%
rename from tests/mpi/constraint_matrix_set_zero_01/ncpu_2/cmp/generic
rename to tests/mpi/constraint_matrix_set_zero_01.with_petsc=true.mpirun=2.output

diff --git a/tests/mpi/constraint_matrix_set_zero_02.cc b/tests/mpi/constraint_matrix_set_zero_02.cc
index 89d89fa4cce8acf33260102d2321b233ce71f138..6a0239deeed022bbd3a049e722906ccb0e4c86c6 100644 (file)
--- a/tests/mpi/constraint_matrix_set_zero_02.cc
+++ b/tests/mpi/constraint_matrix_set_zero_02.cc
@@ -81,7 +81,7 @@ void test ()
 int main(int argc, char *argv[])
 {
   Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
-  MPILogInitAll log(__FILE__);
+  MPILogInitAll log();
 
   test();
   return 0;

diff --git a/tests/mpi/constraint_matrix_set_zero_02/ncpu_1/cmp/generic b/tests/mpi/constraint_matrix_set_zero_02.mpirun=1.output
similarity index 100%
rename from tests/mpi/constraint_matrix_set_zero_02/ncpu_1/cmp/generic
rename to tests/mpi/constraint_matrix_set_zero_02.mpirun=1.output

diff --git a/tests/mpi/constraint_matrix_set_zero_02/ncpu_2/cmp/generic b/tests/mpi/constraint_matrix_set_zero_02.mpirun=2.output
similarity index 100%
rename from tests/mpi/constraint_matrix_set_zero_02/ncpu_2/cmp/generic
rename to tests/mpi/constraint_matrix_set_zero_02.mpirun=2.output

diff --git a/tests/mpi/constraint_matrix_trilinos_bug.cc b/tests/mpi/constraint_matrix_trilinos_bug.cc
index 096ab7d1259008ecb7bb6069070a9aad0c6d615e..20f6b418d766ec998fce10dcec31376df0a0cf64 100644 (file)
--- a/tests/mpi/constraint_matrix_trilinos_bug.cc
+++ b/tests/mpi/constraint_matrix_trilinos_bug.cc
@@ -152,7 +152,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("constraint_matrix_trilinos_bug").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog.depth_console(0);
       deallog.threshold_double(1.e-10);

diff --git a/tests/mpi/constraint_matrix_trilinos_bug/ncpu_10/cmp/generic b/tests/mpi/constraint_matrix_trilinos_bug.with_trilinos=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/constraint_matrix_trilinos_bug/ncpu_10/cmp/generic
rename to tests/mpi/constraint_matrix_trilinos_bug.with_trilinos=true.mpirun=10.output

diff --git a/tests/mpi/constraint_matrix_trilinos_bug/ncpu_4/cmp/generic b/tests/mpi/constraint_matrix_trilinos_bug.with_trilinos=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/constraint_matrix_trilinos_bug/ncpu_4/cmp/generic
rename to tests/mpi/constraint_matrix_trilinos_bug.with_trilinos=true.mpirun=4.output

diff --git a/tests/mpi/count_dofs_per_block_01.cc b/tests/mpi/count_dofs_per_block_01.cc
index d8b4d26a3413e10f7e20995df2eb522bf58dfbc0..4887d2507747fd3f0c3f4e747f9c2496f55619f8 100644 (file)
--- a/tests/mpi/count_dofs_per_block_01.cc
+++ b/tests/mpi/count_dofs_per_block_01.cc
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("count_dofs_per_block_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/count_dofs_per_block_01/ncpu_10/cmp/generic b/tests/mpi/count_dofs_per_block_01.mpirun=10.output
similarity index 100%
rename from tests/mpi/count_dofs_per_block_01/ncpu_10/cmp/generic
rename to tests/mpi/count_dofs_per_block_01.mpirun=10.output

diff --git a/tests/mpi/count_dofs_per_block_01/ncpu_4/cmp/generic b/tests/mpi/count_dofs_per_block_01.mpirun=4.output
similarity index 100%
rename from tests/mpi/count_dofs_per_block_01/ncpu_4/cmp/generic
rename to tests/mpi/count_dofs_per_block_01.mpirun=4.output

diff --git a/tests/mpi/count_dofs_per_block_02.cc b/tests/mpi/count_dofs_per_block_02.cc
index 6242127ff41218091f091ee622ebae0fccc4e48d..39a43ce53f97b186546f193dd879cde4ae6921cc 100644 (file)
--- a/tests/mpi/count_dofs_per_block_02.cc
+++ b/tests/mpi/count_dofs_per_block_02.cc
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("count_dofs_per_block_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/count_dofs_per_block_02/ncpu_10/cmp/generic b/tests/mpi/count_dofs_per_block_02.mpirun=10.output
similarity index 100%
rename from tests/mpi/count_dofs_per_block_02/ncpu_10/cmp/generic
rename to tests/mpi/count_dofs_per_block_02.mpirun=10.output

diff --git a/tests/mpi/count_dofs_per_block_02/ncpu_4/cmp/generic b/tests/mpi/count_dofs_per_block_02.mpirun=4.output
similarity index 100%
rename from tests/mpi/count_dofs_per_block_02/ncpu_4/cmp/generic
rename to tests/mpi/count_dofs_per_block_02.mpirun=4.output

diff --git a/tests/mpi/count_dofs_per_component_01.cc b/tests/mpi/count_dofs_per_component_01.cc
index 3e74a4d065d385e4435c1fdc8cab7c253eb68d39..db086b46cf2edaa65577b5ecb67318f827010fbc 100644 (file)
--- a/tests/mpi/count_dofs_per_component_01.cc
+++ b/tests/mpi/count_dofs_per_component_01.cc
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("count_dofs_per_component_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/count_dofs_per_component_01/ncpu_10/cmp/generic b/tests/mpi/count_dofs_per_component_01.mpirun=10.output
similarity index 100%
rename from tests/mpi/count_dofs_per_component_01/ncpu_10/cmp/generic
rename to tests/mpi/count_dofs_per_component_01.mpirun=10.output

diff --git a/tests/mpi/count_dofs_per_component_01/ncpu_4/cmp/generic b/tests/mpi/count_dofs_per_component_01.mpirun=4.output
similarity index 100%
rename from tests/mpi/count_dofs_per_component_01/ncpu_4/cmp/generic
rename to tests/mpi/count_dofs_per_component_01.mpirun=4.output

diff --git a/tests/mpi/crash_01.cc b/tests/mpi/crash_01.cc
index 0892259f09d1d2bbc80ec3263f4999646ec718f8..c5381a80d3f7aa67de7ab318f1aebb88ae8ee318 100644 (file)
--- a/tests/mpi/crash_01.cc
+++ b/tests/mpi/crash_01.cc
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("crash_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/crash_01/ncpu_10/cmp/generic b/tests/mpi/crash_01.mpirun=10.output
similarity index 100%
rename from tests/mpi/crash_01/ncpu_10/cmp/generic
rename to tests/mpi/crash_01.mpirun=10.output

diff --git a/tests/mpi/crash_01/ncpu_4/cmp/generic b/tests/mpi/crash_01.mpirun=4.output
similarity index 100%
rename from tests/mpi/crash_01/ncpu_4/cmp/generic
rename to tests/mpi/crash_01.mpirun=4.output

diff --git a/tests/mpi/crash_02.cc b/tests/mpi/crash_02.cc
index 3e461b1bf0cfd08649e5646b9aff44bdaafdd555..ff8357a5dc466af1144aff2427e141a8af6dd5c7 100644 (file)
--- a/tests/mpi/crash_02.cc
+++ b/tests/mpi/crash_02.cc
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("crash_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/crash_02/ncpu_2/cmp/generic b/tests/mpi/crash_02.mpirun=2.output
similarity index 100%
rename from tests/mpi/crash_02/ncpu_2/cmp/generic
rename to tests/mpi/crash_02.mpirun=2.output

diff --git a/tests/mpi/crash_03.cc b/tests/mpi/crash_03.cc
index 96c1b50e35b57855c6419a44ee5f63afa7139dd8..857f65c7ecd580cb7323b24d97cf1af33fd13790 100644 (file)
--- a/tests/mpi/crash_03.cc
+++ b/tests/mpi/crash_03.cc
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("crash_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/crash_03/ncpu_10/cmp/generic b/tests/mpi/crash_03.mpirun=10.output
similarity index 100%
rename from tests/mpi/crash_03/ncpu_10/cmp/generic
rename to tests/mpi/crash_03.mpirun=10.output

diff --git a/tests/mpi/crash_03/ncpu_4/cmp/generic b/tests/mpi/crash_03.mpirun=4.output
similarity index 100%
rename from tests/mpi/crash_03/ncpu_4/cmp/generic
rename to tests/mpi/crash_03.mpirun=4.output

diff --git a/tests/mpi/crash_04.cc b/tests/mpi/crash_04.cc
index d91098a4f552ec6e506018bb3219087724196cc5..306d6beed3ffeacc283ea4b95ce9588844d2ec7d 100644 (file)
--- a/tests/mpi/crash_04.cc
+++ b/tests/mpi/crash_04.cc
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("crash_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/crash_04/ncpu_2/cmp/generic b/tests/mpi/crash_04.mpirun=2.output
similarity index 100%
rename from tests/mpi/crash_04/ncpu_2/cmp/generic
rename to tests/mpi/crash_04.mpirun=2.output

diff --git a/tests/mpi/distribute_sp_01.cc b/tests/mpi/distribute_sp_01.cc
index 204bbe65702512f4d789a64a146144a6c0113103..540e2b5f9fa991ace73e6bf1626029c4f56d4651 100644 (file)
--- a/tests/mpi/distribute_sp_01.cc
+++ b/tests/mpi/distribute_sp_01.cc
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("distribute_sp_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/distribute_sp_01/ncpu_10/cmp/generic b/tests/mpi/distribute_sp_01.mpirun=10.output
similarity index 100%
rename from tests/mpi/distribute_sp_01/ncpu_10/cmp/generic
rename to tests/mpi/distribute_sp_01.mpirun=10.output

diff --git a/tests/mpi/distribute_sp_01/ncpu_4/cmp/generic b/tests/mpi/distribute_sp_01.mpirun=4.output
similarity index 100%
rename from tests/mpi/distribute_sp_01/ncpu_4/cmp/generic
rename to tests/mpi/distribute_sp_01.mpirun=4.output

diff --git a/tests/mpi/distribute_sp_02.cc b/tests/mpi/distribute_sp_02.cc
index 86669bd569f521c782f7c16062af5a24f3447cb5..ea0a783760e801859531aaee778ae09a5d8c2594 100644 (file)
--- a/tests/mpi/distribute_sp_02.cc
+++ b/tests/mpi/distribute_sp_02.cc
@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("distribute_sp_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/distribute_sp_02/ncpu_10/cmp/generic b/tests/mpi/distribute_sp_02.mpirun=10.output
similarity index 100%
rename from tests/mpi/distribute_sp_02/ncpu_10/cmp/generic
rename to tests/mpi/distribute_sp_02.mpirun=10.output

diff --git a/tests/mpi/distribute_sp_02/ncpu_4/cmp/generic b/tests/mpi/distribute_sp_02.mpirun=4.output
similarity index 100%
rename from tests/mpi/distribute_sp_02/ncpu_4/cmp/generic
rename to tests/mpi/distribute_sp_02.mpirun=4.output

diff --git a/tests/mpi/dof_handler_number_cache.cc b/tests/mpi/dof_handler_number_cache.cc
index 59954ac9b6e9b61f8b1c446ec0b976125112467c..258a02a42dd54a7c7137dbc5a0b34e834ece3d72 100644 (file)
--- a/tests/mpi/dof_handler_number_cache.cc
+++ b/tests/mpi/dof_handler_number_cache.cc
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
   unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("dof_handler_number_cache").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog.depth_console(0);
       deallog.threshold_double(1.e-10);

diff --git a/tests/mpi/dof_handler_number_cache/ncpu_10/cmp/generic b/tests/mpi/dof_handler_number_cache.mpirun=10.output
similarity index 100%
rename from tests/mpi/dof_handler_number_cache/ncpu_10/cmp/generic
rename to tests/mpi/dof_handler_number_cache.mpirun=10.output

diff --git a/tests/mpi/dof_handler_number_cache/ncpu_4/cmp/generic b/tests/mpi/dof_handler_number_cache.mpirun=4.output
similarity index 100%
rename from tests/mpi/dof_handler_number_cache/ncpu_4/cmp/generic
rename to tests/mpi/dof_handler_number_cache.mpirun=4.output

diff --git a/tests/mpi/extract_boundary_dofs.cc b/tests/mpi/extract_boundary_dofs.cc
index 81e0dacc803f2a5939d5679e5c20f0c46af24baf..dd3fe75b58e81f8c35778d356469a34bb6f6558f 100644 (file)
--- a/tests/mpi/extract_boundary_dofs.cc
+++ b/tests/mpi/extract_boundary_dofs.cc
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("extract_boundary_dofs").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog.depth_console(0);
       deallog.threshold_double(1.e-10);

diff --git a/tests/mpi/extract_boundary_dofs/ncpu_10/cmp/generic b/tests/mpi/extract_boundary_dofs.mpirun=10.output
similarity index 100%
rename from tests/mpi/extract_boundary_dofs/ncpu_10/cmp/generic
rename to tests/mpi/extract_boundary_dofs.mpirun=10.output

diff --git a/tests/mpi/extract_boundary_dofs/ncpu_4/cmp/generic b/tests/mpi/extract_boundary_dofs.mpirun=4.output
similarity index 100%
rename from tests/mpi/extract_boundary_dofs/ncpu_4/cmp/generic
rename to tests/mpi/extract_boundary_dofs.mpirun=4.output

diff --git a/tests/mpi/extract_constant_modes_01.cc b/tests/mpi/extract_constant_modes_01.cc
index 7069b9c2fe36129aa7cfb93e779fb692fad99576..3e2fbffad3876b9b2b42f64fe31f9ac67cb9e661 100644 (file)
--- a/tests/mpi/extract_constant_modes_01.cc
+++ b/tests/mpi/extract_constant_modes_01.cc
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("extract_constant_modes_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/extract_constant_modes_01/ncpu_10/cmp/generic b/tests/mpi/extract_constant_modes_01.mpirun=10.output
similarity index 100%
rename from tests/mpi/extract_constant_modes_01/ncpu_10/cmp/generic
rename to tests/mpi/extract_constant_modes_01.mpirun=10.output

diff --git a/tests/mpi/extract_constant_modes_01/ncpu_4/cmp/generic b/tests/mpi/extract_constant_modes_01.mpirun=4.output
similarity index 100%
rename from tests/mpi/extract_constant_modes_01/ncpu_4/cmp/generic
rename to tests/mpi/extract_constant_modes_01.mpirun=4.output

diff --git a/tests/mpi/extract_locally_active_dofs.cc b/tests/mpi/extract_locally_active_dofs.cc
index c91abb5455e3c1edbf393bfeeea4da822073f313..3adaba3eb6bac2c41e3ffb58122dc7127afba9b5 100644 (file)
--- a/tests/mpi/extract_locally_active_dofs.cc
+++ b/tests/mpi/extract_locally_active_dofs.cc
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("extract_locally_active_dofs").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog.depth_console(0);
       deallog.threshold_double(1.e-10);

diff --git a/tests/mpi/extract_locally_active_dofs/ncpu_10/cmp/generic b/tests/mpi/extract_locally_active_dofs.mpirun=10.output
similarity index 100%
rename from tests/mpi/extract_locally_active_dofs/ncpu_10/cmp/generic
rename to tests/mpi/extract_locally_active_dofs.mpirun=10.output

diff --git a/tests/mpi/extract_locally_active_dofs/ncpu_4/cmp/generic b/tests/mpi/extract_locally_active_dofs.mpirun=4.output
similarity index 100%
rename from tests/mpi/extract_locally_active_dofs/ncpu_4/cmp/generic
rename to tests/mpi/extract_locally_active_dofs.mpirun=4.output

diff --git a/tests/mpi/fe_field_function_01.cc b/tests/mpi/fe_field_function_01.cc
index 65bbc28207acbbee8eb5b0b8d12f135d12b47f40..b98b7f8ba2203679b1d997c3b0c7ad64528cb0b4 100644 (file)
--- a/tests/mpi/fe_field_function_01.cc
+++ b/tests/mpi/fe_field_function_01.cc
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("fe_field_function_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/fe_field_function_01/ncpu_10/cmp/generic b/tests/mpi/fe_field_function_01.with_trilinos=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/fe_field_function_01/ncpu_10/cmp/generic
rename to tests/mpi/fe_field_function_01.with_trilinos=true.mpirun=10.output

diff --git a/tests/mpi/fe_field_function_01/ncpu_4/cmp/generic b/tests/mpi/fe_field_function_01.with_trilinos=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/fe_field_function_01/ncpu_4/cmp/generic
rename to tests/mpi/fe_field_function_01.with_trilinos=true.mpirun=4.output

diff --git a/tests/mpi/flux_edge_01.cc b/tests/mpi/flux_edge_01.cc
index 7eb36863921fcb7e7dbe45bfba059c07a82e8fdc..33e92d1432c2e3f5a4b75887df1935f327b9a400 100644 (file)
--- a/tests/mpi/flux_edge_01.cc
+++ b/tests/mpi/flux_edge_01.cc
@@ -192,7 +192,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/flux_edge_01/ncpu_4/cmp/generic b/tests/mpi/flux_edge_01.with_trilinos=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/flux_edge_01/ncpu_4/cmp/generic
rename to tests/mpi/flux_edge_01.with_trilinos=true.mpirun=4.output

diff --git a/tests/mpi/ghost_01.cc b/tests/mpi/ghost_01.cc
index 322d960943efc838c3abef768bfd1c5c5711e4a3..f14ba7932709fff5d59b8901ff43f70d39c4c3b0 100644 (file)
--- a/tests/mpi/ghost_01.cc
+++ b/tests/mpi/ghost_01.cc
@@ -90,7 +90,7 @@ int main (int argc, char **argv)
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("ghost_01").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog << std::setprecision(4);
       deallog.depth_console(0);

diff --git a/tests/mpi/ghost_01/ncpu_10/cmp/generic b/tests/mpi/ghost_01.with_petsc=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/ghost_01/ncpu_10/cmp/generic
rename to tests/mpi/ghost_01.with_petsc=true.mpirun=10.output

diff --git a/tests/mpi/ghost_01/ncpu_4/cmp/generic b/tests/mpi/ghost_01.with_petsc=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/ghost_01/ncpu_4/cmp/generic
rename to tests/mpi/ghost_01.with_petsc=true.mpirun=4.output

diff --git a/tests/mpi/ghost_02.cc b/tests/mpi/ghost_02.cc
index 90de40f7a6732d57a48e9fd86b644520501fe09b..f80985e89e91e74b52c29481977eca7ed66a059b 100644 (file)
--- a/tests/mpi/ghost_02.cc
+++ b/tests/mpi/ghost_02.cc
@@ -104,7 +104,7 @@ int main (int argc, char **argv)
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("ghost_02").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog << std::setprecision(4);
       deallog.depth_console(0);

diff --git a/tests/mpi/ghost_02/ncpu_10/cmp/generic b/tests/mpi/ghost_02.with_petsc=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/ghost_02/ncpu_10/cmp/generic
rename to tests/mpi/ghost_02.with_petsc=true.mpirun=10.output

diff --git a/tests/mpi/ghost_02/ncpu_4/cmp/generic b/tests/mpi/ghost_02.with_petsc=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/ghost_02/ncpu_4/cmp/generic
rename to tests/mpi/ghost_02.with_petsc=true.mpirun=4.output

diff --git a/tests/mpi/ghost_03.cc b/tests/mpi/ghost_03.cc
index a94007a035d3ec9ac945e884502561d42b24fa46..6ca47386819531583dc5ea7f045ccab8b59aabf2 100644 (file)
--- a/tests/mpi/ghost_03.cc
+++ b/tests/mpi/ghost_03.cc
@@ -108,7 +108,7 @@ int main (int argc, char **argv)
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("ghost_03").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog << std::setprecision(4);
       deallog.depth_console(0);

diff --git a/tests/mpi/ghost_03/ncpu_10/cmp/generic b/tests/mpi/ghost_03.with_petsc=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/ghost_03/ncpu_10/cmp/generic
rename to tests/mpi/ghost_03.with_petsc=true.mpirun=10.output

diff --git a/tests/mpi/ghost_03/ncpu_4/cmp/generic b/tests/mpi/ghost_03.with_petsc=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/ghost_03/ncpu_4/cmp/generic
rename to tests/mpi/ghost_03.with_petsc=true.mpirun=4.output

diff --git a/tests/mpi/integrate_difference.cc b/tests/mpi/integrate_difference.cc
index 314e017fa47034cb0ea4522c59e04d6b8593a4fc..de195d231918a9e7041f3721e505e1c0bdbbda66 100644 (file)
--- a/tests/mpi/integrate_difference.cc
+++ b/tests/mpi/integrate_difference.cc
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("integrate_difference").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog.depth_console(0);
       deallog.threshold_double(1.e-10);

diff --git a/tests/mpi/integrate_difference/ncpu_10/cmp/generic b/tests/mpi/integrate_difference.with_trilinos=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/integrate_difference/ncpu_10/cmp/generic
rename to tests/mpi/integrate_difference.with_trilinos=true.mpirun=10.output

diff --git a/tests/mpi/integrate_difference/ncpu_4/cmp/generic b/tests/mpi/integrate_difference.with_trilinos=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/integrate_difference/ncpu_4/cmp/generic
rename to tests/mpi/integrate_difference.with_trilinos=true.mpirun=4.output

diff --git a/tests/mpi/interpolate_01.cc b/tests/mpi/interpolate_01.cc
index 6af6a0e1fb91775260d1bc115c32696f0a9b0098..b508ac9a228c0c20a62280251cb396f401bcd72a 100644 (file)
--- a/tests/mpi/interpolate_01.cc
+++ b/tests/mpi/interpolate_01.cc
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("interpolate_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/interpolate_01/ncpu_10/cmp/generic b/tests/mpi/interpolate_01.with_trilinos=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/interpolate_01/ncpu_10/cmp/generic
rename to tests/mpi/interpolate_01.with_trilinos=true.mpirun=10.output

diff --git a/tests/mpi/interpolate_01/ncpu_4/cmp/generic b/tests/mpi/interpolate_01.with_trilinos=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/interpolate_01/ncpu_4/cmp/generic
rename to tests/mpi/interpolate_01.with_trilinos=true.mpirun=4.output

diff --git a/tests/mpi/interpolate_02.cc b/tests/mpi/interpolate_02.cc
index 7753b2323c3fb8c237dfa4ea31e56e3e6c664bac..ffc773104430b1cfc085dc0911a9e35e6463709b 100644 (file)
--- a/tests/mpi/interpolate_02.cc
+++ b/tests/mpi/interpolate_02.cc
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("interpolate_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/interpolate_02/ncpu_10/cmp/generic b/tests/mpi/interpolate_02.with_petsc=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/interpolate_02/ncpu_10/cmp/generic
rename to tests/mpi/interpolate_02.with_petsc=true.mpirun=10.output

diff --git a/tests/mpi/interpolate_02/ncpu_4/cmp/generic b/tests/mpi/interpolate_02.with_petsc=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/interpolate_02/ncpu_4/cmp/generic
rename to tests/mpi/interpolate_02.with_petsc=true.mpirun=4.output

diff --git a/tests/mpi/interpolate_03.cc b/tests/mpi/interpolate_03.cc
index 37d4fe1462f3724f08fe7d645ad5d5cffdd4cb82..7e00977677392e67c55580b2ddb913c79345740f 100644 (file)
--- a/tests/mpi/interpolate_03.cc
+++ b/tests/mpi/interpolate_03.cc
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("interpolate_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/interpolate_03/ncpu_10/cmp/generic b/tests/mpi/interpolate_03.with_trilinos=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/interpolate_03/ncpu_10/cmp/generic
rename to tests/mpi/interpolate_03.with_trilinos=true.mpirun=10.output

diff --git a/tests/mpi/interpolate_03/ncpu_4/cmp/generic b/tests/mpi/interpolate_03.with_trilinos=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/interpolate_03/ncpu_4/cmp/generic
rename to tests/mpi/interpolate_03.with_trilinos=true.mpirun=4.output

diff --git a/tests/mpi/interpolate_04.cc b/tests/mpi/interpolate_04.cc
index 9275422184a19b3d58ca1af0611c55a16175f3dd..778473b2fa81f58f955c91342f128a14a9699528 100644 (file)
--- a/tests/mpi/interpolate_04.cc
+++ b/tests/mpi/interpolate_04.cc
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("interpolate_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/interpolate_04/ncpu_10/cmp/generic b/tests/mpi/interpolate_04.with_petsc=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/interpolate_04/ncpu_10/cmp/generic
rename to tests/mpi/interpolate_04.with_petsc=true.mpirun=10.output

diff --git a/tests/mpi/interpolate_04/ncpu_4/cmp/generic b/tests/mpi/interpolate_04.with_petsc=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/interpolate_04/ncpu_4/cmp/generic
rename to tests/mpi/interpolate_04.with_petsc=true.mpirun=4.output

diff --git a/tests/mpi/is_locally_owned.cc b/tests/mpi/is_locally_owned.cc
index 42d6fec40f8b16df8236beedbf79bc46c9f21d67..10f44a99dd7a4e9b665367ee89a2de0ae72446f5 100644 (file)
--- a/tests/mpi/is_locally_owned.cc
+++ b/tests/mpi/is_locally_owned.cc
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("is_locally_owned").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog.depth_console(0);
       deallog.threshold_double(1.e-10);

diff --git a/tests/mpi/is_locally_owned/ncpu_10/cmp/generic b/tests/mpi/is_locally_owned.mpirun=10.output
similarity index 100%
rename from tests/mpi/is_locally_owned/ncpu_10/cmp/generic
rename to tests/mpi/is_locally_owned.mpirun=10.output

diff --git a/tests/mpi/is_locally_owned/ncpu_4/cmp/generic b/tests/mpi/is_locally_owned.mpirun=4.output
similarity index 100%
rename from tests/mpi/is_locally_owned/ncpu_4/cmp/generic
rename to tests/mpi/is_locally_owned.mpirun=4.output

diff --git a/tests/mpi/make_zero_boundary_values.cc b/tests/mpi/make_zero_boundary_values.cc
index b0bffab4dae7b31619020bb2a37f6be64ae99b46..e4b336e259fd7e4855f65175ca625fb12c92f6bd 100644 (file)
--- a/tests/mpi/make_zero_boundary_values.cc
+++ b/tests/mpi/make_zero_boundary_values.cc
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("make_zero_boundary_values").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog.depth_console(0);
       deallog.threshold_double(1.e-10);

diff --git a/tests/mpi/make_zero_boundary_values/ncpu_10/cmp/generic b/tests/mpi/make_zero_boundary_values.mpirun=10.output
similarity index 100%
rename from tests/mpi/make_zero_boundary_values/ncpu_10/cmp/generic
rename to tests/mpi/make_zero_boundary_values.mpirun=10.output

diff --git a/tests/mpi/make_zero_boundary_values/ncpu_4/cmp/generic b/tests/mpi/make_zero_boundary_values.mpirun=4.output
similarity index 100%
rename from tests/mpi/make_zero_boundary_values/ncpu_4/cmp/generic
rename to tests/mpi/make_zero_boundary_values.mpirun=4.output

diff --git a/tests/mpi/map_dofs_to_support_points.cc b/tests/mpi/map_dofs_to_support_points.cc
index d21c0f3b87fb129b6b9083483b6fcd98d7789712..f3e58f7abff21c4669c8343f5332cf38539badee 100644 (file)
--- a/tests/mpi/map_dofs_to_support_points.cc
+++ b/tests/mpi/map_dofs_to_support_points.cc
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("map_dofs_to_support_points").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog.depth_console(0);
       deallog.threshold_double(1.e-10);

diff --git a/tests/mpi/map_dofs_to_support_points/ncpu_10/cmp/generic b/tests/mpi/map_dofs_to_support_points.mpirun=10.output
similarity index 100%
rename from tests/mpi/map_dofs_to_support_points/ncpu_10/cmp/generic
rename to tests/mpi/map_dofs_to_support_points.mpirun=10.output

diff --git a/tests/mpi/map_dofs_to_support_points/ncpu_4/cmp/generic b/tests/mpi/map_dofs_to_support_points.mpirun=4.output
similarity index 100%
rename from tests/mpi/map_dofs_to_support_points/ncpu_4/cmp/generic
rename to tests/mpi/map_dofs_to_support_points.mpirun=4.output

diff --git a/tests/mpi/matrix_free_01.cc b/tests/mpi/matrix_free_01.cc
index 619067c8ea31cda616217b27e0eece6b121366f2..c6398623d0abcc16694091c364e3cb522be424f1 100644 (file)
--- a/tests/mpi/matrix_free_01.cc
+++ b/tests/mpi/matrix_free_01.cc
@@ -266,7 +266,7 @@ int main (int argc, char **argv)
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("matrix_free_01").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog << std::setprecision(4);
       deallog.depth_console(0);

diff --git a/tests/mpi/matrix_free_01/ncpu_1/cmp/generic b/tests/mpi/matrix_free_01.with_trilinos=true.mpirun=1.output
similarity index 100%
rename from tests/mpi/matrix_free_01/ncpu_1/cmp/generic
rename to tests/mpi/matrix_free_01.with_trilinos=true.mpirun=1.output

diff --git a/tests/mpi/matrix_free_01/ncpu_10/cmp/generic b/tests/mpi/matrix_free_01.with_trilinos=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/matrix_free_01/ncpu_10/cmp/generic
rename to tests/mpi/matrix_free_01.with_trilinos=true.mpirun=10.output

diff --git a/tests/mpi/matrix_free_01/ncpu_4/cmp/generic b/tests/mpi/matrix_free_01.with_trilinos=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/matrix_free_01/ncpu_4/cmp/generic
rename to tests/mpi/matrix_free_01.with_trilinos=true.mpirun=4.output

diff --git a/tests/mpi/matrix_free_02.cc b/tests/mpi/matrix_free_02.cc
index a9b26a05124031d9d9002d121fb3eae165be7a3a..4fee70e2cddcfbcc6e633641847b98f50183fd3a 100644 (file)
--- a/tests/mpi/matrix_free_02.cc
+++ b/tests/mpi/matrix_free_02.cc
@@ -243,7 +243,7 @@ int main (int argc, char **argv)
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("matrix_free_02").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog << std::setprecision(4);
       deallog.depth_console(0);

diff --git a/tests/mpi/matrix_free_02/ncpu_10/cmp/generic b/tests/mpi/matrix_free_02.mpirun=10.output
similarity index 100%
rename from tests/mpi/matrix_free_02/ncpu_10/cmp/generic
rename to tests/mpi/matrix_free_02.mpirun=10.output

diff --git a/tests/mpi/matrix_free_02/ncpu_4/cmp/generic b/tests/mpi/matrix_free_02.mpirun=4.output
similarity index 100%
rename from tests/mpi/matrix_free_02/ncpu_4/cmp/generic
rename to tests/mpi/matrix_free_02.mpirun=4.output

diff --git a/tests/mpi/matrix_free_03.cc b/tests/mpi/matrix_free_03.cc
index ecb62403c79e09dd5776b4dc86a32b78f6fa2d06..16971b03d41f9b4e8708a881d1a02e59ab207373 100644 (file)
--- a/tests/mpi/matrix_free_03.cc
+++ b/tests/mpi/matrix_free_03.cc
@@ -271,7 +271,7 @@ int main (int argc, char **argv)
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("matrix_free_03").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog << std::setprecision(4);
       deallog.depth_console(0);

diff --git a/tests/mpi/matrix_free_03/ncpu_1/cmp/generic b/tests/mpi/matrix_free_03.with_trilinos=true.mpirun=1.output
similarity index 100%
rename from tests/mpi/matrix_free_03/ncpu_1/cmp/generic
rename to tests/mpi/matrix_free_03.with_trilinos=true.mpirun=1.output

diff --git a/tests/mpi/matrix_free_03/ncpu_10/cmp/generic b/tests/mpi/matrix_free_03.with_trilinos=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/matrix_free_03/ncpu_10/cmp/generic
rename to tests/mpi/matrix_free_03.with_trilinos=true.mpirun=10.output

diff --git a/tests/mpi/matrix_free_03/ncpu_3/cmp/generic b/tests/mpi/matrix_free_03.with_trilinos=true.mpirun=3.output
similarity index 100%
rename from tests/mpi/matrix_free_03/ncpu_3/cmp/generic
rename to tests/mpi/matrix_free_03.with_trilinos=true.mpirun=3.output

diff --git a/tests/mpi/matrix_free_04.cc b/tests/mpi/matrix_free_04.cc
index f99610b8f99c0984588ee7429b09eceb76a3148f..33b74fea1a2b3129f81be3387c6861e3cbf2b8e4 100644 (file)
--- a/tests/mpi/matrix_free_04.cc
+++ b/tests/mpi/matrix_free_04.cc
@@ -273,7 +273,7 @@ int main (int argc, char **argv)
 
   if (myid == 0)
     {
-      std::ofstream logfile(output_file_for_mpi("matrix_free_04").c_str());
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog << std::setprecision(4);
       deallog.depth_console(0);

diff --git a/tests/mpi/matrix_free_04/ncpu_1/cmp/generic b/tests/mpi/matrix_free_04.with_trilinos=true.mpirun=1.output
similarity index 100%
rename from tests/mpi/matrix_free_04/ncpu_1/cmp/generic
rename to tests/mpi/matrix_free_04.with_trilinos=true.mpirun=1.output

diff --git a/tests/mpi/matrix_free_04/ncpu_2/cmp/generic b/tests/mpi/matrix_free_04.with_trilinos=true.mpirun=2.output
similarity index 100%
rename from tests/mpi/matrix_free_04/ncpu_2/cmp/generic
rename to tests/mpi/matrix_free_04.with_trilinos=true.mpirun=2.output

diff --git a/tests/mpi/mesh_worker_matrix_01.cc b/tests/mpi/mesh_worker_matrix_01.cc
index 9825575b54f55514eb3de3d367e7ddb3369f0722..5f092d10d48ae0cf5cff4e19546002de8bec9188 100644 (file)
--- a/tests/mpi/mesh_worker_matrix_01.cc
+++ b/tests/mpi/mesh_worker_matrix_01.cc
@@ -209,7 +209,7 @@ test(const FiniteElement<dim> &fe)
   if (numprocs==1) // renumber DoFs
     {
       std::map<std::string,std::vector<types::global_dof_index> > 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<dim> &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 a4094355430cd8e22826216c5b45a90146f2fa83..00a96f3bd94ba8b8b4d7a44adeb2863a2c175ee2 100644 (file)
--- 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 171f110facca7a86929fcfdaee56cc29407e4e84..7f8f19db5234d15ad04b5bcc2cc1ee9c3bce7091 100644 (file)
--- 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 0b5ce46215d49799c3978e9aa07a5a3816028baa..328ed8253221c234efddefc15832d7a08d933ae7 100644 (file)
--- 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 e8b104a628549d9e0868f9890a1cf766f0a8bded..40d5daf1bd3f9385acd0a5de4102e29b911388a6 100644 (file)
--- 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 a4880bbefb6cf83563fbeb3781d74981ad1f6c3a..15f47f1a787ebbe75f3d97111a8ec298c41c4fd2 100644 (file)
--- 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 72b519329e51c29e3db4562aa83c34a2e91e8009..95d256af9ed16f01c283118e356fe30c5cdbbeed 100644 (file)
--- 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 4c2b36faacff1748a8ba8dad4cb436ba4d532122..50af594234927564f4c1beba567b6b8bd66233d0 100644 (file)
--- 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 e3a5ce17cc9105f63e76a328dcf7ca4ae92fbbad..d400e9d6593ffac7851e48e89965be1804c1f330 100644 (file)
--- 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 9f4c3e38916917bf39e2556d4f95ebfb9f9375f7..8b94eae39a9138887fcd912561096bd112901196 100644 (file)
--- 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 0ea73accaf2f8b0e9230bbde86c68d660a88ecd9..a9d119f7598364f4012ab6ced00c0f5aec836632 100644 (file)
--- 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 e71a35f25634cedcf8224b4f2ed36bd1c2f5bb10..bc71dcd088e8e141ce3bac4a9670ad1e2acfbf2c 100644 (file)
--- 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 095bf8208b577aa65353b7f86d0797d70a7dc688..90246d3ae37419663f77729ae2dfd4e07ae9e780 100644 (file)
--- 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 de0360a56d914a93205c5d83603333e28e995734..764af6614c91076db2cefabb0db2837d6bff7e4c 100644 (file)
--- 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 bf88a996f82d681d734ca91c73b82b41cfd8564d..b42ef8a71c6058196a22c9e92a1f6af84d2a30c2 100644 (file)
--- 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 fc8a52dd8fd0b693dc77cdc040c56949c4dbdf45..c3b4afa984c59d67b17c4955f3eb9ff7fa6f64fe 100644 (file)
--- 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 bb60437849a925cac663b1281742a9f8456618b1..0fd11247bd7b523db1870d63b0c1cbaa92c2a6ca 100644 (file)
--- 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 40f5ec46b39ffde5e7069274e21217a0d79f4e03..d18b60429ad63034c4e6a90e3eb6057fc4a10854 100644 (file)
--- 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 a9f4849fdfa1ed4b991b67c07d016dbad1f5cd12..b7e7e6f551b51b0529bd959e5066a1f095ea080b 100644 (file)
--- 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 ee405ebce4f753a81074d34711976253ccb4e817..dc10d4bb8c4758e09e694104f79471d7d55159b0 100644 (file)
--- 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 ec67bb81e6c36af5a4a6f7910f2f97337ac873ce..e97752de3e10e7ec56c4bbbafffde1380133464b 100644 (file)
--- 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 25e17bb5835cf21807ad789eebaf7aab765b078b..12f4ae3c947af2d43d907bdcf1863b4e992db0c7 100644 (file)
--- 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 acb00a71c3f5f5bdde9e0825184ccdefeb1410e7..d8b41b3ae8a528ce30a5681f597c092932cbc592 100644 (file)
--- 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 626684e29e257076e46e8d7bd62e323efdd22bad..a87dd150620f6fff23b3ec7ac93bc0523219e9ec 100644 (file)
--- 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 8539c27e21396e66b48da31f77a022a5258d9e14..5adf8c811e2d439ee86b1c589e87811138798d38 100644 (file)
--- 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 f4709b2a1170fd44f92add3d1254cd014198bcf9..3bcf053da60ac58977b573069edb26ae73abf9d5 100644 (file)
--- 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 65c37871512d1e43c5b223c3182ea2b03760bb72..f73783a3c702b315a1e19ea5c6d00dbc4536fb93 100644 (file)
--- 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 2d3e86fc4a3af1edf37fd0ffa093630b963a1cc6..b9de49010dcf4cf3a354d23358dbe1afe186f241 100644 (file)
--- 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 2ee57c14282bc54c8b7b5ac8b9933b5a2440a068..becfc5823ae0462a5dcb5d89149e912e1252c92e 100644 (file)
--- 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 73af9407b9130fa969f72bc6a792ae4eca332ef9..bcc94836625836da7d562ea9bb3373bf9121070a 100644 (file)
--- 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 a94c17c09a91b001f05845ee16675bb5f90da80d..6688efdf4669c91b292607355c9bf667b36f9257 100644 (file)
--- 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 802c97f28db65e1cd6d4b116d69c2c2c6bca53aa..895e260490826d350cd5e4f8eac00c6efc7c3669 100644 (file)
--- 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 3661d7195ab3e186e8463bdb483275addaf793ee..46d10f05633d19a3d8b1d55f0dd34b8c320a208c 100644 (file)
--- 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 98164f7cd411db85e70a0bd244aa7b9ae9cc3a9d..7f4b39f851dd757f9fb3b17c8f3df8b441b088c2 100644 (file)
--- 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 1d3ca34a5652efb7c379417c14fe8ad1c2322685..49e11d01127e9235a89e69941fdb3238dc0f42bd 100644 (file)
--- 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 54f183c7ed852134b76aff029c71418aa544c2d8..56329089adefa2806fce8b5ec0035c642463577f 100644 (file)
--- 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 66922e39000d81e646104db9a1c310aaa5321deb..484cc12dcbc530a7fe1baa35987fa50449d3cd6b 100644 (file)
--- 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 39f89d45e91cc3ee393b264460aba51b9f42a8da..de4443d0c95c38deec5aab8b8bc4d03fa7ed3203 100644 (file)
--- 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 63ed4d0d7d05c138cfb5f40526ec702a190d4354..2bb309a4446cb8cefb124ea5f65a5a8604c77aca 100644 (file)
--- 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 48adcb1466de5dd0e87f444a164b589c065de5a9..ada144f81c868cee2f642db63f98759ebe2ff338 100644 (file)
--- 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 7f0a30b325a36d9fdef5c82b06aebba2604989d8..947082617826c11a1565b7ae37b2544d777a3dbf 100644 (file)
--- 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 4442c57d1573039650e09e9fd1c071ff34565601..50cdcf1b4b69321135615d4e5579c816d02a9f32 100644 (file)
--- 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 5cb7726a123b2c6e3f1eaab9fc5e9266603b27f7..6091620e28e0bf5812d841de101421f48ffd6b8e 100644 (file)
--- 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 ea61c0fd7662598cf2f2bbafb662a242fb906aca..29d6927ad01790713c99970d257a92efbc6b5c55 100644 (file)
--- 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 8e16a9611426681f41a518657a09ca558633fea8..2c1801beb3b4c728d56cc317ddd842a175c32027 100644 (file)
--- 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 e8b5724c8b11e01f8ee9062eeb25c9116293926e..886654220dfb5ecaed7a204d7c0b4361854ca742 100644 (file)
--- 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 6efa357d4b460f371275f99235d13f371813bd29..22e3414acab2394994514d269338c0071967a6e6 100644 (file)
--- 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 2c2256298f64cbe3f90e9e795630b4961085a617..7d866499cb12ac07c6fe1ec3dcf78328cbfdd0e0 100644 (file)
--- 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 acdfc411e3e7199a7040200f0f35b21661361b82..f19efc8b296fbd559f9dec644eb5461ccef238ec 100644 (file)
--- 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 b5774dd29243c44b5a7e5a7e6dda271fdd1f0526..c91f5013ade80414eaf4cc6b954af9e275c448c5 100644 (file)
--- 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 23bcee5d89b43ba9e0633f9f2488ab04252b046e..8406e2e72a54a767cd16a0af8000474fe6f3a132 100644 (file)
--- 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 88ac91fd94c256d5695df427343f9302d426b4b6..dc378512483102434ed4a2e88150b372e374509a 100644 (file)
--- 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 ec3e2a961f44799e0a0b26cc0306f2520a1f59d9..9222bb5e0b023e3161b60f5ad3283e63526e9455 100644 (file)
--- 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 5c67d47868c7ad1bc5b429c61ffb43f0e0b5d967..c3565aa63c97e51a84dc1531e62f1f6842c12876 100644 (file)
--- 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 bb736e34a850e28fa729f065e33eb772757ade3e..fca8065188ff9da1beea17ad0811b63c75e9a3a4 100644 (file)
--- 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 f240d1de17e36674cac25ce19f2f3a266b6f5227..9ae94d86c57c918f680cc676bf464452e6a88e79 100644 (file)
--- 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 d62928f39584c5c50654a29baa6087f67b7c11f4..5ce72302fb130de81893477b1f968b6aa6389daf 100644 (file)
--- 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 efeb4c8b744efd5393294bb04f9ca60adb07294b..df4fc6ba64199e85d1f6d0a996e136dfe6648ef4 100644 (file)
--- 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 7725acfd75f2f8822eabd1e19d5bbea430045abe..6805acc19f705d3b59636e4f90f7e301a4391388 100644 (file)
--- 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 7077791c5229e3e34b49ddc82fd3edab126945f3..fc9c9ef8a301ad8996c039d43e767ba7c433ac2e 100644 (file)
--- 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 97be2bd2dfda164a7d72ea60c55a286a8a9f82e5..e01d391c655874f623fbc29df693fad3c2caa9f8 100644 (file)
--- 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 8ee6f0c9842bf4116dd49691e3b67b3701fcfd42..7d35c6cf111ab7b50a7b873a51741c1846edf205 100644 (file)
--- 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 5157c18fcd55231dbdd2343f3052ace0f3b70577..5f8535006c54337835d18fb2e0f2a8edd9527791 100644 (file)
--- 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 4abc873540ac6740d066b288d7c42c322718bcdb..24149af17b965e35bb7b5c0351d0f448df0f7f3a 100644 (file)
--- 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 fb3a6183f38fb4b1d4532b113110e3ec047134f1..ef27d9737de206e9e90da4b3e5c05927e385ee38 100644 (file)
--- 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 9d506085df5c688cecb9f72ae03b1bcb47704774..29fa68cd9552bb9e512bf7873012af0e69264155 100644 (file)
--- 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 6b043e565fc94cfa28a520c32492db11bde85937..a3ba8644db748f4caf390798eda42d4f020f85d4 100644 (file)
--- 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 0b8fea2dc7bdf53db21fce0656f02639619478bb..8f52b85463a810d13beecfbbfab2e98861494815 100644 (file)
--- 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 7dc7581c317aaf0ceabf3ee2c228a679f06fc199..b852693ce8acc6c3bda3e8fe09370b208bf4228a 100644 (file)
--- 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 d803814ff600e74b5ba1cb0f75381e9646fafb10..fcb3986638463346ebb28df34b39c1bb071e1bd4 100644 (file)
--- 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 3c2fe3cfd225ebc1d0767c8516eca8d8dd3f31a2..8c8ef575d0c7b17290cdb778d6ecc3e297f18539 100644 (file)
--- 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 148de3facf1d9e031db45ad6af2eca30ebfda4fd..02bc807e2b9fae15bd6c88561ab205fd7d563d32 100644 (file)
--- 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 aed2b9b94ba4786138c614f67b2d5f9821c31421..2c0d06e47b846ef3940f4f4f47ea54eddf006a8f 100644 (file)
--- 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 74e3f0898f8a4629b110d7f2ffa09f1bf03e9b82..cafdaff5a2118489a77a592bb8052bd01dfc935a 100644 (file)
--- 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 3a296c876ba508c536c844e4c46d9627af906933..61fae5edc6e71ee2f53a631f0661ad6a40785b6b 100644 (file)
--- 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 fae48e3d1ba62384093c645b6aa60526073c0ef4..12e7ef2b98b3291fa2e2c3272cf11a6bba97a357 100644 (file)
--- 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 f86c6d9ac8faceceabe8572adbcb31949c1c0494..272c0e5196ab96588acb97165d5cc4f67e89b375 100644 (file)
--- 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 093c09f62d6f71ce3032c8688266507e0c0111b6..80de364730db653d4491418920702060d1e114f7 100644 (file)
--- 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 f970e5f275c5381bb5578894ec1d7c1563d4bc13..0f2c3a04952b929fc6a5250adaf082208399b572 100644 (file)
--- 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 dbbca1b6071f5362602d12648d3897ab70ba158b..7b71ff215c459f8db8c39ddab9ae526b719ea29f 100644 (file)
--- 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<float> 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.size(); ++i)
       in >> 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 0cf5ffead10f6e9bc27593c015e739d3d0e9e11a..f96305910e91c933a3da3d690d2d6890818cb206 100644 (file)
--- 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 37ce0a6945ea5b87d76e75b0680ccd99d251df3c..6b78821500273c84782654bc4c3254337df22f22 100644 (file)
--- 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 11ed30771ec1454f4dfdbfe90e2ee17d9026c949..44d0dc33089aca730424449a12d0dc658cd04082 100644 (file)
--- 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 b9a6754428514049bfac208f3f5f93d7f7301f23..72ce835ba70ae89915af4101a395a5c6f1414e9b 100644 (file)
--- 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 c0ca2d0401424655ef4ca1d30e0b7530b4951b28..bfbad030bf50fca4dd5003f0d6b4fc4bfa99dab7 100644 (file)
--- 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 3e5042bba099905117aff70cb1743b644e95c459..7334e13efe4aacee14187026ebf440e73749eac8 100644 (file)
--- 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 0e01673f671d74d05a3d0e9f370166e8727caf57..a0dfef9c726f0fb1233faabeedf63a55760cf11d 100644 (file)
--- 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 cc712d997ee4c920066dcde6991e646f09b9e55d..6611e9546cef17e52bd2d51eaf9595ac10381555 100644 (file)
--- 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 55206cdbfd40817747e690f7ef7aa6a67a480d77..33094255045c44aceb0113f98f08a7bb4aa14b7e 100644 (file)
--- 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 7875b8f9d23c2eb0c880e60f17fbcb4291c96318..f1facd0f45abdda3ef758deb598704547bfb1d00 100644 (file)
--- 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 c7e72409d4bffd7833b5be5782916a871ac16415..c7e9055703b626e362e0c6b182366bc1dea403ba 100644 (file)
--- 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 57373bb475a08ff1303e2d5bc82b37480c882c22..631d7aaf3c3affdf2837b9b00abf51ba95b7aaa5 100644 (file)
--- 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 20c6b32868262308d5e786d24b867c6a56e67d58..65baacdee68ca1b67e32b87a35e63325b5a84022 100644 (file)
--- 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 634545427fd6a61451cd8335e34b2ee6b4dc8857..9832ddd49362a8ebd9d5b6d4d68660ccda613811 100644 (file)
--- 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 db5f417ac95f72d29bfe778fa2e66549383e9a76..25c457a3f301c6dc2d81d399bb78c36aa26be90e 100644 (file)
--- 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 874706492391a3c84eeb1a96b8c0b610a194f693..701cd0421701b77ed1f1937b39a4f70c890f58d0 100644 (file)
--- 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 82fa9e680c40d325a369dd80728510fd352d5478..9d9fb761508eb094adf5fec7f1461e1e8f06f2a5 100644 (file)
--- 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 6c3f2a979e6fc2b483c2d7c4730694473c0c0878..3d1cde5ba96777b6d310d9e963ad0de014bdd44e 100644 (file)
--- 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 b74be93aeef4e4232f91c541de0ea7d8c07b0c9d..7ea0230a6ef2acd039cd286d46f1b6f7418882c2 100644 (file)
--- 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 be9c781cb9b45255c8f4fe07a266b4e2d624cdde..4309a03d662b3836f5c59a00f1a3fa983c32f5bc 100644 (file)
--- 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 8d3348cb22798a02115c97f23031f08626bdb4ff..68ebb9135b40c79088f021dbbe2be3c205731641 100644 (file)
--- 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 a61af3604386189bb82c72982f8fd5a810e94ba0..c481a1eb50e88ceb7efa0edc28fa41a29e6e9f80 100644 (file)
--- 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 69b688a02c1783f9afea736e9a25bdf2dded4532..ed2fb4268ea97d5e20782d0389dbdbddeebead0e 100644 (file)
--- 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 25f6c6420c4f31e7503e8f99f189482349ab8274..ece1fef939d201ae9fb9b8552903d80c38c35829 100644 (file)
--- 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 ae48e7350a02a66256544a194f6928e0ba78cc3c..16709364987899ca16533b0020d35c319628d5f5 100644 (file)
--- 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 2ccf07d7a5f3b5e45e201cb24148828099f8b70b..830020970bddb22d5229603c09233c84bd148be7 100644 (file)
--- 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 214a6414d67cbf6f53e2cdfac4bb9359ee9284f1..b1d23fd6124296fca1a84ac5c5eea7b04ef6d838 100644 (file)
--- 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 59236559d1cec4f50ef8263cc57b85bea6ab6ded..e32f0eca04f28827e45949fdc02a9d40b2dcf06c 100644 (file)
--- 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 0d62ca2ee2d159339272e1c266656a6594c71c1b..18aaf32118e638c36412e81ddb43a7b552f6be2d 100644 (file)
--- 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 7a9118e4c6ed55756da90dd16c9f2a796051a647..ce327a0580ee2ec190b4d473e2ea8d24f5b9b80a 100644 (file)
--- 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 ae7158f223a4e7c65aa41b8b41d8621cbd6aec18..50e91e085210529d329aa3f0b5e30afa5eae68bc 100644 (file)
--- 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 32e294ccd83ac057305f59d800c0eb549906ada6..c131014af1f781509acf868b9a2d6c0777345679 100644 (file)
--- 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 df7eed435ff78b21529ccaea40b80ced23b74434..3288bcc976c07bca9da5c6d060eac3b86344274b 100644 (file)
--- 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 38e43cb345c6ac983df4b121c699d7df004ce99c..c47727cdc8273e401afdee3ce367eaf2d4aae4d3 100644 (file)
--- 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 3b91ef83adad956bf53e279b100a05fdfd1b4bf6..3eec9e3c5f11a12f6d27a17695ff5d28fb7fdced 100644 (file)
--- 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 2df37d5176a0749e0408deae7000bef3038db59a..7daa065e65c0443ae403f704a7c498fcdd70c395 100644 (file)
--- 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 f11130bc84c76f6c598651ea660920e20623022d..8fd0dbd079adcd4b84ea42c06963bf0c2901594d 100644 (file)
--- 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 f6deedddfba20e0ecad8307fd5362c529c5d1bcc..9293e23f8537d4d2c6d777347c3edefa9ba6eea5 100644 (file)
--- 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 712493ccf046ec80a4b83fc1fc6b5ee2225eeaee..2e5d70ac83e609106349773ebc31a70fcdae5537 100644 (file)
--- 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 0b5a1f3110002f43ce184fddd25d5738f21fea3f..e01185a88b22fb87540b3b5d98c50c8bf5ba09f1 100644 (file)
--- 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 cb10089551394c5782f5c3fda1849ac192fbfa59..bb1229d2b4c05f9cea321571bc1800331c4e291c 100644 (file)
--- 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 2bd335ed01857470304db413779dd195561fe565..104ad88f889e6f17528cf7f4a325f1302d021a49 100644 (file)
--- 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<nproc; ++i)
           {
-            std::string filename = output_file_for_mpi(JobIdentifier::base_name(m_filename.c_str()))
-                                   + Utilities::int_to_string(i);
+            std::string filename = "output" + Utilities::int_to_string(i);
             std::ifstream in(filename.c_str());
             Assert (in, ExcIO());
 
@@ -209,9 +191,6 @@ public:
     Assert (false, ExcInternalError());
 #endif
   }
-private:
-
-  std::string m_filename;
 
 };