From 00ca286ed8197c08ab251c7931c21ef7dcc81d27 Mon Sep 17 00:00:00 2001 From: Pere Antoni Martorell Date: Thu, 4 Jul 2024 10:43:05 +0200 Subject: [PATCH 1/4] collect lazy map to avoid type errors --- src/AgFEM/AgFEMSpaces.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AgFEM/AgFEMSpaces.jl b/src/AgFEM/AgFEMSpaces.jl index 4c0f0c4..df094a6 100644 --- a/src/AgFEM/AgFEMSpaces.jl +++ b/src/AgFEM/AgFEMSpaces.jl @@ -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) From 01b6e48fff0decf1d79e76ac8ffdff6e3f7ad561 Mon Sep 17 00:00:00 2001 From: Pere Antoni Martorell Date: Thu, 4 Jul 2024 18:35:16 +0200 Subject: [PATCH 2/4] add missing distributed functions --- src/Distributed/DistributedDiscretizations.jl | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/Distributed/DistributedDiscretizations.jl b/src/Distributed/DistributedDiscretizations.jl index 850eb18..6e42bc6 100644 --- a/src/Distributed/DistributedDiscretizations.jl +++ b/src/Distributed/DistributedDiscretizations.jl @@ -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) @@ -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, From c3147f08126459a416ca379276446afd8ca96e22 Mon Sep 17 00:00:00 2001 From: Pere Antoni Martorell Date: Fri, 5 Jul 2024 18:28:41 +0200 Subject: [PATCH 3/4] edit NEWS --- NEWS.md | 1 + Project.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index d1852b9..eb34586 100644 --- a/NEWS.md +++ b/NEWS.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Unused `name` keywork argument in `square` and `quadrilateral` analytical geometries. Since PR [#86](https://github.com/gridap/GridapEmbedded.jl/pull/86). +- Background model with remote aggregates is topologicaly conforming. Since PR [#91](https://github.com/gridap/GridapEmbedded.jl/pull/91) ## [0.9.3] - 2024-05-20 diff --git a/Project.toml b/Project.toml index cc9a290..0b74b84 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "GridapEmbedded" uuid = "8838a6a3-0006-4405-b874-385995508d5d" -authors = ["Francesc Verdugo ", "Eric Neiva ", "Pere Antoni Martorell ", "Santiago Badia "] +authors = ["Francesc Verdugo ", "Eric Neiva ", "Pere Antoni Martorell ", "Santiago Badia "] version = "0.9.3" [deps] From 795b7133629896215cb1069831bc20dec527b5ae Mon Sep 17 00:00:00 2001 From: Pere Antoni Martorell Date: Fri, 5 Jul 2024 18:42:34 +0200 Subject: [PATCH 4/4] edit license --- LICENSE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 652d476..1810519 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -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 @@ -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.