[cig-commits] [commit] master: simplify implementation (also fixes test) (ca95ee8)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Thu May 22 16:33:22 PDT 2014


Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/0801e5573990bb6b2572872a2c084577ffc9fa4a...ca95ee8d4de5ce6abeb6347281eb00a1d930b799

>---------------------------------------------------------------

commit ca95ee8d4de5ce6abeb6347281eb00a1d930b799
Author: Timo Heister <timo.heister at gmail.com>
Date:   Thu May 22 19:33:04 2014 -0400

    simplify implementation (also fixes test)


>---------------------------------------------------------------

ca95ee8d4de5ce6abeb6347281eb00a1d930b799
 .../mesh_refinement/minimum_refinement_function.cc | 32 +++++++---------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/source/mesh_refinement/minimum_refinement_function.cc b/source/mesh_refinement/minimum_refinement_function.cc
index 0f4b64f..fd95d74 100644
--- a/source/mesh_refinement/minimum_refinement_function.cc
+++ b/source/mesh_refinement/minimum_refinement_function.cc
@@ -34,31 +34,19 @@ namespace aspect
     void
     MinimumRefinementFunction<dim>::tag_additional_cells () const
     {
-      // evaluate a single point per cell
-      const QMidpoint<dim> quadrature_formula;
-      const unsigned int n_q_points = quadrature_formula.size();
-
-      FEValues<dim> fe_values (this->get_mapping(),
-        		               this->get_fe(),
-                               quadrature_formula,
-                               update_values   |
-                               update_quadrature_points );
-
-      // ensure minimum refinement level
       for (typename Triangulation<dim>::active_cell_iterator
-           cell = this->get_triangulation().begin_active();
-           cell != this->get_triangulation().end(); ++cell)
+          cell = this->get_triangulation().begin_active();
+          cell != this->get_triangulation().end(); ++cell)
         {
           if (cell->is_locally_owned())
-          {
-        	fe_values.reinit(cell);
-        	const double depth = this->get_geometry_model().depth(fe_values.quadrature_point(0));
-        	const Point<1> point(depth);
-          	if (cell->level() <= rint(min_refinement_level.value(point)))
-              cell->clear_coarsen_flag ();
-          	if (cell->level() <  rint(min_refinement_level.value(point)))
-              cell->set_refine_flag ();
-          }
+            {
+              const double depth = this->get_geometry_model().depth(cell->center());
+              const Point<1> point(depth);
+              if (cell->level() <= rint(min_refinement_level.value(point)))
+                cell->clear_coarsen_flag ();
+              if (cell->level() <  rint(min_refinement_level.value(point)))
+                cell->set_refine_flag ();
+            }
         }
     }
 



More information about the CIG-COMMITS mailing list