From dceb81961c424455467e8f5041697d828865d59a Mon Sep 17 00:00:00 2001 From: JordiManyer Date: Thu, 31 Aug 2023 14:28:28 +1000 Subject: [PATCH] own_and_ghost renamed to split_own_and_ghost --- src/FESpaces.jl | 12 ++++++------ src/MultiField.jl | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/FESpaces.jl b/src/FESpaces.jl index f465eaaa..21aedf42 100644 --- a/src/FESpaces.jl +++ b/src/FESpaces.jl @@ -462,16 +462,16 @@ end # Factories -function FESpaces.FESpace(model::DistributedDiscreteModel,reffe;own_and_ghost=false,kwargs...) +function FESpaces.FESpace(model::DistributedDiscreteModel,reffe;split_own_and_ghost=false,kwargs...) spaces = map(local_views(model)) do m FESpace(m,reffe;kwargs...) end gids = generate_gids(model,spaces) - vector_type = _find_vector_type(spaces,gids;own_and_ghost=own_and_ghost) + vector_type = _find_vector_type(spaces,gids;split_own_and_ghost=split_own_and_ghost) DistributedSingleFieldFESpace(spaces,gids,vector_type) end -function FESpaces.FESpace(_trian::DistributedTriangulation,reffe;own_and_ghost=false,kwargs...) +function FESpaces.FESpace(_trian::DistributedTriangulation,reffe;split_own_and_ghost=false,kwargs...) trian = add_ghost_cells(_trian) trian_gids = generate_cell_gids(trian) spaces = map(trian.trians) do t @@ -480,15 +480,15 @@ function FESpaces.FESpace(_trian::DistributedTriangulation,reffe;own_and_ghost=f cell_to_ldofs = map(get_cell_dof_ids,spaces) nldofs = map(num_free_dofs,spaces) gids = generate_gids(trian_gids,cell_to_ldofs,nldofs) - vector_type = _find_vector_type(spaces,gids;own_and_ghost=own_and_ghost) + vector_type = _find_vector_type(spaces,gids;split_own_and_ghost=split_own_and_ghost) DistributedSingleFieldFESpace(spaces,gids,vector_type) end -function _find_vector_type(spaces,gids;own_and_ghost=false) +function _find_vector_type(spaces,gids;split_own_and_ghost=false) local_vector_type = get_vector_type(PartitionedArrays.getany(spaces)) Tv = eltype(local_vector_type) T = Vector{Tv} - if own_and_ghost + if split_own_and_ghost T = OwnAndGhostVectors{T} end if isa(gids,PRange) diff --git a/src/MultiField.jl b/src/MultiField.jl index 5b65c765..ed33e659 100644 --- a/src/MultiField.jl +++ b/src/MultiField.jl @@ -236,7 +236,7 @@ end # Factory function MultiField.MultiFieldFESpace( - f_dspace::Vector{<:DistributedSingleFieldFESpace};own_and_ghost=false, kwargs...) + f_dspace::Vector{<:DistributedSingleFieldFESpace};split_own_and_ghost=false, kwargs...) f_p_space = map(local_views,f_dspace) v(x...) = collect(x) @@ -244,7 +244,7 @@ function MultiField.MultiFieldFESpace( p_mspace = map(f->MultiFieldFESpace(f;kwargs...),p_f_space) style = PartitionedArrays.getany(map(MultiFieldStyle,p_mspace)) gids = generate_multi_field_gids(style,f_dspace,p_mspace) - vector_type = _find_vector_type(p_mspace,gids;own_and_ghost=own_and_ghost) + vector_type = _find_vector_type(p_mspace,gids;split_own_and_ghost=split_own_and_ghost) DistributedMultiFieldFESpace(f_dspace,p_mspace,gids,vector_type) end