From b5757558e836284a376e33268c58944caf0cc5e9 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 12 Jun 1998 09:37:50 +0000 Subject: [PATCH] Changes mostly related to the implementation of coarsening. git-svn-id: https://svn.dealii.org/trunk@399 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/Attic/examples/dof/Makefile | 2 +- .../error-estimation/error-estimation.cc | 16 +++++++++------- deal.II/deal.II/Attic/examples/grid/Makefile | 2 +- tests/big-tests/dof/Makefile | 2 +- .../error-estimation/error-estimation.cc | 16 +++++++++------- tests/big-tests/grid/Makefile | 2 +- 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/deal.II/deal.II/Attic/examples/dof/Makefile b/deal.II/deal.II/Attic/examples/dof/Makefile index 5c2be0e318..ff771ea390 100644 --- a/deal.II/deal.II/Attic/examples/dof/Makefile +++ b/deal.II/deal.II/Attic/examples/dof/Makefile @@ -15,7 +15,7 @@ debug-mode = on # If you want your program to be linked with extra object or library # files, specify them here: -user-libs = +user-libs = ../../lib/libbasic.g.a ../../lib/libgrid.g.a ../../../lac/lib/liblac.g.a ../../lib/libfe.g.a # To run the program, use "make run"; to give parameters to the program, # give the parameters to the following variable: 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 063f9902c5..3a67f6fe30 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 @@ -542,14 +542,16 @@ void PoissonProblem::run (ParameterHandler &prm) { tria->refine_global (1); break; case true_error: - tria->refine_fixed_number (h1_error_per_cell, - prm.get_double("Refinement fraction")); - tria->execute_refinement (); + tria->refine_and_coarsen_fixed_number (h1_error_per_cell, + prm.get_double("Refinement fraction"), + 0); + tria->execute_coarsening_and_refinement (); break; case error_estimator: - tria->refine_fixed_number (estimated_error_per_cell, - prm.get_double("Refinement fraction")); - tria->execute_refinement (); + tria->refine_and_coarsen_fixed_number (estimated_error_per_cell, + prm.get_double("Refinement fraction"), + 0); + tria->execute_coarsening_and_refinement (); break; }; cout << endl << endl; @@ -573,7 +575,7 @@ void PoissonProblem::run (ParameterHandler &prm) { cout << endl; filename += "finest_mesh.gnuplot"; - cout << " Wrinting finest grid to <" << filename << ">... " << endl; + cout << " Writing finest grid to <" << filename << ">... " << endl; ofstream finest_mesh (filename.c_str()); tria->print_gnuplot (finest_mesh); finest_mesh.close(); diff --git a/deal.II/deal.II/Attic/examples/grid/Makefile b/deal.II/deal.II/Attic/examples/grid/Makefile index a16569986e..714fc3b6b6 100644 --- a/deal.II/deal.II/Attic/examples/grid/Makefile +++ b/deal.II/deal.II/Attic/examples/grid/Makefile @@ -15,7 +15,7 @@ debug-mode = on # If you want your program to be linked with extra object or library # files, specify them here: -user-libs = +user-libs = ../../lib/libbasic.g.a ../../lib/libgrid.g.a ../../../lac/lib/liblac.g.a ../../lib/libfe.g.a # To run the program, use "make run"; to give parameters to the program, # give the parameters to the following variable: diff --git a/tests/big-tests/dof/Makefile b/tests/big-tests/dof/Makefile index 5c2be0e318..ff771ea390 100644 --- a/tests/big-tests/dof/Makefile +++ b/tests/big-tests/dof/Makefile @@ -15,7 +15,7 @@ debug-mode = on # If you want your program to be linked with extra object or library # files, specify them here: -user-libs = +user-libs = ../../lib/libbasic.g.a ../../lib/libgrid.g.a ../../../lac/lib/liblac.g.a ../../lib/libfe.g.a # To run the program, use "make run"; to give parameters to the program, # give the parameters to the following variable: diff --git a/tests/big-tests/error-estimation/error-estimation.cc b/tests/big-tests/error-estimation/error-estimation.cc index 063f9902c5..3a67f6fe30 100644 --- a/tests/big-tests/error-estimation/error-estimation.cc +++ b/tests/big-tests/error-estimation/error-estimation.cc @@ -542,14 +542,16 @@ void PoissonProblem::run (ParameterHandler &prm) { tria->refine_global (1); break; case true_error: - tria->refine_fixed_number (h1_error_per_cell, - prm.get_double("Refinement fraction")); - tria->execute_refinement (); + tria->refine_and_coarsen_fixed_number (h1_error_per_cell, + prm.get_double("Refinement fraction"), + 0); + tria->execute_coarsening_and_refinement (); break; case error_estimator: - tria->refine_fixed_number (estimated_error_per_cell, - prm.get_double("Refinement fraction")); - tria->execute_refinement (); + tria->refine_and_coarsen_fixed_number (estimated_error_per_cell, + prm.get_double("Refinement fraction"), + 0); + tria->execute_coarsening_and_refinement (); break; }; cout << endl << endl; @@ -573,7 +575,7 @@ void PoissonProblem::run (ParameterHandler &prm) { cout << endl; filename += "finest_mesh.gnuplot"; - cout << " Wrinting finest grid to <" << filename << ">... " << endl; + cout << " Writing finest grid to <" << filename << ">... " << endl; ofstream finest_mesh (filename.c_str()); tria->print_gnuplot (finest_mesh); finest_mesh.close(); diff --git a/tests/big-tests/grid/Makefile b/tests/big-tests/grid/Makefile index a16569986e..714fc3b6b6 100644 --- a/tests/big-tests/grid/Makefile +++ b/tests/big-tests/grid/Makefile @@ -15,7 +15,7 @@ debug-mode = on # If you want your program to be linked with extra object or library # files, specify them here: -user-libs = +user-libs = ../../lib/libbasic.g.a ../../lib/libgrid.g.a ../../../lac/lib/liblac.g.a ../../lib/libfe.g.a # To run the program, use "make run"; to give parameters to the program, # give the parameters to the following variable: -- 2.39.5