Revert "Revert "The FESpace constructor detects now whether the octre…

…e mesh is conforming or not."" This reverts commit bce4015.
gridap · Dec 6, 2023 · c605dfa · c605dfa
1 parent 46ec925
commit c605dfa
Showing 1 changed file with 33 additions and 26 deletions.
diff --git a/src/FESpaces.jl b/src/FESpaces.jl
@@ -889,37 +889,45 @@ function fe_space_with_linear_constraints_cell_dof_ids(Uc::FESpaceWithLinearCons
     Gridap.Arrays.Table(Uc_cell_dof_ids_data, U_cell_dof_ids.ptrs)
 end
 
+function _is_conforming(model::OctreeDistributedDiscreteModel)
+    is_local_conforming=map(model.non_conforming_glue) do ncglue 
+         all(x->x==0, ncglue.num_hanging_faces)
+    end 
+    reduction(&,is_local_conforming,init=true,destination=:all).item_ref[]
+end 
+
 function _add_constraints(model::GridapDistributed.DistributedDiscreteModel{Dc},
                           reffe,
                           spaces_wo_constraints;
                           conformity=nothing,
                           kwargs...) where {Dc}
-    if (conformity==nothing || conformity!=:L2)
-      ref_constraints = _build_constraint_coefficients_matrix_in_ref_space(Dc, reffe)
-
-      face_subface_ldof_to_cell_ldof = Vector{Vector{Vector{Vector{Int32}}}}(undef, Dc-1)
-      face_subface_ldof_to_cell_ldof[Dc-1] = _generate_face_subface_ldof_to_cell_ldof(Dc-1, Dc, reffe)
-      if (Dc == 3)
-       face_subface_ldof_to_cell_ldof[1] =
-         _generate_face_subface_ldof_to_cell_ldof(1, Dc, reffe)
-      end
-      sDOF_to_dof, sDOF_to_dofs, sDOF_to_coeffs =
-          generate_constraints(model, spaces_wo_constraints, reffe, ref_constraints, face_subface_ldof_to_cell_ldof)
-      spaces_w_constraints = map(spaces_wo_constraints,
-         sDOF_to_dof,
-         sDOF_to_dofs,
-         sDOF_to_coeffs) do V, sDOF_to_dof, sDOF_to_dofs, sDOF_to_coeffs
-         @debug "[$(MPI.Comm_rank(MPI.COMM_WORLD))]: fe_space_wo_constraints_cell_dof_ids=$(get_cell_dof_ids(V))"
-         Vc = FESpaceWithLinearConstraints(sDOF_to_dof, sDOF_to_dofs, sDOF_to_coeffs, V)
-      end
-      local_cell_dof_ids = map(spaces_w_constraints,sDOF_to_dof) do Vc,sDOF_to_dof
-        result = fe_space_with_linear_constraints_cell_dof_ids(Vc,sDOF_to_dof)
-        @debug "[$(MPI.Comm_rank(MPI.COMM_WORLD))]: fe_space_with_linear_constraints_cell_dof_ids=$(result)"
-        result
-      end
+
+    if (_is_conforming(model) || conformity==:L2 )
+        spaces_w_constraints=spaces_wo_constraints
+        local_cell_dof_ids=map(get_cell_dof_ids,spaces_w_constraints)
     else 
-      spaces_w_constraints=spaces_wo_constraints
-      local_cell_dof_ids=map(get_cell_dof_ids,spaces_w_constraints)
+        @assert conformity==nothing || conformity!=:L2
+        ref_constraints = _build_constraint_coefficients_matrix_in_ref_space(Dc, reffe)
+        face_subface_ldof_to_cell_ldof = Vector{Vector{Vector{Vector{Int32}}}}(undef, Dc-1)
+        face_subface_ldof_to_cell_ldof[Dc-1] = _generate_face_subface_ldof_to_cell_ldof(Dc-1, Dc, reffe)
+        if (Dc == 3)
+            face_subface_ldof_to_cell_ldof[1] =
+                _generate_face_subface_ldof_to_cell_ldof(1, Dc, reffe)
+        end
+        sDOF_to_dof, sDOF_to_dofs, sDOF_to_coeffs =
+            generate_constraints(model, spaces_wo_constraints, reffe, ref_constraints, face_subface_ldof_to_cell_ldof)
+        spaces_w_constraints = map(spaces_wo_constraints,
+            sDOF_to_dof,
+            sDOF_to_dofs,
+            sDOF_to_coeffs) do V, sDOF_to_dof, sDOF_to_dofs, sDOF_to_coeffs
+            @debug "[$(MPI.Comm_rank(MPI.COMM_WORLD))]: fe_space_wo_constraints_cell_dof_ids=$(get_cell_dof_ids(V))"
+            Vc = FESpaceWithLinearConstraints(sDOF_to_dof, sDOF_to_dofs, sDOF_to_coeffs, V)
+        end
+        local_cell_dof_ids = map(spaces_w_constraints,sDOF_to_dof) do Vc,sDOF_to_dof
+            result = fe_space_with_linear_constraints_cell_dof_ids(Vc,sDOF_to_dof)
+            @debug "[$(MPI.Comm_rank(MPI.COMM_WORLD))]: fe_space_with_linear_constraints_cell_dof_ids=$(result)"
+            result
+        end
     end
     nldofs = map(num_free_dofs,spaces_w_constraints)
     cell_gids = get_cell_gids(model)
@@ -932,7 +940,6 @@ function _add_constraints(model::GridapDistributed.DistributedDiscreteModel{Dc},
     GridapDistributed.DistributedSingleFieldFESpace(spaces_w_constraints,gids,vector_type)
 end
 
-
 # Generates a new DistributedSingleFieldFESpace composed 
 # by local FE spaces with linear multipoint constraints added
 function Gridap.FESpaces.FESpace(model::OctreeDistributedDiscreteModel{Dc},