Minor

Author: JordiManyer

src/FESpaces.jl

@@ -880,6 +880,8 @@ function _compute_new_distributed_fixedval(
   return c
 end
 
+# Constant FESpace
+
 """
     ConstantFESpace(
       model::DistributedDiscreteModel; 
@@ -927,3 +929,24 @@ function FESpaces.ConstantFESpace(
   vector_type = _find_vector_type(spaces,gids)
   return DistributedSingleFieldFESpace(spaces,gids,trian,vector_type)
 end
+
+# Polytopal FESpaces
+
+function FESpaces.PolytopalFESpace(
+  _trian::DistributedTriangulation,args...;kwargs...
+)
+  trian = add_ghost_cells(_trian)
+  spaces = map(local_views(trian)) do t
+    FESpaces.PolytopalFESpace(t,args...;kwargs...)
+  end
+  gids = generate_gids(trian,spaces)
+  vector_type = _find_vector_type(spaces,gids)
+  return DistributedSingleFieldFESpace(spaces,gids,trian,vector_type)
+end
+
+function FESpaces.PolytopalFESpace(
+  model::DistributedDiscreteModel,args...;kwargs...
+)
+  trian = Triangulation(with_ghost,model)
+  FESpaces.PolytopalFESpace(trian,args...;kwargs...)
+end

src/MultiField.jl

@@ -90,6 +90,7 @@ MultiField.MultiFieldStyle(a::DistributedMultiFieldFESpace) = MultiField.MultiFi
 
 local_views(a::DistributedMultiFieldFESpace) = a.part_fe_space
 MultiField.num_fields(m::DistributedMultiFieldFESpace) = length(m.field_fe_space)
+MultiField.num_fields(m::DistributedFESpace) = 1 # Default for single-field
 Base.iterate(m::DistributedMultiFieldFESpace) = iterate(m.field_fe_space)
 Base.iterate(m::DistributedMultiFieldFESpace,state) = iterate(m.field_fe_space,state)
 Base.getindex(m::DistributedMultiFieldFESpace,field_id::Integer) = m.field_fe_space[field_id]
@@ -103,6 +104,24 @@ function FESpaces.get_free_dof_ids(fs::DistributedMultiFieldFESpace)
   fs.gids
 end
 
+function BlockArrays.blocks(f::DistributedMultiFieldFESpace{<:BlockMultiFieldStyle})
+  block_gids   = blocks(get_free_dof_ids(f))
+  block_ranges = MultiField.get_block_ranges(MultiField.get_block_parameters(MultiFieldStyle(f))...)
+  block_spaces = map(block_ranges,block_gids) do range, gids
+    if (length(range) == 1) 
+      space = f[range[1]]
+    else
+      global_sf_spaces = f.field_fe_space[range]
+      local_sf_spaces  = to_parray_of_arrays(map(local_views,global_sf_spaces))
+      local_mf_spaces  = map(MultiFieldFESpace,local_sf_spaces)
+      vector_type = _find_vector_type(local_mf_spaces,gids)
+      space = DistributedMultiFieldFESpace(global_sf_spaces,local_mf_spaces,gids,vector_type)
+    end
+    space
+  end
+  return block_spaces
+end
+
 function MultiField.restrict_to_field(
   f::DistributedMultiFieldFESpace,free_values::AbstractVector,field::Integer
 )

src/PatchAssemblers.jl

@@ -45,6 +45,10 @@ function Geometry.PatchTopology(model::DistributedDiscreteModel;kwargs...)
   Geometry.PatchTopology(ReferenceFE{D},model;kwargs...)
 end
 
+function Geometry.get_patch_cells(ptopo::DistributedPatchTopology)
+  map(Geometry.get_patch_cells,local_views(ptopo))
+end
+
 # PatchTriangulation
 
 function Geometry.PatchTriangulation(model::DistributedDiscreteModel,ptopo::DistributedPatchTopology;kwargs...)
@@ -127,13 +131,19 @@ function Arrays.evaluate!(
 )
   n_fields = num_fields(v)
   mf_fields = map(evaluate,local_views(k),local_views(v))
-  sf_fields = map(1:n_fields) do field 
-    sf_fields = map(f -> f[field], mf_fields)
-    trians = map(get_triangulation,sf_fields)
+  if eltype(mf_fields) <: MultiField.MultiFieldCellField
+    sf_fields = map(1:n_fields) do field 
+      sf_fields = map(f -> f[field], mf_fields)
+      trians = map(get_triangulation,sf_fields)
+      trian = DistributedTriangulation(trians,k.model)
+      DistributedCellField(sf_fields,trian)
+    end
+    return DistributedMultiFieldCellField(sf_fields, mf_fields)
+  else
+    trians = map(get_triangulation,mf_fields)
     trian = DistributedTriangulation(trians,k.model)
-    DistributedCellField(sf_fields,trian)
+    return DistributedCellField(mf_fields,trian)
   end
-  return DistributedMultiFieldCellField(sf_fields, mf_fields)
 end
 
 # Patch assembly 
@@ -231,6 +241,35 @@ end
 
 # merge_assembly_data
 
+function merge_assembly_data(data::AbstractArray...)
+  map(FESpaces.merge_assembly_data,data...)
+end
+
 function FESpaces.merge_assembly_matvec_data(data::AbstractArray...)
   map(FESpaces.merge_assembly_matvec_data,data...)
 end
+
+
+function FESpaces.collect_and_merge_cell_matrix(assem::DistributedPatchAssembler,contributions...)
+  data = ()
+  for c in contributions
+    data = (data..., FESpaces.collect_patch_cell_matrix(assem,c...))
+  end
+  FESpaces.merge_assembly_data(data...)
+end
+
+function FESpaces.collect_and_merge_cell_vector(assem::DistributedPatchAssembler,contributions...)
+  data = ()
+  for c in contributions
+    data = (data..., FESpaces.collect_patch_cell_vector(assem,c...))
+  end
+  FESpaces.merge_assembly_data(data...)
+end
+
+function FESpaces.collect_and_merge_cell_matrix_and_vector(assem::DistributedPatchAssembler,contributions...)
+  data = ()
+  for c in contributions
+    data = (data..., FESpaces.collect_patch_cell_matrix_and_vector(assem,c...))
+  end
+  FESpaces.merge_assembly_matvec_data(data...)
+end