From 75d35ddad0e169ba37d2d8194304b3726818fca4 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 27 Sep 2013 13:06:14 +0000 Subject: [PATCH] Port new tests git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30983 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/deal.II/grid_tools_06.cc | 2 +- .../cmp/generic => grid_tools_06.output} | 0 tests/deal.II/grid_tools_07.cc | 2 +- .../cmp/generic => grid_tools_07.output} | 0 tests/mpi/data_out_hdf5_01.cc | 10 +++++----- ...=> data_out_hdf5_01.with_hdf5=true.mpirun=3.output} | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename tests/deal.II/{grid_tools_06/cmp/generic => grid_tools_06.output} (100%) rename tests/deal.II/{grid_tools_07/cmp/generic => grid_tools_07.output} (100%) rename tests/mpi/{data_out_hdf5_01/ncpu_3/cmp/generic => data_out_hdf5_01.with_hdf5=true.mpirun=3.output} (100%) diff --git a/tests/deal.II/grid_tools_06.cc b/tests/deal.II/grid_tools_06.cc index 172cc341b6..cf2ed7c626 100644 --- a/tests/deal.II/grid_tools_06.cc +++ b/tests/deal.II/grid_tools_06.cc @@ -29,7 +29,7 @@ #include #include -std::ofstream logfile("grid_tools_06/output"); +std::ofstream logfile("output"); using namespace dealii; diff --git a/tests/deal.II/grid_tools_06/cmp/generic b/tests/deal.II/grid_tools_06.output similarity index 100% rename from tests/deal.II/grid_tools_06/cmp/generic rename to tests/deal.II/grid_tools_06.output diff --git a/tests/deal.II/grid_tools_07.cc b/tests/deal.II/grid_tools_07.cc index e39396eaa3..bbe85ed40a 100644 --- a/tests/deal.II/grid_tools_07.cc +++ b/tests/deal.II/grid_tools_07.cc @@ -29,7 +29,7 @@ #include #include -std::ofstream logfile("grid_tools_07/output"); +std::ofstream logfile("output"); using namespace dealii; diff --git a/tests/deal.II/grid_tools_07/cmp/generic b/tests/deal.II/grid_tools_07.output similarity index 100% rename from tests/deal.II/grid_tools_07/cmp/generic rename to tests/deal.II/grid_tools_07.output diff --git a/tests/mpi/data_out_hdf5_01.cc b/tests/mpi/data_out_hdf5_01.cc index a3c0a1d13f..072a9e1010 100644 --- a/tests/mpi/data_out_hdf5_01.cc +++ b/tests/mpi/data_out_hdf5_01.cc @@ -25,7 +25,7 @@ #include -std::string output_file_name = "data_out_hdf5_01/output"; +std::string output_file_name = "output"; template @@ -50,12 +50,12 @@ test () data_out.add_data_vector (dof1, v1, "linear"); data_out.build_patches (2); - data_out.write_hdf5_parallel ("data_out_hdf5_01/out.h5", MPI_COMM_WORLD); + data_out.write_hdf5_parallel ("out.h5", MPI_COMM_WORLD); std::vector xdmf_entries; xdmf_entries.push_back( data_out.create_xdmf_entry("out.h5", 0, MPI_COMM_WORLD)); - data_out.write_xdmf_file(xdmf_entries, "data_out_hdf5_01/out.xdmf", + data_out.write_xdmf_file(xdmf_entries, "out.xdmf", MPI_COMM_WORLD); deallog <<"ok" << std::endl; @@ -64,14 +64,14 @@ test () // Sadly hdf5 is binary and we can not use hd5dump because it might // not be in the path. At least we can look at the xdmf: if (0==Utilities::MPI::this_mpi_process (MPI_COMM_WORLD)) - cat_file("data_out_hdf5_01/out.xdmf"); + cat_file("out.xdmf"); } int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - MPILogInitAll log(__FILE__); + MPILogInitAll log; try { diff --git a/tests/mpi/data_out_hdf5_01/ncpu_3/cmp/generic b/tests/mpi/data_out_hdf5_01.with_hdf5=true.mpirun=3.output similarity index 100% rename from tests/mpi/data_out_hdf5_01/ncpu_3/cmp/generic rename to tests/mpi/data_out_hdf5_01.with_hdf5=true.mpirun=3.output -- 2.39.5