]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Changes mostly related to the implementation of coarsening.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 12 Jun 1998 09:37:50 +0000 (09:37 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 12 Jun 1998 09:37:50 +0000 (09:37 +0000)
git-svn-id: https://svn.dealii.org/trunk@399 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/Attic/examples/dof/Makefile
deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc
deal.II/deal.II/Attic/examples/grid/Makefile
tests/big-tests/dof/Makefile
tests/big-tests/error-estimation/error-estimation.cc
tests/big-tests/grid/Makefile

index 5c2be0e3186cfea7b9a67b45b2195fdd76c15dcc..ff771ea390df1b9d90a3354a7ac699ba05037719 100644 (file)
@@ -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:
index 063f9902c5e6ab59981b6dd09114ef245902f484..3a67f6fe300cdf788651f64f1acf7f00eab5ec5d 100644 (file)
@@ -542,14 +542,16 @@ void PoissonProblem<dim>::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<dim>::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();
index a16569986e2ed4f93e4f93b6ae750116c16feb83..714fc3b6b659ed1b1a111b43ad912858e2adc42f 100644 (file)
@@ -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:
index 5c2be0e3186cfea7b9a67b45b2195fdd76c15dcc..ff771ea390df1b9d90a3354a7ac699ba05037719 100644 (file)
@@ -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:
index 063f9902c5e6ab59981b6dd09114ef245902f484..3a67f6fe300cdf788651f64f1acf7f00eab5ec5d 100644 (file)
@@ -542,14 +542,16 @@ void PoissonProblem<dim>::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<dim>::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();
index a16569986e2ed4f93e4f93b6ae750116c16feb83..714fc3b6b659ed1b1a111b43ad912858e2adc42f 100644 (file)
@@ -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:

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.