Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Distributed BoundaryTriangulation + typo on compute_redistribute_weights #105

Merged
merged 4 commits into from
Mar 10, 2025
Merged

Distributed BoundaryTriangulation + typo on compute_redistribute_weights #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
031a931
add support for intersecting distributed BoundaryTriangulation with E…
janmodderman Feb 24, 2025
31d441c
typo compute_redistribute_weights function name
janmodderman Feb 28, 2025
6adb1c4
Merge pull request #100 from gridap/distributed
JordiManyer Mar 5, 2025
84a4256
Merge branch 'gridap:master' into distributed_embedded
janmodderman Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Distributed/Distributed.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ using GridapEmbedded.Interfaces
using GridapEmbedded.Interfaces: Cutter
using GridapEmbedded.Interfaces: ActiveInOrOut
using GridapEmbedded.Interfaces: SubFacetTriangulation
using GridapEmbedded.Interfaces: SubFacetBoundaryTriangulation
using GridapEmbedded.Interfaces: SubCellData
using GridapEmbedded.Interfaces: SubFacetData
using GridapEmbedded.Interfaces: AbstractEmbeddedDiscretization
Expand Down
28 changes: 14 additions & 14 deletions src/Distributed/DistributedDiscretizations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,28 +61,28 @@ end
# when we have the argument `in_or_out`.

function Triangulation(
cutgeo::DistributedEmbeddedDiscretization,in_or_out::ActiveInOrOut,args...
cutgeo::DistributedEmbeddedDiscretization,in_or_out::ActiveInOrOut,args...;kwargs...
)
Triangulation(WithGhost(),cutgeo,in_or_out,args...)
Triangulation(WithGhost(),cutgeo,in_or_out,args...;kwargs...)
end

for TT in (:Triangulation,:SkeletonTriangulation,:BoundaryTriangulation,:EmbeddedBoundary,:GhostSkeleton)
@eval begin
function $TT(cutgeo::DistributedEmbeddedDiscretization,args...)
$TT(NoGhost(),cutgeo,args...)
function $TT(cutgeo::DistributedEmbeddedDiscretization,args...;kwargs...)
$TT(NoGhost(),cutgeo,args...;kwargs...)
end

function $TT(portion,cutgeo::DistributedEmbeddedDiscretization,args...)
function $TT(portion,cutgeo::DistributedEmbeddedDiscretization,args...;kwargs...)
model = get_background_model(cutgeo)
gids = get_cell_gids(model)
trians = map(local_views(cutgeo),partition(gids)) do cutgeo, gids
$TT(portion,gids,cutgeo,args...)
$TT(portion,gids,cutgeo,args...;kwargs...)
end
DistributedTriangulation(trians,model)
end

function $TT(portion,gids::AbstractLocalIndices,cutgeo::AbstractEmbeddedDiscretization,args...)
trian = $TT(cutgeo,args...)
function $TT(portion,gids::AbstractLocalIndices,cutgeo::AbstractEmbeddedDiscretization,args...;kwargs...)
trian = $TT(cutgeo,args...;kwargs...)
filter_cells_when_needed(portion,gids,trian)
end
end
Expand All @@ -95,7 +95,7 @@ function remove_ghost_cells(trian::AppendedTriangulation,gids)
lazy_append(a,b)
end

function remove_ghost_cells(trian::SubFacetTriangulation{Df,Dc},gids) where {Df,Dc}
function remove_ghost_cells(trian::Union{SubFacetTriangulation{Df,Dc},SubFacetBoundaryTriangulation{Df,Dc}},gids) where {Df,Dc}
glue = get_glue(trian,Val{Dc}())
remove_ghost_cells(glue,trian,gids)
end
Expand Down Expand Up @@ -191,23 +191,23 @@ end

# AMR

function compute_redistribute_wights(
function compute_redistribute_weights(
cut::DistributedEmbeddedDiscretization,
args...)

geo = get_geometry(cut)
compute_redistribute_wights(cut,geo,args...)
compute_redistribute_weights(cut,geo,args...)
end

function compute_redistribute_wights(
function compute_redistribute_weights(
cut::DistributedEmbeddedDiscretization,
geo::CSG.Geometry,
args...)

compute_redistribute_wights(compute_bgcell_to_inoutcut(cut,geo),args...)
compute_redistribute_weights(compute_bgcell_to_inoutcut(cut,geo),args...)
end

function compute_redistribute_wights(cell_to_inoutcut,in_or_out=IN)
function compute_redistribute_weights(cell_to_inoutcut,in_or_out=IN)
map(cell_to_inoutcut) do cell_to_inoutcut
map(cell_to_inoutcut) do inoutcut
Int( inoutcut ∈ (CUT,in_or_out) )
Expand Down