]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Remove use of depreceated function (parallelogram).
authoryoung <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 15 Jan 2013 10:24:12 +0000 (10:24 +0000)
committeryoung <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 15 Jan 2013 10:24:12 +0000 (10:24 +0000)
git-svn-id: https://svn.dealii.org/trunk@28062 0785d39b-7218-0410-832d-ea1e28bc413d

tests/deal.II/grid_parallelepiped_01.cc
tests/deal.II/grid_parallelepiped_01/cmp/generic
tests/deal.II/grid_parallelepiped_01/cmp/x86_64-unknown-linux-gnu+gcc4.5

index d369e844459728fb3c77f63e298669a769f94aa9..c4920ed5b186df639fe1eb56560028b9b56b8d84 100644 (file)
@@ -55,16 +55,13 @@ void check_1d_parallelepiped_by_comparison (bool log)
       logfile << "\ncheck 1d parallelepiped (hyper_cube): ";
       if (GridTools::have_same_coarse_mesh (triangulation_parallelepiped,
                                            triangulation_cube))
-       logfile << "OK" << std::endl;
+       logfile << "OK";
       else
-       logfile << "not OK... coarse grids are different but they should be the same" 
-               << std::endl;
+       logfile << "not OK... coarse grids are different but they should be the same";
     }
 }
 
-// @todo When the interface to parallelogram is updated, define TWO_D_TEST
 
-#ifdef TWO_D_TEST
 // Here is the implementation in 2d:
 void check_2d_parallelepiped_by_comparison (bool log)
 {
@@ -76,7 +73,7 @@ void check_2d_parallelepiped_by_comparison (bool log)
   
   Triangulation<2> triangulation_parallelepiped;
   GridGenerator::parallelepiped (triangulation_parallelepiped, corners, false);
-  
+
   Triangulation<2> triangulation_parallelogram;
   GridGenerator::parallelogram (triangulation_parallelogram, corners, false);
 
@@ -85,20 +82,17 @@ void check_2d_parallelepiped_by_comparison (bool log)
       logfile << "\ncheck 2d parallelepiped (parallelogram): ";
       if (GridTools::have_same_coarse_mesh (triangulation_parallelepiped,
                                            triangulation_parallelogram))
-       logfile << "OK" << std::endl;
+       logfile << "OK";
 
       else
-       logfile << "not OK... coarse grids are different but they should be the same" 
-               << std::endl;
+       logfile << "not OK... coarse grids are different but they should be the same";
     }
 }
-#endif
 
 int main ()
 {
   // Check parallelepiped 
   check_1d_parallelepiped_by_comparison (true);
-#ifdef TWO_D_TEST
   check_2d_parallelepiped_by_comparison (true);
-#endif
+  logfile << "\n";
 }
index 7201ca23a382edfd9ca959cdd448d89f960eb995..00d8d10f253b8b1bae01b1cf35c134114d8c6c4d 100644 (file)
@@ -1,2 +1,3 @@
 
 check 1d parallelepiped (hyper_cube): OK
+check 2d parallelepiped (parallelogram): OK
index 7201ca23a382edfd9ca959cdd448d89f960eb995..00d8d10f253b8b1bae01b1cf35c134114d8c6c4d 100644 (file)
@@ -1,2 +1,3 @@
 
 check 1d parallelepiped (hyper_cube): OK
+check 2d parallelepiped (parallelogram): OK

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.