Merge pull request #901 from aerappa/refine_nvb

Add newest vertex bisection into new adaptivity framework
gridap · May 22, 2023 · f28c84a · f28c84a
2 parents 6a0dfdd + 78613f6
commit f28c84a
Show file tree

Hide file tree

Showing 8 changed files with 314 additions and 812 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Jacobi polynomial bases. Since PR [#896](https://github.com/gridap/Gridap.jl/pull/896).
 
+- Replaced newest vertex bisection mesh adaptation in
+  `src/Geometry/NewestVertexBisection.jl` with appropriate changes to
+  `src/Adaptivity/EdgeBasedRefinement.jl`. see PR
+  [#901](https://github.com/gridap/Gridap.jl/pull/901).
+
 ### Fixed
 
 - ODE operators cache linear system at initial time or the time stored by the operator. Before, the linear system was cached at time `t = 0.0`, which cannot be done if the operator is not well-defined at `t = 0.0`. Since PR [#891](https://github.com/gridap/Gridap.jl/pull/891).

diff --git a/src/Adaptivity/AdaptedDiscreteModels.jl b/src/Adaptivity/AdaptedDiscreteModels.jl
@@ -81,8 +81,15 @@ function refine(model::UnstructuredDiscreteModel,::AdaptivityMethod,args...;kwar
   @abstractmethod
 end
 
-function refine(model::UnstructuredDiscreteModel,args...;refinement_method=EdgeBasedRefinement(),kwargs...)
-  return refine(refinement_method,model,args...;kwargs...)
+# Handle the user's requested choice for refinement
+function string_to_refinement(refinement_method::String, model)
+  refinement_method == "red_green" && return RedGreenRefinement()
+  refinement_method == "nvb" && return NVBRefinement(model)
+  error("refinement_method $refinement_method not recognized")
+end
+
+function refine(model::UnstructuredDiscreteModel,args...;refinement_method="red_green",kwargs...)
+  return refine(string_to_refinement(refinement_method, model),model,args...;kwargs...)
 end
 
 # CartesianDiscreteModel refining
@@ -151,4 +158,4 @@ end
 
     return f2c_map, child_map
   end)
-end
+end
diff --git a/src/Adaptivity/EdgeBasedRefinement.jl b/src/Adaptivity/EdgeBasedRefinement.jl
diff --git a/src/Geometry/Geometry.jl b/src/Geometry/Geometry.jl
@@ -157,7 +157,6 @@ export compute_vertex_node
 export get_node_face_owner
 export compute_node_face_owner
 export get_triangulation
-export newest_vertex_bisection
 
 export UnstructuredDiscreteModel
 export CartesianDiscreteModel
@@ -222,8 +221,6 @@ include("GridPortions.jl")
 
 include("DiscreteModelPortions.jl")
 
-include("NewestVertexBisection.jl")
-
 include("Triangulations.jl")
 
 include("BoundaryTriangulations.jl")