Merge branch 'master' of github.com:gridap/GridapEmbedded.jl into dis…

…tributed_agfem_with_algoim_quads
gridap · Jul 8, 2024 · 4b1c355 · 4b1c355
2 parents 356c02f + 056b5d6
commit 4b1c355
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 12 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,7 +1,7 @@
 GridapEmbedded.jl Copyright and License
 ==
 
-Copyright (c) 2020 by [Francesc Verdugo](mailto:[email protected]), [Eric Neiva](mailto:[email protected]) and [Santiago Badia](mailto:[email protected]).
+Copyright (c) 2020 by [Francesc Verdugo](mailto:[email protected]), [Eric Neiva](mailto:[email protected]), [Pere Antoni Martorell](mailto:[email protected]) and [Santiago Badia](mailto:[email protected]).
 
 GridapEmbedded.jl is licensed under the MIT Expat License
 
@@ -106,4 +106,4 @@ By making a contribution to this project, I certify that:
 Contact
 ==
 
-Please, contact the project administrators, [Francesc Verdugo](mailto:[email protected]), [Eric Neiva](mailto:[email protected]) and [Santiago Badia](mailto:[email protected]), for further questions about licenses and terms of use.
+Please, contact the project administrators, [Francesc Verdugo](mailto:[email protected]), [Eric Neiva](mailto:[email protected]), [Pere Antoni Martorell](mailto:[email protected]) and [Santiago Badia](mailto:[email protected]), for further questions about licenses and terms of use.
diff --git a/NEWS.md b/NEWS.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Unused `name` keywork argument in `square` and `quadrilateral` analytical geometries. Since PR [#86](https://github.com/gridap/GridapEmbedded.jl/pull/86).
+- Gluing of the remote root cells to the local+ghost mesh. Since PR [#91](https://github.com/gridap/GridapEmbedded.jl/pull/91).
 
 ## [0.9.3] - 2024-05-20
 

diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "GridapEmbedded"
 uuid = "8838a6a3-0006-4405-b874-385995508d5d"
-authors = ["Francesc Verdugo <[email protected]>", "Eric Neiva <[email protected]>", "Pere Antoni Martorell <pmartorell@cimne.upc.edu>", "Santiago Badia <[email protected]>"]
+authors = ["Francesc Verdugo <[email protected]>", "Eric Neiva <[email protected]>", "Pere Antoni Martorell <pere.antoni.martorell@upc.edu>", "Santiago Badia <[email protected]>"]
 version = "0.9.3"
 
 [deps]

diff --git a/src/AgFEM/AgFEMSpaces.jl b/src/AgFEM/AgFEMSpaces.jl
@@ -25,7 +25,7 @@ function AgFEMSpace(
   glue = get_glue(trian_a,Val(D))
   acell_to_bgcell = glue.tface_to_mface
   bgcell_to_acell = glue.mface_to_tface
-  acell_to_bgcellin = lazy_map(Reindex(bgcell_to_bgcellin),acell_to_bgcell)
+  acell_to_bgcellin = collect(lazy_map(Reindex(bgcell_to_bgcellin),acell_to_bgcell))
   acell_to_acellin = collect(lazy_map(Reindex(bgcell_to_acell),acell_to_bgcellin))
   acell_to_gcell = lazy_map(Reindex(bgcell_to_gcell),acell_to_bgcell)
 

diff --git a/src/Distributed/Distributed.jl b/src/Distributed/Distributed.jl
@@ -28,6 +28,7 @@ using GridapEmbedded.MomentFittedQuadratures: MomentFitted
 using Gridap.Geometry: AppendedTriangulation
 using Gridap.Geometry: get_face_to_parent_face
 using Gridap.FESpaces: FESpaceWithLinearConstraints
+using Gridap.FESpaces: _dof_to_DOF, _DOF_to_dof
 using GridapDistributed: DistributedDiscreteModel
 using GridapDistributed: DistributedTriangulation
 using GridapDistributed: DistributedFESpace

diff --git a/src/Distributed/DistributedAgFEM.jl b/src/Distributed/DistributedAgFEM.jl
@@ -564,14 +564,6 @@ function cell_ldof_to_mdof(
   cell_ldof_to_mdof
 end
 
-function _remove_improper_cell_ldofs!(cell_to_ldofs,cell_to_cellin)
-  for cell in 1:length(cell_to_ldofs)
-    cell_to_cellin[cell] != cell || continue
-    cell_to_ldofs[cell] = empty!(cell_to_ldofs[cell])
-  end
-  cell_to_ldofs
-end
-
 function _local_aggregates(cell_to_gcellin,gids::PRange)
   map(_local_aggregates,cell_to_gcellin,global_to_local(gids))
 end

diff --git a/src/Distributed/DistributedDiscretizations.jl b/src/Distributed/DistributedDiscretizations.jl
@@ -144,6 +144,12 @@ function compute_bgcell_to_inoutcut(cutgeo::DistributedEmbeddedDiscretization,ar
   end
 end
 
+function compute_bgfacet_to_inoutcut(cutgeo::DistributedEmbeddedDiscretization,args...)
+  map(local_views(cutgeo)) do cutgeo
+    compute_bgfacet_to_inoutcut(cutgeo,args...)
+  end
+end
+
 function remove_ghost_cells(trian::DistributedTriangulation)
   model = get_background_model(trian)
   gids = get_cell_gids(model)
@@ -220,6 +226,20 @@ function change_bgmodel(
   DistributedEmbeddedDiscretization(cuts,model)
 end
 
+function change_bgmodel(
+  cutgeo::DistributedEmbeddedDiscretization{<:AbstractArray{<:EmbeddedFacetDiscretization}},
+  model::DistributedDiscreteModel,
+  args...)
+
+  D = map(num_dims,local_views(model)) |> PartitionedArrays.getany
+  cuts = _change_bgmodels(cutgeo,model,args...)
+  gids = get_face_gids(model,D-1)
+  ls_to_facet_to_inoutcut = map(c->c.ls_to_facet_to_inoutcut,cuts)
+  _consistent!(ls_to_facet_to_inoutcut,gids)
+  DistributedEmbeddedDiscretization(cuts,model)
+end
+
+
 function _change_bgmodels(
   cutgeo::DistributedEmbeddedDiscretization,
   model::DistributedDiscreteModel,