From c00d69e95591c525dc971681db4699305eb935ad Mon Sep 17 00:00:00 2001 From: Zachary J Wegert <60646897+zjwegert@users.noreply.github.com> Date: Wed, 18 Mar 2026 02:38:49 +1000 Subject: [PATCH 1/6] Update Gridap version in Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 3f33b940..c788fd44 100644 --- a/Project.toml +++ b/Project.toml @@ -24,7 +24,7 @@ AlgebraicMultigrid = "0.5, 0.6" Downloads = "1.4" FileIO = "1.6" FillArrays = "0.11, 0.13, 1" -Gridap = "0.18.3, 0.19" +Gridap = "0.18.3, 0.19, 0.20" GridapDistributed = "0.4" GridapEmbedded = "0.9.4" IterativeSolvers = "0.9" From 5c38bd538d14eca809c2d31f123f360589d70d40 Mon Sep 17 00:00:00 2001 From: Jordi Manyer Date: Sun, 29 Mar 2026 09:59:00 +1100 Subject: [PATCH 2/6] Fixed tests --- NEWS.md | 6 ++++++ test/DistributedTests/Poisson.jl | 20 +++++++++++++++++++- test/Poisson.jl | 19 ++++++++++++++++++- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index f02f40c9..233d9831 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,6 +5,12 @@ 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.3.2] - 2026-03-29 + +### Added + +- Added support for Gridap v0.20. + ## [0.3.1] - 2025-06-13 ### Added diff --git a/test/DistributedTests/Poisson.jl b/test/DistributedTests/Poisson.jl index 7195aa52..eab8aad7 100644 --- a/test/DistributedTests/Poisson.jl +++ b/test/DistributedTests/Poisson.jl @@ -7,6 +7,8 @@ using PartitionedArrays using GridapEmbedded using Test +using Gridap.ReferenceFEs + function main(distribute; np = (1,1,1), nc = (2,2,2), @@ -49,7 +51,23 @@ function main(distribute; n_Γ = get_normal_vector(Γ) degree = 2 dΩ = Measure(Ω,degree) - dΓ = Measure(Γ,degree) + + # Remark: Strictly, the measure on the EmbeddedBoundary + # should exactly integrate the mass term of tensor-product + # shape functions restricted to the planes of the Embedded + # boundary. This is achieved by setting the integration + # degree to 2*order*dim. + # dΓ = Measure(Γ,degree*num_dims(Ω)) + # In many cases, however, we can subintegrate while keeping + # convergence and accuracy. For this problem, here are some + # working examples: + # quad = Quadrature(witherden_vincent,degree+1) + # dΓ = Measure(Γ,quad) # 6 integration points when order = 1 + # quad = Quadrature(strang,degree+1) + # dΓ = Measure(Γ,quad) # 4 integration points when order = 1 + dΓ = Measure(Γ,Quadrature(duffy,degree)) # 4 integration points when order = 1 + # See also https://github.com/gridap/Gridap.jl/issues/1242 + # for more details. # Setup FESpace order = 1 diff --git a/test/Poisson.jl b/test/Poisson.jl index 4314e32c..ff057f5a 100644 --- a/test/Poisson.jl +++ b/test/Poisson.jl @@ -3,6 +3,7 @@ module PoisonTests using STLCutters using Gridap import Gridap: ∇ +using Gridap.ReferenceFEs using GridapEmbedded using Test @@ -56,7 +57,23 @@ n_Γd = get_normal_vector(Γd) order = 1 degree = 2*order dΩ = Measure(Ω,degree) -dΓd = Measure(Γd,degree) + +# Remark: Strictly, the measure on the EmbeddedBoundary +# should exactly integrate the mass term of tensor-product +# shape functions restricted to the planes of the Embedded +# boundary. This is achieved by setting the integration +# degree to 2*order*dim. +# dΓ = Measure(Γ,degree*num_dims(Ω)) +# In many cases, however, we can subintegrate while keeping +# convergence and accuracy. For this problem, here are some +# working examples: +# quad = Quadrature(witherden_vincent,degree+1) +# dΓ = Measure(Γ,quad) # 6 integration points when order = 1 +# quad = Quadrature(strang,degree+1) +# dΓ = Measure(Γ,quad) # 4 integration points when order = 1 +dΓd = Measure(Γd,Quadrature(duffy,degree)) # 4 integration points when order = 1 +# See also https://github.com/gridap/Gridap.jl/issues/1242 +# for more details. vol = sum( ∫(1)*dΩ ) surf = sum( ∫(1)*dΓd ) From 95da916eeb03b070e73f57696f88eb60e21339b8 Mon Sep 17 00:00:00 2001 From: Jordi Manyer Date: Sun, 29 Mar 2026 10:13:43 +1100 Subject: [PATCH 3/6] Minor --- test/DistributedTests/Poisson.jl | 13 ------------- test/PoissonAgFEM.jl | 7 +++++-- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/test/DistributedTests/Poisson.jl b/test/DistributedTests/Poisson.jl index eab8aad7..37180f4f 100644 --- a/test/DistributedTests/Poisson.jl +++ b/test/DistributedTests/Poisson.jl @@ -52,19 +52,6 @@ function main(distribute; degree = 2 dΩ = Measure(Ω,degree) - # Remark: Strictly, the measure on the EmbeddedBoundary - # should exactly integrate the mass term of tensor-product - # shape functions restricted to the planes of the Embedded - # boundary. This is achieved by setting the integration - # degree to 2*order*dim. - # dΓ = Measure(Γ,degree*num_dims(Ω)) - # In many cases, however, we can subintegrate while keeping - # convergence and accuracy. For this problem, here are some - # working examples: - # quad = Quadrature(witherden_vincent,degree+1) - # dΓ = Measure(Γ,quad) # 6 integration points when order = 1 - # quad = Quadrature(strang,degree+1) - # dΓ = Measure(Γ,quad) # 4 integration points when order = 1 dΓ = Measure(Γ,Quadrature(duffy,degree)) # 4 integration points when order = 1 # See also https://github.com/gridap/Gridap.jl/issues/1242 # for more details. diff --git a/test/PoissonAgFEM.jl b/test/PoissonAgFEM.jl index baa8c23d..007df818 100644 --- a/test/PoissonAgFEM.jl +++ b/test/PoissonAgFEM.jl @@ -53,8 +53,11 @@ n_Γd = get_normal_vector(Γd) order = 1 degree = 2*order dΩ = Measure(Ω,degree) -dΓd = Measure(Γd,degree) -#dΓg = Measure(Γg,degree) + +dΓd = Measure(Γd,Quadrature(duffy,degree)) # 4 integration points when order = 1 +# See also https://github.com/gridap/Gridap.jl/issues/1242 +# for more details. + vol = sum( ∫(1)*dΩ ) surf = sum( ∫(1)*dΓd ) From 88e95cd8a5b266239d5417b923dfe0291967aff1 Mon Sep 17 00:00:00 2001 From: Jordi Manyer Date: Sun, 29 Mar 2026 10:14:46 +1100 Subject: [PATCH 4/6] Bump version --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index c788fd44..f618fd0e 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "STLCutters" uuid = "284f087d-c8bb-44c4-af3c-39d0e1f330a5" authors = ["Pere Antoni Martorell", "Large Scale Scientific Computing"] -version = "0.3.1" +version = "0.3.2" [deps] AlgebraicMultigrid = "2169fc97-5a83-5252-b627-83903c6c433c" From 8d93bb6e0972cffdb9d0b5a8906588665c1fb6e2 Mon Sep 17 00:00:00 2001 From: Jordi Manyer Date: Sun, 29 Mar 2026 11:11:16 +1100 Subject: [PATCH 5/6] Minor --- test/PoissonAgFEM.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/test/PoissonAgFEM.jl b/test/PoissonAgFEM.jl index 007df818..ad0be504 100644 --- a/test/PoissonAgFEM.jl +++ b/test/PoissonAgFEM.jl @@ -8,6 +8,7 @@ using Gridap using GridapEmbedded using Test +using Gridap.ReferenceFEs using STLCutters: compute_stl_model using STLCutters: read_stl, merge_nodes, get_bounding_box From b57365eade2d870aba3b6d3cd2037a62a137e562 Mon Sep 17 00:00:00 2001 From: Jordi Manyer Date: Sun, 29 Mar 2026 12:10:54 +1100 Subject: [PATCH 6/6] Minor --- examples/Poisson.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/Poisson.jl b/examples/Poisson.jl index 4cb0795d..37095f95 100644 --- a/examples/Poisson.jl +++ b/examples/Poisson.jl @@ -5,6 +5,7 @@ using AlgebraicMultigrid using STLCutters using Gridap +using Gridap.ReferenceFEs using GridapEmbedded using Test @@ -50,7 +51,7 @@ function main(filename;n=20,δ=0.2,output=nothing) order = 1 degree = 2*order dΩ = Measure(Ω,degree) - dΓd = Measure(Γd,degree) + dΓd = Measure(Γd,Quadrature(duffy,degree)) # Setup FESpace Ω_act = Triangulation(cutgeo,ACTIVE)