From 3042d0310d3d36330c1b7584ac87ea2e7480e0c0 Mon Sep 17 00:00:00 2001 From: wolf Date: Mon, 8 Mar 1999 14:30:14 +0000 Subject: [PATCH] Add support for coarsening as well. git-svn-id: https://svn.dealii.org/trunk@964 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/Attic/examples/error-estimation/ee.gauss.prm | 1 + deal.II/deal.II/Attic/examples/error-estimation/ee.kink.prm | 1 + .../deal.II/Attic/examples/error-estimation/ee.singular.prm | 1 + .../Attic/examples/error-estimation/error-estimation.cc | 6 ++++-- tests/big-tests/error-estimation/ee.gauss.prm | 1 + tests/big-tests/error-estimation/ee.kink.prm | 1 + tests/big-tests/error-estimation/ee.singular.prm | 1 + tests/big-tests/error-estimation/error-estimation.cc | 6 ++++-- 8 files changed, 14 insertions(+), 4 deletions(-) diff --git a/deal.II/deal.II/Attic/examples/error-estimation/ee.gauss.prm b/deal.II/deal.II/Attic/examples/error-estimation/ee.gauss.prm index 2efdb4a724..560bd59cf3 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/ee.gauss.prm +++ b/deal.II/deal.II/Attic/examples/error-estimation/ee.gauss.prm @@ -2,6 +2,7 @@ set Test case = Gauss shape set Initial refinement = 2 set Refinement criterion = { global | true error | estimated error } set Refinement fraction = 0.3 +set Coarsening fraction = 0.03 set Maximum cells = 10000 set Output base filename = data-gauss/ set Output format = ucd diff --git a/deal.II/deal.II/Attic/examples/error-estimation/ee.kink.prm b/deal.II/deal.II/Attic/examples/error-estimation/ee.kink.prm index e8667dd510..6bf0b8e88c 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/ee.kink.prm +++ b/deal.II/deal.II/Attic/examples/error-estimation/ee.kink.prm @@ -2,6 +2,7 @@ set Test case = Kink set Initial refinement = 1 set Refinement criterion = { global | estimated error } set Refinement fraction = 0.1 +set Coarsening fraction = 0.02 set Maximum cells = 100000 set Output base filename = data-kink/ set Output format = ucd diff --git a/deal.II/deal.II/Attic/examples/error-estimation/ee.singular.prm b/deal.II/deal.II/Attic/examples/error-estimation/ee.singular.prm index 61b6e7571a..eb6988553a 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/ee.singular.prm +++ b/deal.II/deal.II/Attic/examples/error-estimation/ee.singular.prm @@ -2,6 +2,7 @@ set Test case = Singular set Initial refinement = 1 set Refinement criterion = { global | estimated error } set Refinement fraction = 0.1 +set Coarsening fraction = 0.02 set Maximum cells = 100000 set Output base filename = data-singular/ set Output format = ucd diff --git a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc index 2ce177e2de..9bbaf662a0 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc +++ b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc @@ -362,6 +362,8 @@ void PoissonProblem::declare_parameters (ParameterHandler &prm) { Patterns::Sequence("global|true error|estimated error")); prm.declare_entry ("Refinement fraction", "0.3", Patterns::Double()); + prm.declare_entry ("Coarsening fraction", "0.1", + Patterns::Double()); prm.declare_entry ("Maximum cells", "3000", Patterns::Integer()); prm.declare_entry ("Output base filename", ""); @@ -564,13 +566,13 @@ void PoissonProblem::run (ParameterHandler &prm) { case true_error: tria->refine_and_coarsen_fixed_number (h1_error_per_cell, prm.get_double("Refinement fraction"), - 0); + prm.get_double("Coarsening fraction")); tria->execute_coarsening_and_refinement (); break; case error_estimator: tria->refine_and_coarsen_fixed_number (estimated_error_per_cell, prm.get_double("Refinement fraction"), - 0); + prm.get_double("Coarsening fraction")); tria->execute_coarsening_and_refinement (); break; }; diff --git a/tests/big-tests/error-estimation/ee.gauss.prm b/tests/big-tests/error-estimation/ee.gauss.prm index 2efdb4a724..560bd59cf3 100644 --- a/tests/big-tests/error-estimation/ee.gauss.prm +++ b/tests/big-tests/error-estimation/ee.gauss.prm @@ -2,6 +2,7 @@ set Test case = Gauss shape set Initial refinement = 2 set Refinement criterion = { global | true error | estimated error } set Refinement fraction = 0.3 +set Coarsening fraction = 0.03 set Maximum cells = 10000 set Output base filename = data-gauss/ set Output format = ucd diff --git a/tests/big-tests/error-estimation/ee.kink.prm b/tests/big-tests/error-estimation/ee.kink.prm index e8667dd510..6bf0b8e88c 100644 --- a/tests/big-tests/error-estimation/ee.kink.prm +++ b/tests/big-tests/error-estimation/ee.kink.prm @@ -2,6 +2,7 @@ set Test case = Kink set Initial refinement = 1 set Refinement criterion = { global | estimated error } set Refinement fraction = 0.1 +set Coarsening fraction = 0.02 set Maximum cells = 100000 set Output base filename = data-kink/ set Output format = ucd diff --git a/tests/big-tests/error-estimation/ee.singular.prm b/tests/big-tests/error-estimation/ee.singular.prm index 61b6e7571a..eb6988553a 100644 --- a/tests/big-tests/error-estimation/ee.singular.prm +++ b/tests/big-tests/error-estimation/ee.singular.prm @@ -2,6 +2,7 @@ set Test case = Singular set Initial refinement = 1 set Refinement criterion = { global | estimated error } set Refinement fraction = 0.1 +set Coarsening fraction = 0.02 set Maximum cells = 100000 set Output base filename = data-singular/ set Output format = ucd diff --git a/tests/big-tests/error-estimation/error-estimation.cc b/tests/big-tests/error-estimation/error-estimation.cc index 2ce177e2de..9bbaf662a0 100644 --- a/tests/big-tests/error-estimation/error-estimation.cc +++ b/tests/big-tests/error-estimation/error-estimation.cc @@ -362,6 +362,8 @@ void PoissonProblem::declare_parameters (ParameterHandler &prm) { Patterns::Sequence("global|true error|estimated error")); prm.declare_entry ("Refinement fraction", "0.3", Patterns::Double()); + prm.declare_entry ("Coarsening fraction", "0.1", + Patterns::Double()); prm.declare_entry ("Maximum cells", "3000", Patterns::Integer()); prm.declare_entry ("Output base filename", ""); @@ -564,13 +566,13 @@ void PoissonProblem::run (ParameterHandler &prm) { case true_error: tria->refine_and_coarsen_fixed_number (h1_error_per_cell, prm.get_double("Refinement fraction"), - 0); + prm.get_double("Coarsening fraction")); tria->execute_coarsening_and_refinement (); break; case error_estimator: tria->refine_and_coarsen_fixed_number (estimated_error_per_cell, prm.get_double("Refinement fraction"), - 0); + prm.get_double("Coarsening fraction")); tria->execute_coarsening_and_refinement (); break; }; -- 2.39.5