From 6c115b91b73f9a6713f78235ebbd82cbe78b266b Mon Sep 17 00:00:00 2001 From: Pere Antoni Martorell Date: Wed, 10 Jul 2024 14:51:17 +0200 Subject: [PATCH 1/4] test distributed aggregates --- Project.toml | 4 ++-- test/DistributedTests/Poisson.jl | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index 2333a51d..7d136c89 100644 --- a/Project.toml +++ b/Project.toml @@ -25,8 +25,8 @@ Downloads = "1.4" FileIO = "1.6" FillArrays = "0.11, 0.13, 1" Gridap = "0.18" -GridapDistributed = "0.3, 0.4" -GridapEmbedded = "0.9.2" +GridapDistributed = "0.4" +GridapEmbedded = "0.9.4" IterativeSolvers = "0.9" MPI = "0.20" MeshIO = "0.4" diff --git a/test/DistributedTests/Poisson.jl b/test/DistributedTests/Poisson.jl index 82805f7b..8b7816a5 100644 --- a/test/DistributedTests/Poisson.jl +++ b/test/DistributedTests/Poisson.jl @@ -42,6 +42,8 @@ function main(distribute; cutter = STLCutter(;tolfactor) cutgeo = cut(cutter,bgmodel,geo) + model,cutgeo,aggregates = aggregate(AggregateAllCutCells(),cutgeo) + Ω = Triangulation(cutgeo,PHYSICAL_IN) Γ = EmbeddedBoundary(cutgeo) n_Γ = get_normal_vector(Γ) @@ -52,7 +54,8 @@ function main(distribute; # Setup FESpace order = 1 Ω_act = Triangulation(cutgeo,ACTIVE) - V = TestFESpace(Ω_act,ReferenceFE(lagrangian,Float64,order),conformity=:H1) + Vstd = TestFESpace(Ω_act,ReferenceFE(lagrangian,Float64,order),conformity=:H1) + V = AggFESpace(model,Vstd,aggregates) U = TrialFESpace(V) # Weak form From e15b73e175021b162565d636664150aa83ebadda Mon Sep 17 00:00:00 2001 From: Pere Antoni Martorell Date: Wed, 10 Jul 2024 14:51:56 +0200 Subject: [PATCH 2/4] edit news --- NEWS.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index e6abf995..d567d6c8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,12 +5,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.2.1] - 2024-05-02 +## [0.2.1] - 2024-07-10 ### Added - Distributed cutter (`cut()`) using `GridapDistributed` and `PartitionedArrays` since [#28](https://github.com/gridap/STLCutters.jl/pull/28). +- New documentation pages with examples of usage. +### Changed + +- `compute_cell_to_facets` is more efficient for non-Cartesian meshes. It exploits AABB intersections. ## [0.2.0] - 2024-02-15 From 514c56f5c66a8d53cc04ba54781989ab16fe71cc Mon Sep 17 00:00:00 2001 From: Pere Antoni Martorell Date: Thu, 11 Jul 2024 12:35:08 +0200 Subject: [PATCH 3/4] fix testing --- src/Distributed.jl | 1 - test/DistributedTests/Poisson.jl | 2 +- test/DistributedTests/sequential/runtests.jl | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Distributed.jl b/src/Distributed.jl index 3f1d9e19..e082dd28 100644 --- a/src/Distributed.jl +++ b/src/Distributed.jl @@ -71,7 +71,6 @@ function cut(cutter::STLCutter,bgmodel::DistributedDiscreteModel,args...) icells, cell_to_facets) do bgmodel,facet_gids,icells,cell_to_facets - # icells = compute_interior_cells(bgmodel,cell_gids) ownmodel = DiscreteModelPortion(bgmodel,icells) cell_to_pcell = get_cell_to_parent_cell(ownmodel) facet_to_pfacet = get_face_to_parent_face(ownmodel,D-1) diff --git a/test/DistributedTests/Poisson.jl b/test/DistributedTests/Poisson.jl index 8b7816a5..768ad5bf 100644 --- a/test/DistributedTests/Poisson.jl +++ b/test/DistributedTests/Poisson.jl @@ -55,7 +55,7 @@ function main(distribute; order = 1 Ω_act = Triangulation(cutgeo,ACTIVE) Vstd = TestFESpace(Ω_act,ReferenceFE(lagrangian,Float64,order),conformity=:H1) - V = AggFESpace(model,Vstd,aggregates) + V = AgFEMSpace(model,Vstd,aggregates) U = TrialFESpace(V) # Weak form diff --git a/test/DistributedTests/sequential/runtests.jl b/test/DistributedTests/sequential/runtests.jl index 8edcd0ad..51751035 100644 --- a/test/DistributedTests/sequential/runtests.jl +++ b/test/DistributedTests/sequential/runtests.jl @@ -4,4 +4,6 @@ using Test @time @testset "CutterSeq" begin include("CutterTests.jl") end +@time @testset "PoissonSeq" begin include("PoissonTests.jl") end + end From 64245b36292d05ac4daed9de2007bd45a1e38608 Mon Sep 17 00:00:00 2001 From: Pere Antoni Martorell Date: Thu, 11 Jul 2024 12:45:27 +0200 Subject: [PATCH 4/4] edit news --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index d567d6c8..5ca2364e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.2.1] - 2024-07-10 +## [0.2.1] - 2024-07-11 ### Added