Port new tests

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30983 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/deal.II/grid_tools_06.cc b/tests/deal.II/grid_tools_06.cc
index 172cc341b69d43c0f87f02db2414a41fc549d9b4..cf2ed7c62628281771031f391c80d510c3359aed 100644 (file)
--- a/tests/deal.II/grid_tools_06.cc
+++ b/tests/deal.II/grid_tools_06.cc
@@ -29,7 +29,7 @@
 #include <deal.II/grid/tria.h>
 
 #include <fstream>
-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 e39396eaa338e9d28f279705c3d36c445bfc17cf..bbe85ed40a55313f87225b43d7a776515ed592b2 100644 (file)
--- a/tests/deal.II/grid_tools_07.cc
+++ b/tests/deal.II/grid_tools_07.cc
@@ -29,7 +29,7 @@
 #include <deal.II/grid/tria.h>
 
 #include <fstream>
-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 a3c0a1d13f2a8bc51db5ba8b9e39d1d45a62fe97..072a9e10104c189179f8ac88f9bcb38f2a08709b 100644 (file)
--- a/tests/mpi/data_out_hdf5_01.cc
+++ b/tests/mpi/data_out_hdf5_01.cc
@@ -25,7 +25,7 @@
 #include <deal.II/numerics/data_out.h>
 
 
-std::string output_file_name = "data_out_hdf5_01/output";
+std::string output_file_name = "output";
 
 
 template <int dim>
@@ -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<XDMFEntry> 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