]> https://gitweb.dealii.org/ - dealii.git/commitdiff
bugfixes
authorMatthias Maier <tamiko@kyomu.43-1.org>
Fri, 13 Sep 2013 15:24:18 +0000 (15:24 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Fri, 13 Sep 2013 15:24:18 +0000 (15:24 +0000)
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
tests/mpi/p4est_2d_constraintmatrix_03.cc
tests/mpi/p4est_3d_constraintmatrix_01.cc
tests/mpi/p4est_3d_constraintmatrix_04.cc
tests/mpi/p4est_save_01.cc
tests/mpi/p4est_save_02.cc
tests/mpi/p4est_save_03.cc
tests/mpi/parallel_partitioner_03.cc

index 764af6614c91076db2cefabb0db2837d6bff7e4c..cf9e1562e9697a224ddff84c722a7f3500786130 100644 (file)
@@ -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<numproc; ++i)
         {
-          cat_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(i)).c_str());
+          cat_file((std::string("dat." + Utilities::int_to_string(i)).c_str());
         }
 
     }
index c3b4afa984c59d67b17c4955f3eb9ff7fa6f64fe..da5a5c61f177bcc4ababa9a7fd644ad6eecc372c 100644 (file)
@@ -206,7 +206,7 @@ void test()
 
   if (myid==0)
     {
-      std::ofstream file((std::string("p4est_2d_constraintmatrix_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((std::string("dat." + Utilities::int_to_string(myid)).c_str());
       file << "**** proc " << myid << std::endl;
       x_dub.print(file);
     }
@@ -215,7 +215,7 @@ void test()
 
   if (myid==0)
     {
-      cat_file((std::string("p4est_2d_constraintmatrix_03/ncpu_") + Utilities::int_to_string(Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD)) + "/dat." + Utilities::int_to_string(0)).c_str());
+      cat_file((std::string("dat." + Utilities::int_to_string(0)).c_str());
     }
 
   tr.set_boundary (0);
index 895e260490826d350cd5e4f8eac00c6efc7c3669..3acaf35386752bd9b625d3dbf26a9f7e81896bac 100644 (file)
@@ -80,7 +80,7 @@ void test()
   DoFTools::make_hanging_node_constraints (dofh, cm2);
 
   {
-    std::ofstream file((std::string("p4est_3d_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;
@@ -96,7 +96,7 @@ void test()
     {
       for (unsigned int i=0; i<numproc; ++i)
         {
-          cat_file((std::string("p4est_3d_constraintmatrix_01/ncpu_") + Utilities::int_to_string(Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD)) + "/dat." + Utilities::int_to_string(i)).c_str());
+          cat_file((std::string("dat." + Utilities::int_to_string(i)).c_str());
         }
 
     }
index 49e11d01127e9235a89e69941fdb3238dc0f42bd..6db129efac494a250234efbbdb82f96b10c99b7f 100644 (file)
@@ -73,7 +73,7 @@ void test ()
 
   IndexSet locally_active (dof.n_dofs());
   DoFTools::extract_locally_active_dofs (dof, locally_active);
-  std::ofstream file((std::string("p4est_3d_constraintmatrix_04/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 << ": \n\n";
   file << "Constraints:\n";
   constraints.print(file);
@@ -88,7 +88,7 @@ void test ()
     {
       for (unsigned int i=0; i<numproc; ++i)
         {
-          cat_file((std::string("p4est_3d_constraintmatrix_04/ncpu_") + Utilities::int_to_string(Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD)) + "/dat." + Utilities::int_to_string(i)).c_str());
+          cat_file((std::string("dat." + Utilities::int_to_string(i)).c_str());
         }
     }
 }
index 29d6927ad01790713c99970d257a92efbc6b5c55..229632fb097f57b40df5e8b8da1beef31a2fd10b 100644 (file)
@@ -52,7 +52,7 @@ void test()
     deallog << "hyper_cube" << std::endl;
 
   std::string filename =
-    (std::string("p4est_save_01/ncpu_") + Utilities::int_to_string(Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD)) + "/dat");
+    (std::string("dat");
   {
     parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
 
index 2c1801beb3b4c728d56cc317ddd842a175c32027..20f71ba0707d192307cde9e9dc0c4ec42125885a 100644 (file)
@@ -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<dim> tr(MPI_COMM_WORLD);
 
index 886654220dfb5ecaed7a204d7c0b4361854ca742..b427832fc8805b2bbbaed1faf2deeb5ef8a805aa 100644 (file)
@@ -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<dim> tr (MPI_COMM_WORLD);
 
index c91f5013ade80414eaf4cc6b954af9e275c448c5..214cd7ba5cc42343a9ecd91dd496f7f6c50f1591 100644 (file)
@@ -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<v.ghost_targets().size(); ++i)
@@ -88,7 +88,7 @@ void test ()
     {
       for (unsigned int i=0; i<numproc; ++i)
         {
-          cat_file((std::string("parallel_partitioner_03/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());
         }
 
     }

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.