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

Missing distributed functions #92

Merged
merged 6 commits into from
Jul 8, 2024
Merged

Missing distributed functions #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
00ca286
collect lazy map to avoid type errors
pmartorell Jul 4, 2024
2019553
Merge branch 'distributed_agfem_failing_case' of github.com:pmartorel…
pmartorell Jul 4, 2024
01b6e48
add missing distributed functions
pmartorell Jul 4, 2024
c3147f0
edit NEWS
pmartorell Jul 5, 2024
795b713
edit license
pmartorell Jul 5, 2024
f09ac05
Merge branch 'master' of github.com:gridap/GridapEmbedded.jl into mis…
pmartorell Jul 5, 2024
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
4 changes: 2 additions & 2 deletions LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GridapEmbedded.jl Copyright and License
==

Copyright (c) 2020 by [Francesc Verdugo](mailto:f.verdugo.rojano@vu.nl), [Eric Neiva](mailto:eric.neiva@college-de-france.fr) and [Santiago Badia](mailto:santiago.badia@monash.edu).
Copyright (c) 2020 by [Francesc Verdugo](mailto:f.verdugo.rojano@vu.nl), [Eric Neiva](mailto:eric.neiva@college-de-france.fr), [Pere Antoni Martorell](mailto:pere.antoni.martorell@upc.edu) and [Santiago Badia](mailto:santiago.badia@monash.edu).

GridapEmbedded.jl is licensed under the MIT Expat License

Expand Down Expand Up @@ -106,4 +106,4 @@ By making a contribution to this project, I certify that:
Contact
==

Please, contact the project administrators, [Francesc Verdugo](mailto:f.verdugo.rojano@vu.nl), [Eric Neiva](mailto:eric.neiva@college-de-france.fr) and [Santiago Badia](mailto:santiago.badia@monash.edu), for further questions about licenses and terms of use.
Please, contact the project administrators, [Francesc Verdugo](mailto:f.verdugo.rojano@vu.nl), [Eric Neiva](mailto:eric.neiva@college-de-france.fr), [Pere Antoni Martorell](mailto:pere.antoni.martorell@upc.edu) and [Santiago Badia](mailto:santiago.badia@monash.edu), for further questions about licenses and terms of use.
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "GridapEmbedded"
uuid = "8838a6a3-0006-4405-b874-385995508d5d"
authors = ["Francesc Verdugo <f.verdugo.rojano@vu.nl>", "Eric Neiva <eric.neiva@college-de-france.fr>", "Pere Antoni Martorell <pmartorell@cimne.upc.edu>", "Santiago Badia <santiago.badia@monash.edu>"]
authors = ["Francesc Verdugo <f.verdugo.rojano@vu.nl>", "Eric Neiva <eric.neiva@college-de-france.fr>", "Pere Antoni Martorell <pere.antoni.martorell@upc.edu>", "Santiago Badia <santiago.badia@monash.edu>"]
version = "0.9.3"

[deps]
Expand Down
2 changes: 1 addition & 1 deletion src/AgFEM/AgFEMSpaces.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function AgFEMSpace(
glue = get_glue(trian_a,Val(D))
acell_to_bgcell = glue.tface_to_mface
bgcell_to_acell = glue.mface_to_tface
acell_to_bgcellin = lazy_map(Reindex(bgcell_to_bgcellin),acell_to_bgcell)
acell_to_bgcellin = collect(lazy_map(Reindex(bgcell_to_bgcellin),acell_to_bgcell))
acell_to_acellin = collect(lazy_map(Reindex(bgcell_to_acell),acell_to_bgcellin))
acell_to_gcell = lazy_map(Reindex(bgcell_to_gcell),acell_to_bgcell)

Expand Down
20 changes: 20 additions & 0 deletions src/Distributed/DistributedDiscretizations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@ function compute_bgcell_to_inoutcut(cutgeo::DistributedEmbeddedDiscretization,ar
end
end

function compute_bgfacet_to_inoutcut(cutgeo::DistributedEmbeddedDiscretization,args...)
map(local_views(cutgeo)) do cutgeo
compute_bgfacet_to_inoutcut(cutgeo,args...)
end
end

function remove_ghost_cells(trian::DistributedTriangulation)
model = get_background_model(trian)
gids = get_cell_gids(model)
Expand Down Expand Up @@ -220,6 +226,20 @@ function change_bgmodel(
DistributedEmbeddedDiscretization(cuts,model)
end

function change_bgmodel(
cutgeo::DistributedEmbeddedDiscretization{<:AbstractArray{<:EmbeddedFacetDiscretization}},
model::DistributedDiscreteModel,
args...)

D = map(num_dims,local_views(model)) |> PartitionedArrays.getany
cuts = _change_bgmodels(cutgeo,model,args...)
gids = get_face_gids(model,D-1)
ls_to_facet_to_inoutcut = map(c->c.ls_to_facet_to_inoutcut,cuts)
_consistent!(ls_to_facet_to_inoutcut,gids)
DistributedEmbeddedDiscretization(cuts,model)
end


function _change_bgmodels(
cutgeo::DistributedEmbeddedDiscretization,
model::DistributedDiscreteModel,
Expand Down
Loading