From 7c4322cb020db454a33c3d1c1c58b76c1881e68a Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 13 Sep 2013 15:24:18 +0000 Subject: [PATCH] bugfixes git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30690 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/mpi/p4est_2d_constraintmatrix_01.cc | 4 ++-- tests/mpi/p4est_2d_constraintmatrix_03.cc | 4 ++-- tests/mpi/p4est_3d_constraintmatrix_01.cc | 4 ++-- tests/mpi/p4est_3d_constraintmatrix_04.cc | 4 ++-- tests/mpi/p4est_save_01.cc | 2 +- tests/mpi/p4est_save_02.cc | 3 +-- tests/mpi/p4est_save_03.cc | 3 +-- tests/mpi/parallel_partitioner_03.cc | 4 ++-- 8 files changed, 13 insertions(+), 15 deletions(-) diff --git a/tests/mpi/p4est_2d_constraintmatrix_01.cc b/tests/mpi/p4est_2d_constraintmatrix_01.cc index 764af6614c..cf9e1562e9 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_01.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_01.cc @@ -70,7 +70,7 @@ void test() DoFTools::make_hanging_node_constraints (dofh, cm2); { - std::ofstream file((std::string("p4est_2d_constraintmatrix_01/ncpu_") + Utilities::int_to_string(Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD)) + "/dat." + Utilities::int_to_string(myid)).c_str()); + std::ofstream file((std::string("dat." + Utilities::int_to_string(myid)).c_str()); file << "**** proc " << myid << std::endl; cm.print(file); file << "****" << std::endl; @@ -86,7 +86,7 @@ void test() { for (unsigned int i=0; i tr(MPI_COMM_WORLD); diff --git a/tests/mpi/p4est_save_02.cc b/tests/mpi/p4est_save_02.cc index 2c1801beb3..20f71ba070 100644 --- a/tests/mpi/p4est_save_02.cc +++ b/tests/mpi/p4est_save_02.cc @@ -51,8 +51,7 @@ void test() if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) deallog << "hyper_cube" << std::endl; - std::string filename = - (std::string("p4est_save_02/ncpu_") + Utilities::int_to_string(Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD)) + "/dat"); + std::string filename = "dat"; { parallel::distributed::Triangulation tr(MPI_COMM_WORLD); diff --git a/tests/mpi/p4est_save_03.cc b/tests/mpi/p4est_save_03.cc index 886654220d..b427832fc8 100644 --- a/tests/mpi/p4est_save_03.cc +++ b/tests/mpi/p4est_save_03.cc @@ -52,8 +52,7 @@ void test() if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) deallog << "hyper_cube" << std::endl; - std::string filename = - (std::string ("p4est_save_03/ncpu_") + Utilities::int_to_string (Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD)) + "/dat"); + std::string filename = "dat"; { parallel::distributed::Triangulation tr (MPI_COMM_WORLD); diff --git a/tests/mpi/parallel_partitioner_03.cc b/tests/mpi/parallel_partitioner_03.cc index c91f5013ad..214cd7ba5c 100644 --- a/tests/mpi/parallel_partitioner_03.cc +++ b/tests/mpi/parallel_partitioner_03.cc @@ -63,7 +63,7 @@ void test () // write the info on ghost processors and import indices to file { - std::ofstream file((std::string("parallel_partitioner_03/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; file << "ghost targets: "; for (unsigned int i=0; i