Merge branch 'main' of github.com:gridap/GridapP4est.jl into bugfix-p…

…eriodic
gridap · Oct 10, 2024 · 6353c22 · 6353c22
2 parents d03085a + c85d288
commit 6353c22
Show file tree

Hide file tree

Showing 14 changed files with 1,236 additions and 376 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "GridapP4est"
 uuid = "c2c8e14b-f5fd-423d-9666-1dd9ad120af9"
 authors = ["Alberto F. Martin <[email protected]>"]
-version = "0.3.6"
+version = "0.3.9"
 
 [deps]
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
@@ -17,8 +17,8 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 [compat]
 ArgParse = "1"
 FillArrays = "0.8.4, 0.9, 0.10, 0.11, 0.12, 1"
-Gridap = "0.17.22, 0.18"
-GridapDistributed = "0.3.1, 0.4"
+Gridap = "0.18.6"
+GridapDistributed = "0.4"
 MPI = "0.20"
 P4est_wrapper = "0.2.2"
 PartitionedArrays = "0.3.3"

diff --git a/README.md b/README.md
@@ -5,8 +5,8 @@
 [![Build Status](https://github.com/gridap/GridapP4est.jl/workflows/CI/badge.svg)](https://github.com/gridap/GridapP4est.jl/actions)
 [![Coverage](https://codecov.io/gh/gridap/GridapP4est.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/gridap/GridapP4est.jl)
 
-| ![](https://user-images.githubusercontent.com/38347633/134634010-2be9b499-201b-4166-80ac-e161f6adceb0.png)   |  ![](https://user-images.githubusercontent.com/38347633/134634023-83f37646-f6b9-435c-9f9f-291dea9f86c2.png) 
-|:-------------:|:-------------:|
+![amr_cubed_sphere](https://github.com/gridap/GridapP4est.jl/assets/38347633/596ab00e-58a8-4aeb-bb0f-efbe63cb2b59)
+
 
 ## Purpose 
 

diff --git a/src/AnisotropicallyAdapted3DDistributedDiscreteModels.jl b/src/AnisotropicallyAdapted3DDistributedDiscreteModels.jl
@@ -18,6 +18,7 @@ function AnisotropicallyAdapted3DDistributedDiscreteModel(
     ptr_pXest_lnodes=setup_pXest_lnodes_nonconforming(pXest_type, ptr_pXest, ptr_pXest_ghost)
 
     dmodel,non_conforming_glue  = setup_non_conforming_distributed_discrete_model(pXest_type,
+                                                    PXestHorizontalRefinementRuleType(),
                                                     parts,
                                                     coarse_model,
                                                     ptr_pXest_connectivity,
@@ -87,6 +88,7 @@ function vertically_adapt(model::OctreeDistributedDiscreteModel{3,3},
 
   # Build fine-grid mesh
   fmodel,non_conforming_glue = setup_non_conforming_distributed_discrete_model(model.pXest_type,
+                                                                              model.pXest_refinement_rule_type,
                                                                               model.parts,
                                                                               model.coarse_model,
                                                                               model.ptr_pXest_connectivity,
@@ -154,6 +156,7 @@ function vertically_uniformly_refine(model::OctreeDistributedDiscreteModel)
 
   # Build fine-grid mesh
   fmodel,non_conforming_glue = setup_non_conforming_distributed_discrete_model(model.pXest_type,
+                                                                               model.pXest_refinement_rule_type,
                                                                                model.parts,
                                                                                model.coarse_model,
                                                                                model.ptr_pXest_connectivity,
@@ -201,6 +204,7 @@ end
 
 
 function setup_non_conforming_distributed_discrete_model(pXest_type::P6estType,
+                                                         pXest_refinement_rule_type::PXestRefinementRuleType,
                                                          parts,
                                                          coarse_discrete_model,
                                                          ptr_pXest_connectivity,
@@ -214,7 +218,7 @@ function setup_non_conforming_distributed_discrete_model(pXest_type::P6estType,
 
   gridap_cell_faces,
   non_conforming_glue=
-    generate_cell_faces_and_non_conforming_glue(pXest_type,ptr_pXest_lnodes, cell_prange)
+    generate_cell_faces_and_non_conforming_glue(pXest_type,pXest_refinement_rule_type,ptr_pXest_lnodes, cell_prange)
 
 
   nlvertices = map(non_conforming_glue) do ncglue
@@ -341,6 +345,7 @@ function generate_face_labeling(pXest_type::P6estType,
   ptr_p4est_lnodes = setup_pXest_lnodes_nonconforming(p4est_type, ptr_p4est, ptr_p4est_ghost)
 
   bottom_boundary_model,_=setup_non_conforming_distributed_discrete_model(p4est_type,
+                                                                        PXestUniformRefinementRuleType(),
                                                                         parts,
                                                                         coarse_discrete_model,
                                                                         ptr_p4est_connectivity,
@@ -637,6 +642,7 @@ function horizontally_adapt(model::OctreeDistributedDiscreteModel{Dc,Dp},
 
   # Build fine-grid mesh
   fmodel,non_conforming_glue = setup_non_conforming_distributed_discrete_model(model.pXest_type,
+                                                                               model.pXest_refinement_rule_type,
                                                                                model.parts,
                                                                                model.coarse_model,
                                                                                model.ptr_pXest_connectivity,