From 1349bc6430e733dfa912a8dab3f166dc731fa470 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sat, 14 Sep 2013 09:38:59 +0000 Subject: [PATCH] Port new tests git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30702 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/mpi/mg_06.cc | 2 +- tests/mpi/{mg_06/ncpu_7/cmp/generic => mg_06.mpirun=7.output} | 0 tests/mpi/periodicity_01.cc | 4 ++-- .../ncpu_3/cmp/generic => periodicity_01.mpirun=3.output} | 0 .../ncpu_5/cmp/generic => periodicity_01.mpirun=5.output} | 0 .../ncpu_7/cmp/generic => periodicity_01.mpirun=7.output} | 0 tests/mpi/point_value_01.cc | 2 +- .../ncpu_2/cmp/generic => point_value_01.mpirun=2.output} | 0 .../ncpu_4/cmp/generic => point_value_01.mpirun=4.output} | 0 .../ncpu_6/cmp/generic => point_value_01.mpirun=6.output} | 0 10 files changed, 4 insertions(+), 4 deletions(-) rename tests/mpi/{mg_06/ncpu_7/cmp/generic => mg_06.mpirun=7.output} (100%) rename tests/mpi/{periodicity_01/ncpu_3/cmp/generic => periodicity_01.mpirun=3.output} (100%) rename tests/mpi/{periodicity_01/ncpu_5/cmp/generic => periodicity_01.mpirun=5.output} (100%) rename tests/mpi/{periodicity_01/ncpu_7/cmp/generic => periodicity_01.mpirun=7.output} (100%) rename tests/mpi/{point_value_01/ncpu_2/cmp/generic => point_value_01.mpirun=2.output} (100%) rename tests/mpi/{point_value_01/ncpu_4/cmp/generic => point_value_01.mpirun=4.output} (100%) rename tests/mpi/{point_value_01/ncpu_6/cmp/generic => point_value_01.mpirun=6.output} (100%) diff --git a/tests/mpi/mg_06.cc b/tests/mpi/mg_06.cc index 107bc7a331..285c28d933 100644 --- a/tests/mpi/mg_06.cc +++ b/tests/mpi/mg_06.cc @@ -157,7 +157,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_06/ncpu_7/cmp/generic b/tests/mpi/mg_06.mpirun=7.output similarity index 100% rename from tests/mpi/mg_06/ncpu_7/cmp/generic rename to tests/mpi/mg_06.mpirun=7.output diff --git a/tests/mpi/periodicity_01.cc b/tests/mpi/periodicity_01.cc index 413029deeb..0c1edce8f1 100644 --- a/tests/mpi/periodicity_01.cc +++ b/tests/mpi/periodicity_01.cc @@ -522,7 +522,7 @@ int main(int argc, char *argv[]) if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD)==0) { - std::ofstream logfile(output_file_for_mpi("periodicity_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile, false); deallog.depth_console(0); deallog.threshold_double(1.e-10); @@ -534,7 +534,7 @@ int main(int argc, char *argv[]) LaplaceProblem<3> laplace_problem; laplace_problem.run (); } - } + } else { { diff --git a/tests/mpi/periodicity_01/ncpu_3/cmp/generic b/tests/mpi/periodicity_01.mpirun=3.output similarity index 100% rename from tests/mpi/periodicity_01/ncpu_3/cmp/generic rename to tests/mpi/periodicity_01.mpirun=3.output diff --git a/tests/mpi/periodicity_01/ncpu_5/cmp/generic b/tests/mpi/periodicity_01.mpirun=5.output similarity index 100% rename from tests/mpi/periodicity_01/ncpu_5/cmp/generic rename to tests/mpi/periodicity_01.mpirun=5.output diff --git a/tests/mpi/periodicity_01/ncpu_7/cmp/generic b/tests/mpi/periodicity_01.mpirun=7.output similarity index 100% rename from tests/mpi/periodicity_01/ncpu_7/cmp/generic rename to tests/mpi/periodicity_01.mpirun=7.output diff --git a/tests/mpi/point_value_01.cc b/tests/mpi/point_value_01.cc index 2e1de3432d..3307d19024 100644 --- a/tests/mpi/point_value_01.cc +++ b/tests/mpi/point_value_01.cc @@ -107,7 +107,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("point_value_01").c_str()); + std::ofstream logfile("output"); deallog.attach(logfile, false); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/mpi/point_value_01/ncpu_2/cmp/generic b/tests/mpi/point_value_01.mpirun=2.output similarity index 100% rename from tests/mpi/point_value_01/ncpu_2/cmp/generic rename to tests/mpi/point_value_01.mpirun=2.output diff --git a/tests/mpi/point_value_01/ncpu_4/cmp/generic b/tests/mpi/point_value_01.mpirun=4.output similarity index 100% rename from tests/mpi/point_value_01/ncpu_4/cmp/generic rename to tests/mpi/point_value_01.mpirun=4.output diff --git a/tests/mpi/point_value_01/ncpu_6/cmp/generic b/tests/mpi/point_value_01.mpirun=6.output similarity index 100% rename from tests/mpi/point_value_01/ncpu_6/cmp/generic rename to tests/mpi/point_value_01.mpirun=6.output -- 2.39.5