Skip to content

Commit 3b70225

Browse files
amboschmanamboschman
authored
Merge pull request #113 from gridap/master
merge master
2 parents d3d6d47 + 3d9a396 commit 3b70225

File tree

62 files changed

+3676
-466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+3676
-466
lines changed

‎.github/dependabot.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
2+
version: 2
3+
updates:
4+
- package-ecosystem: "github-actions"
5+
directory: "/" # Location of package manifests
6+
schedule:
7+
interval: "monthly"

‎.github/workflows/ci.yml‎

Lines changed: 16 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,22 @@ jobs:
88
fail-fast: false
99
matrix:
1010
version:
11-
- '1.8'
11+
- '1.10'
1212
os:
1313
- ubuntu-latest
1414
arch:
1515
- x64
1616
steps:
17-
- uses: actions/checkout@v2
18-
- uses: julia-actions/setup-julia@v1
17+
- uses: actions/checkout@v4
18+
- uses: julia-actions/setup-julia@v2
1919
with:
2020
version: ${{ matrix.version }}
2121
arch: ${{ matrix.arch }}
22-
- uses: actions/cache@v1
23-
env:
24-
cache-name: cache-artifacts
25-
with:
26-
path: ~/.julia/artifacts
27-
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
28-
restore-keys: |
29-
${{ runner.os }}-test-${{ env.cache-name }}-
30-
${{ runner.os }}-test-
31-
${{ runner.os }}-
22+
- uses: julia-actions/cache@v2
3223
- uses: julia-actions/julia-buildpkg@v1
3324
- uses: julia-actions/julia-runtest@v1
3425
- uses: julia-actions/julia-processcoverage@v1
35-
- uses: codecov/codecov-action@v1
26+
- uses: codecov/codecov-action@v5
3627
with:
3728
file: lcov.info
3829
drivers:
@@ -42,27 +33,18 @@ jobs:
4233
fail-fast: false
4334
matrix:
4435
version:
45-
- '1.8'
36+
- '1.10'
4637
os:
4738
- ubuntu-latest
4839
arch:
4940
- x64
5041
steps:
51-
- uses: actions/checkout@v2
52-
- uses: julia-actions/setup-julia@v1
42+
- uses: actions/checkout@v4
43+
- uses: julia-actions/setup-julia@v2
5344
with:
5445
version: ${{ matrix.version }}
5546
arch: ${{ matrix.arch }}
56-
- uses: actions/cache@v1
57-
env:
58-
cache-name: cache-artifacts
59-
with:
60-
path: ~/.julia/artifacts
61-
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
62-
restore-keys: |
63-
${{ runner.os }}-test-${{ env.cache-name }}-
64-
${{ runner.os }}-test-
65-
${{ runner.os }}-
47+
- uses: julia-actions/cache@v2
6648
- uses: julia-actions/julia-buildpkg@v1
6749
- run: |
6850
julia --color=yes --project=. --check-bounds=yes --depwarn=error -e '
@@ -77,27 +59,18 @@ jobs:
7759
fail-fast: false
7860
matrix:
7961
version:
80-
- '1.8'
62+
- '1.10'
8163
os:
8264
- ubuntu-latest
8365
arch:
8466
- x64
8567
steps:
86-
- uses: actions/checkout@v2
87-
- uses: julia-actions/setup-julia@v1
68+
- uses: actions/checkout@v4
69+
- uses: julia-actions/setup-julia@v2
8870
with:
8971
version: ${{ matrix.version }}
9072
arch: ${{ matrix.arch }}
91-
- uses: actions/cache@v1
92-
env:
93-
cache-name: cache-artifacts
94-
with:
95-
path: ~/.julia/artifacts
96-
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
97-
restore-keys: |
98-
${{ runner.os }}-test-${{ env.cache-name }}-
99-
${{ runner.os }}-test-
100-
${{ runner.os }}-
73+
- uses: julia-actions/cache@v2
10174
- uses: julia-actions/julia-buildpkg@v1
10275
- run: |
10376
julia --color=yes --project=. --check-bounds=yes --depwarn=error -e '
@@ -109,10 +82,10 @@ jobs:
10982
name: Documentation
11083
runs-on: ubuntu-latest
11184
steps:
112-
- uses: actions/checkout@v2
113-
- uses: julia-actions/setup-julia@v1
85+
- uses: actions/checkout@v4
86+
- uses: julia-actions/setup-julia@v2
11487
with:
115-
version: '1.8'
88+
version: '1.10'
11689
- run: |
11790
julia --project=docs -e '
11891
using Pkg

‎.github/workflows/ci_x86.yml‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,17 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
version:
17-
- '1.8'
17+
- '1.10'
1818
os:
1919
- ubuntu-latest
2020
arch:
2121
- x86
2222
steps:
23-
- uses: actions/checkout@v2
24-
- uses: julia-actions/setup-julia@v1
23+
- uses: actions/checkout@v4
24+
- uses: julia-actions/setup-julia@v2
2525
with:
2626
version: ${{ matrix.version }}
2727
arch: ${{ matrix.arch }}
28-
- uses: actions/cache@v1
29-
env:
30-
cache-name: cache-artifacts
31-
with:
32-
path: ~/.julia/artifacts
33-
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
34-
restore-keys: |
35-
${{ runner.os }}-test-${{ env.cache-name }}-
36-
${{ runner.os }}-test-
37-
${{ runner.os }}-
28+
- uses: julia-actions/cache@v2
3829
- uses: julia-actions/julia-buildpkg@v1
3930
- uses: julia-actions/julia-runtest@v1

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
/docs/build/
77
/docs/site/
88
Manifest.toml
9+
LocalPreferences.toml
910
.vscode/
1011
*.swp

‎NEWS.md‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,44 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## [Unreleased]
7+
## [0.9.8] - 2025-7-10
8+
9+
### Added
10+
11+
- Added missing update_trian! method for MultiField. Since PR[#112](https://github.com/gridap/GridapEmbedded.jl/pull/112).
12+
13+
### Fixed
14+
15+
- Fixed failed precompilation due to Gridap v0.19.2. Since PR[#112](https://github.com/gridap/GridapEmbedded.jl/pull/112).
16+
17+
## [0.9.7] - 2025-6-11
18+
19+
### Added
20+
21+
- Added support for Gridap v0.19. Since PR[#110](https://github.com/gridap/GridapEmbedded.jl/pull/110).
22+
23+
## [0.9.6] - 2025-04-19
24+
25+
### Added
26+
27+
- Added support for distributed level-set geometries. Since PR[#99](https://github.com/gridap/GridapEmbedded.jl/pull/99).
28+
- Refactored the distributed code to allow for ghosted/unghosted geometries and triangulations. Since PR[#100](https://github.com/gridap/GridapEmbedded.jl/pull/100).
29+
- Implemented geometrical derivatives. Since PR[#109](https://github.com/gridap/GridapEmbedded.jl/pull/109).
30+
- Added a proper documentation. Since PR[#109](https://github.com/gridap/GridapEmbedded.jl/pull/109).
31+
32+
### Changed
33+
34+
- Swapped `LightGraphs.jl` dependency to `Graphs.jl`, due to the former being deprecated. Since PR[#108](https://github.com/gridap/GridapEmbedded.jl/pull/108).
35+
36+
## [0.9.5] - 2024-10-18
837

938
### Added
1039

1140
- Adding `compute_redistribute_weights` and `compute_adaptive_flags` functions for load balancing and adaptive mesh refinement, respectively. Since PR [#95](https://github.com/gridap/GridapEmbedded.jl/pull/95).
1241

42+
### Changed
43+
44+
- Updated to Algoim v0.2.2, which runs on Julia 1.11. Since PR [#97](https://github.com/gridap/GridapEmbedded.jl/pull/97).
1345

1446
## [0.9.4] - 2024-07-09
1547

‎Project.toml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
name = "GridapEmbedded"
22
uuid = "8838a6a3-0006-4405-b874-385995508d5d"
33
authors = ["Francesc Verdugo <[email protected]>", "Eric Neiva <[email protected]>", "Pere Antoni Martorell <[email protected]>", "Santiago Badia <[email protected]>"]
4-
version = "0.9.4"
4+
version = "0.9.8"
55

66
[deps]
77
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
88
Algoim = "0eb9048c-21de-4c7a-bfac-056de1940b74"
99
Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
1010
CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4"
1111
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
12+
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
13+
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
1214
Gridap = "56d4f2e9-7ea1-5844-9cf6-b9c51ca7ce8e"
1315
GridapDistributed = "f9701e48-63b3-45aa-9a63-9bc6c271f355"
14-
LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
1516
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1617
MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
1718
MiniQhull = "978d7f02-9e05-4691-894f-ae31a51d76ca"
@@ -22,20 +23,24 @@ algoimWrapper_jll = "3c43aa7b-5398-51f3-8d75-8f051e6faa4d"
2223

2324
[compat]
2425
AbstractTrees = "0.3.3, 0.4"
25-
Algoim = "0.2"
26+
Algoim = "0.2.2"
2627
Combinatorics = "1"
27-
CxxWrap = "0.14"
28+
CxxWrap = "0.16"
2829
FillArrays = "0.10, 0.11, 0.12, 0.13, 1"
29-
Gridap = "0.17, 0.18"
30+
FiniteDiff = "2.27.0"
31+
ForwardDiff = "0.10.38, 1"
32+
Graphs = "1.12.0"
33+
Gridap = "0.18.12, 0.19"
3034
GridapDistributed = "0.3, 0.4"
31-
LightGraphs = "1.3.3"
3235
MPI = "0.20"
3336
MiniQhull = "0.1.0, 0.2, 0.3, 0.4"
3437
PartitionedArrays = "0.3.4"
3538
julia = "1.3"
3639

3740
[extras]
41+
FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
42+
MPIPreferences = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267"
3843
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
3944

4045
[targets]
41-
test = ["Test"]
46+
test = ["Test", "FiniteDiff"]

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
Embedded finite element methods, level set surface descriptions and constructive solid geometry.
44

5+
[![Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://gridap.github.io/GridapEmbedded.jl/stable)
56
[![Build Status](https://github.com/gridap/GridapEmbedded.jl/workflows/CI/badge.svg?branch=master)](https://github.com/gridap/GridapEmbedded.jl/actions?query=workflow%3ACI)
67
[![Codecov](https://codecov.io/gh/gridap/GridapEmbedded.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/gridap/GridapEmbedded.jl)
78

@@ -40,4 +41,3 @@ julia> BimaterialLinElastCutFEM.main(n=4,outputfile="results3")
4041
```
4142

4243
<img src="https://raw.githubusercontent.com/gridap/GridapEmbedded.jl/master/examples/BimaterialLinElastCutFEM/BimaterialLinElastCutFEM_solution.png" width="400">
43-

‎docs/Project.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[deps]
22
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
3+
GridapEmbedded = "8838a6a3-0006-4405-b874-385995508d5d"

‎docs/make.jl‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
using Documenter, GridapEmbedded
22

3+
pages = [
4+
"Home" => "index.md",
5+
"Constructive Solid Geometry (CSG)" => "CSG.md",
6+
"Embedded Interfaces" => "Interfaces.md",
7+
"Level Set Cutters" => "LevelSetCutters.md",
8+
"Aggregated FEM" => "AggregatedFEM.md",
9+
"Moment-Fitted Quadratures" => "MomentFittedQuadratures.md",
10+
"Geometrical Derivatives" => "GeometricalDerivatives.md",
11+
"Distributed computing" => "Distributed.md",
12+
]
13+
314
makedocs(;
4-
modules=[GridapEmbedded],
5-
format=Documenter.HTML(),
6-
pages=[
7-
"Home" => "index.md",
8-
],
9-
repo="https://github.com/gridap/GridapEmbedded.jl/blob/{commit}{path}#L{line}",
10-
sitename="GridapEmbedded.jl",
11-
authors="Francesc Verdugo <[email protected]>, Eric Neiva <[email protected]> and Santiago Badia <[email protected]>",
15+
modules = [GridapEmbedded],
16+
format = Documenter.HTML(
17+
size_threshold=nothing
18+
),
19+
sitename = "GridapEmbedded.jl",
20+
authors = "Francesc Verdugo <[email protected]>, Eric Neiva <[email protected]> and Santiago Badia <[email protected]>",
21+
pages = pages,
22+
warnonly = false,
1223
)
1324

1425
deploydocs(;

‎docs/src/AggregatedFEM.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
# Aggregated FEM
3+
4+
```@meta
5+
CurrentModule = GridapEmbedded.AgFEM
6+
```
7+
8+
```@autodocs
9+
Modules = [AgFEM,]
10+
Order = [:type, :constant, :macro, :function]
11+
Pages = [
12+
"/AgFEM.jl",
13+
"/AgFEMSpaces.jl",
14+
"CellAggregation.jl"
15+
]
16+
```

0 commit comments

Comments
 (0)