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

…sing_distributed_funs
gridap · Jul 5, 2024 · f09ac05 · f09ac05
2 parents 795b713 + e2b054c
commit f09ac05
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -8,7 +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).
-- Background model with remote aggregates is topologicaly conforming. Since PR [#91](https://github.com/gridap/GridapEmbedded.jl/pull/91)
+- 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/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
@@ -480,10 +480,13 @@ function cell_ldof_to_mdof(
 
   DOF_to_mDOFs = space.DOF_to_mDOFs
   cell_ldof_to_dof = space.cell_to_ldof_to_dof
+  n_fdofs = space.n_fdofs
+  n_fmdofs = space.n_fmdofs
   cell_ldof_to_mdof = map(cell_ldof_to_dof) do ldof_to_dof
     map(ldof_to_dof) do dof
-      mDOFs = DOF_to_mDOFs[dof]
-      length(mDOFs) == 1 ? mDOFs[1] : zero(eltype(mDOFs))
+      DOF = _dof_to_DOF(dof,n_fdofs)
+      mDOFs = DOF_to_mDOFs[DOF]
+      length(mDOFs) == 1 ? _DOF_to_dof(mDOFs[1],n_fmdofs) : zero(eltype(mDOFs))
     end
   end
   for (cell,ldof_to_mdof) in enumerate(cell_ldof_to_mdof)
@@ -494,14 +497,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