From: young Date: Tue, 15 Jan 2013 10:24:12 +0000 (+0000) Subject: Remove use of depreceated function (parallelogram). X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f89286aa346f46441a4a4742ed42522b83d80770;p=dealii-svn.git Remove use of depreceated function (parallelogram). git-svn-id: https://svn.dealii.org/trunk@28062 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/deal.II/grid_parallelepiped_01.cc b/tests/deal.II/grid_parallelepiped_01.cc index d369e84445..c4920ed5b1 100644 --- a/tests/deal.II/grid_parallelepiped_01.cc +++ b/tests/deal.II/grid_parallelepiped_01.cc @@ -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"; } diff --git a/tests/deal.II/grid_parallelepiped_01/cmp/generic b/tests/deal.II/grid_parallelepiped_01/cmp/generic index 7201ca23a3..00d8d10f25 100644 --- a/tests/deal.II/grid_parallelepiped_01/cmp/generic +++ b/tests/deal.II/grid_parallelepiped_01/cmp/generic @@ -1,2 +1,3 @@ check 1d parallelepiped (hyper_cube): OK +check 2d parallelepiped (parallelogram): OK diff --git a/tests/deal.II/grid_parallelepiped_01/cmp/x86_64-unknown-linux-gnu+gcc4.5 b/tests/deal.II/grid_parallelepiped_01/cmp/x86_64-unknown-linux-gnu+gcc4.5 index 7201ca23a3..00d8d10f25 100644 --- a/tests/deal.II/grid_parallelepiped_01/cmp/x86_64-unknown-linux-gnu+gcc4.5 +++ b/tests/deal.II/grid_parallelepiped_01/cmp/x86_64-unknown-linux-gnu+gcc4.5 @@ -1,2 +1,3 @@ check 1d parallelepiped (hyper_cube): OK +check 2d parallelepiped (parallelogram): OK