From: Timo Heister Date: Mon, 5 Oct 2015 12:42:41 +0000 (-0400) Subject: tests: remove useless usage of base class n_active_cells X-Git-Tag: v8.4.0-rc2~340^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dbca6a476a09146439102f5d07ac100cf7611ae;p=dealii.git tests: remove useless usage of base class n_active_cells --- diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc index 32a208b462..02896b4563 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc @@ -49,7 +49,7 @@ void test() sub, Point<2>(0,0), Point<2>(1,1)); tr.refine_global (1); - Vector indicators (tr.dealii::Triangulation<2>::n_active_cells()); + Vector indicators (tr.n_active_cells()); { unsigned int cell_index = 0; unsigned int my_cell_index = 0; diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc index 6cbd65aafa..4944878f39 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc @@ -53,7 +53,7 @@ void test() sub, Point<2>(0,0), Point<2>(1,1)); tr.refine_global (1); - Vector indicators (tr.dealii::Triangulation<2>::n_active_cells()); + Vector indicators (tr.n_active_cells()); { unsigned int cell_index = 0; unsigned int my_cell_index = 0; diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc index 76a1f5e29d..aa51b93c22 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc @@ -58,7 +58,7 @@ void test() sub, Point<2>(0,0), Point<2>(1,1)); tr.refine_global (1); - Vector indicators (tr.dealii::Triangulation<2>::n_active_cells()); + Vector indicators (tr.n_active_cells()); { unsigned int cell_index = 0; unsigned int my_cell_index = 0; diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc index 053b9ae0c4..531a648939 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc @@ -47,8 +47,8 @@ void test() GridGenerator::hyper_cube(static_cast&>(tr)); tr.refine_global (4); - Vector indicators (tr.dealii::Triangulation<2>::n_active_cells()); - float min_indicator = tr.dealii::Triangulation<2>::n_active_cells(), + Vector indicators (tr.n_active_cells()); + float min_indicator = tr.n_active_cells(), max_indicator = 0; { unsigned int cell_index = 0; diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc index 6068b94942..01b40dedd0 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc @@ -44,8 +44,8 @@ void test() GridGenerator::hyper_cube(static_cast&>(tr)); tr.refine_global (3); - Vector indicators (tr.dealii::Triangulation<2>::n_active_cells()); - float min_indicator = tr.dealii::Triangulation<2>::n_active_cells(), + Vector indicators (tr.n_active_cells()); + float min_indicator = tr.n_active_cells(), max_indicator = 0; { unsigned int cell_index = 0; diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc index 630d8499fd..5be4c97d83 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc @@ -61,11 +61,11 @@ void test() tr.refine_global (initial_refinement); - Assert (tr.dealii::Triangulation<2>::n_active_cells()==768, + Assert (tr.n_active_cells()==768, ExcInternalError()); // now read indicators - Vector indicators (tr.dealii::Triangulation<2>::n_active_cells()); + Vector indicators (tr.n_active_cells()); { std::ifstream in(SOURCE_DIR "/refine_and_coarsen_fixed_fraction_06/indicators"); Assert(in, ExcMessage("File missing")); diff --git a/tests/mpi/refine_and_coarsen_fixed_number_01.cc b/tests/mpi/refine_and_coarsen_fixed_number_01.cc index 672b035f54..725039f6ec 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_01.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_01.cc @@ -49,7 +49,7 @@ void test() sub, Point<2>(0,0), Point<2>(1,1)); tr.refine_global (1); - Vector indicators (tr.dealii::Triangulation<2>::n_active_cells()); + Vector indicators (tr.n_active_cells()); { unsigned int cell_index = 0; unsigned int my_cell_index = 0; diff --git a/tests/mpi/refine_and_coarsen_fixed_number_02.cc b/tests/mpi/refine_and_coarsen_fixed_number_02.cc index 91f49e9553..138a75f90a 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_02.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_02.cc @@ -50,7 +50,7 @@ void test() sub, Point<2>(0,0), Point<2>(1,1)); tr.refine_global (1); - Vector indicators (tr.dealii::Triangulation<2>::n_active_cells()); + Vector indicators (tr.n_active_cells()); { unsigned int cell_index = 0; unsigned int my_cell_index = 0; diff --git a/tests/mpi/refine_and_coarsen_fixed_number_03.cc b/tests/mpi/refine_and_coarsen_fixed_number_03.cc index 5660a05118..50bbfc06ec 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_03.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_03.cc @@ -47,7 +47,7 @@ void test() sub, Point<2>(0,0), Point<2>(1,1)); tr.refine_global (1); - Vector indicators (tr.dealii::Triangulation<2>::n_active_cells()); + Vector indicators (tr.n_active_cells()); { unsigned int cell_index = 0; unsigned int my_cell_index = 0; diff --git a/tests/mpi/refine_and_coarsen_fixed_number_04.cc b/tests/mpi/refine_and_coarsen_fixed_number_04.cc index bbda11e10b..67434f59f5 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_04.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_04.cc @@ -47,8 +47,8 @@ void test() GridGenerator::hyper_cube(static_cast&>(tr)); tr.refine_global (4); - Vector indicators (tr.dealii::Triangulation<2>::n_active_cells()); - float min_indicator = tr.dealii::Triangulation<2>::n_active_cells(), + Vector indicators (tr.n_active_cells()); + float min_indicator = tr.n_active_cells(), max_indicator = 0; { unsigned int cell_index = 0; diff --git a/tests/mpi/refine_and_coarsen_fixed_number_05.cc b/tests/mpi/refine_and_coarsen_fixed_number_05.cc index 5f2a09095e..8a0c86997a 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_05.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_05.cc @@ -44,8 +44,8 @@ void test() GridGenerator::hyper_cube(static_cast&>(tr)); tr.refine_global (3); - Vector indicators (tr.dealii::Triangulation<2>::n_active_cells()); - float min_indicator = tr.dealii::Triangulation<2>::n_active_cells(), + Vector indicators (tr.n_active_cells()); + float min_indicator = tr.n_active_cells(), max_indicator = 0; { unsigned int cell_index = 0; diff --git a/tests/mpi/refine_and_coarsen_fixed_number_07.cc b/tests/mpi/refine_and_coarsen_fixed_number_07.cc index ab837b22bb..bf4f6f3983 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_07.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_07.cc @@ -47,7 +47,7 @@ void test(const double max_n_cell_ratio) sub, Point<2>(0,0), Point<2>(1,1)); tr.refine_global (3); - Vector indicators (tr.dealii::Triangulation<2>::n_active_cells()); + Vector indicators (tr.n_active_cells()); { unsigned int cell_index = 0; unsigned int my_cell_index = 0;