From: bangerth Date: Wed, 29 Oct 2008 22:13:58 +0000 (+0000) Subject: Also output level wise information. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c536c296ec5538ab398f7d368fbcd957c082eae4;p=dealii-svn.git Also output level wise information. git-svn-id: https://svn.dealii.org/trunk@17404 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/deal.II/number_cache.cc b/tests/deal.II/number_cache.cc index 70eafc8245..756fe38635 100644 --- a/tests/deal.II/number_cache.cc +++ b/tests/deal.II/number_cache.cc @@ -34,6 +34,45 @@ std::ofstream logfile("number_cache/output"); + +template +void output (const Triangulation &tria) +{ + + deallog << " " << tria.n_active_cells() << std::endl; + deallog << " " << tria.n_cells() << std::endl; + deallog << " " << tria.n_active_lines() << std::endl; + deallog << " " << tria.n_lines() << std::endl; + deallog << " " << tria.n_active_quads() << std::endl; + deallog << " " << tria.n_quads() << std::endl; + deallog << " " << tria.n_active_hexs() << std::endl; + deallog << " " << tria.n_hexs() << std::endl; + + for (unsigned int i=0; i void test (const char *filename) { @@ -56,14 +95,7 @@ void test (const char *filename) return; } - deallog << " " << tria.n_active_cells() << std::endl; - deallog << " " << tria.n_cells() << std::endl; - deallog << " " << tria.n_active_lines() << std::endl; - deallog << " " << tria.n_lines() << std::endl; - deallog << " " << tria.n_active_quads() << std::endl; - deallog << " " << tria.n_quads() << std::endl; - deallog << " " << tria.n_active_hexs() << std::endl; - deallog << " " << tria.n_hexs() << std::endl; + output (tria); // now refine a few cells and output again deallog << " Refining..." << std::endl; @@ -73,15 +105,8 @@ void test (const char *filename) 10U); ++i, ++cell) cell->set_refine_flag (); tria.execute_coarsening_and_refinement (); - - deallog << " " << tria.n_active_cells() << std::endl; - deallog << " " << tria.n_cells() << std::endl; - deallog << " " << tria.n_active_lines() << std::endl; - deallog << " " << tria.n_lines() << std::endl; - deallog << " " << tria.n_active_quads() << std::endl; - deallog << " " << tria.n_quads() << std::endl; - deallog << " " << tria.n_active_hexs() << std::endl; - deallog << " " << tria.n_hexs() << std::endl; + + output (tria); } diff --git a/tests/deal.II/number_cache/cmp/generic b/tests/deal.II/number_cache/cmp/generic index b1d54b6461..0ce9e3a50a 100644 --- a/tests/deal.II/number_cache/cmp/generic +++ b/tests/deal.II/number_cache/cmp/generic @@ -8,6 +8,10 @@ DEAL:: 29037 DEAL:: 29037 DEAL:: 0 DEAL:: 0 +DEAL:: 29037 +DEAL:: 29037 +DEAL:: 29037 +DEAL:: 29037 DEAL:: Refining... DEAL:: 29070 DEAL:: 29081 @@ -17,6 +21,14 @@ DEAL:: 29070 DEAL:: 29081 DEAL:: 0 DEAL:: 0 +DEAL:: 29026 +DEAL:: 29037 +DEAL:: 29026 +DEAL:: 29037 +DEAL:: 44 +DEAL:: 44 +DEAL:: 44 +DEAL:: 44 DEAL::Reading grid_in_3d/1.in DEAL:: 16480 DEAL:: 16480 @@ -26,6 +38,10 @@ DEAL:: 52008 DEAL:: 52008 DEAL:: 16480 DEAL:: 16480 +DEAL:: 16480 +DEAL:: 16480 +DEAL:: 16480 +DEAL:: 16480 DEAL:: Refining... DEAL:: 16557 DEAL:: 16568 @@ -35,6 +51,14 @@ DEAL:: 52308 DEAL:: 52364 DEAL:: 16557 DEAL:: 16568 +DEAL:: 16469 +DEAL:: 16480 +DEAL:: 16469 +DEAL:: 16480 +DEAL:: 88 +DEAL:: 88 +DEAL:: 88 +DEAL:: 88 DEAL::Reading grid_in_3d/2.in DEAL:: 360 DEAL:: 360 @@ -44,6 +68,10 @@ DEAL:: 1218 DEAL:: 1218 DEAL:: 360 DEAL:: 360 +DEAL:: 360 +DEAL:: 360 +DEAL:: 360 +DEAL:: 360 DEAL:: Refining... DEAL:: 437 DEAL:: 448 @@ -53,6 +81,14 @@ DEAL:: 1500 DEAL:: 1550 DEAL:: 437 DEAL:: 448 +DEAL:: 349 +DEAL:: 360 +DEAL:: 349 +DEAL:: 360 +DEAL:: 88 +DEAL:: 88 +DEAL:: 88 +DEAL:: 88 DEAL::Reading grid_in_3d/3.in DEAL:: 2 DEAL:: 2 @@ -62,6 +98,10 @@ DEAL:: 11 DEAL:: 11 DEAL:: 2 DEAL:: 2 +DEAL:: 2 +DEAL:: 2 +DEAL:: 2 +DEAL:: 2 DEAL:: Refining... DEAL:: 9 DEAL:: 10 @@ -71,6 +111,14 @@ DEAL:: 41 DEAL:: 47 DEAL:: 9 DEAL:: 10 +DEAL:: 1 +DEAL:: 2 +DEAL:: 1 +DEAL:: 2 +DEAL:: 8 +DEAL:: 8 +DEAL:: 8 +DEAL:: 8 DEAL::Reading grid_in_3d/4.in DEAL:: 13824 DEAL:: 13824 @@ -80,6 +128,10 @@ DEAL:: 42816 DEAL:: 42816 DEAL:: 13824 DEAL:: 13824 +DEAL:: 13824 +DEAL:: 13824 +DEAL:: 13824 +DEAL:: 13824 DEAL:: Refining... DEAL:: 13901 DEAL:: 13912 @@ -89,6 +141,14 @@ DEAL:: 43110 DEAL:: 43164 DEAL:: 13901 DEAL:: 13912 +DEAL:: 13813 +DEAL:: 13824 +DEAL:: 13813 +DEAL:: 13824 +DEAL:: 88 +DEAL:: 88 +DEAL:: 88 +DEAL:: 88 DEAL::Reading grid_in_3d/evil_0.in DEAL:: 10 DEAL:: 10 @@ -98,6 +158,10 @@ DEAL:: 50 DEAL:: 50 DEAL:: 10 DEAL:: 10 +DEAL:: 10 +DEAL:: 10 +DEAL:: 10 +DEAL:: 10 DEAL:: Refining... DEAL:: 38 DEAL:: 42 @@ -107,6 +171,14 @@ DEAL:: 161 DEAL:: 182 DEAL:: 38 DEAL:: 42 +DEAL:: 6 +DEAL:: 10 +DEAL:: 6 +DEAL:: 10 +DEAL:: 32 +DEAL:: 32 +DEAL:: 32 +DEAL:: 32 DEAL::Reading grid_in_3d/evil_1.in DEAL:: 10 DEAL:: 10 @@ -116,6 +188,10 @@ DEAL:: 50 DEAL:: 50 DEAL:: 10 DEAL:: 10 +DEAL:: 10 +DEAL:: 10 +DEAL:: 10 +DEAL:: 10 DEAL:: Refining... DEAL:: 38 DEAL:: 42 @@ -125,6 +201,14 @@ DEAL:: 161 DEAL:: 182 DEAL:: 38 DEAL:: 42 +DEAL:: 6 +DEAL:: 10 +DEAL:: 6 +DEAL:: 10 +DEAL:: 32 +DEAL:: 32 +DEAL:: 32 +DEAL:: 32 DEAL::Reading grid_in_3d/evil_2.in DEAL:: 10 DEAL:: 10 @@ -134,6 +218,10 @@ DEAL:: 50 DEAL:: 50 DEAL:: 10 DEAL:: 10 +DEAL:: 10 +DEAL:: 10 +DEAL:: 10 +DEAL:: 10 DEAL:: Refining... DEAL:: 38 DEAL:: 42 @@ -143,6 +231,14 @@ DEAL:: 161 DEAL:: 182 DEAL:: 38 DEAL:: 42 +DEAL:: 6 +DEAL:: 10 +DEAL:: 6 +DEAL:: 10 +DEAL:: 32 +DEAL:: 32 +DEAL:: 32 +DEAL:: 32 DEAL::Reading grid_in_3d/evil_3.in DEAL:: 10 DEAL:: 10 @@ -152,6 +248,10 @@ DEAL:: 50 DEAL:: 50 DEAL:: 10 DEAL:: 10 +DEAL:: 10 +DEAL:: 10 +DEAL:: 10 +DEAL:: 10 DEAL:: Refining... DEAL:: 38 DEAL:: 42 @@ -161,6 +261,14 @@ DEAL:: 161 DEAL:: 182 DEAL:: 38 DEAL:: 42 +DEAL:: 6 +DEAL:: 10 +DEAL:: 6 +DEAL:: 10 +DEAL:: 32 +DEAL:: 32 +DEAL:: 32 +DEAL:: 32 DEAL::Reading grid_in_3d/evil_4.in DEAL:: 10 DEAL:: 10 @@ -170,6 +278,10 @@ DEAL:: 50 DEAL:: 50 DEAL:: 10 DEAL:: 10 +DEAL:: 10 +DEAL:: 10 +DEAL:: 10 +DEAL:: 10 DEAL:: Refining... DEAL:: 38 DEAL:: 42 @@ -179,3 +291,11 @@ DEAL:: 161 DEAL:: 182 DEAL:: 38 DEAL:: 42 +DEAL:: 6 +DEAL:: 10 +DEAL:: 6 +DEAL:: 10 +DEAL:: 32 +DEAL:: 32 +DEAL:: 32 +DEAL:: 32