Skip to content

Commit 3a0c13b

Browse files
authored
Merge pull request #201 from gridap/v0.20
Update to Gridap v0.20
2 parents 21abc77 + 3020b4a commit 3a0c13b

18 files changed

Lines changed: 1224 additions & 34 deletions

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
matrix:
1414
version:
1515
- '1.10'
16+
- '1'
1617
os:
1718
- ubuntu-latest
1819
arch:
@@ -31,7 +32,7 @@ jobs:
3132
- name: Plugins
3233
files: "stokes_blocks.jl poisson_amr.jl poisson_unfitted.jl"
3334
- name: Other
34-
files: "validation.jl validation_DrWatson.jl interpolation_fe.jl poisson_dev_fe.jl geometry_dev.jl"
35+
files: "validation.jl validation_DrWatson.jl interpolation_fe.jl poisson_dev_fe.jl geometry_dev.jl arrays_dev.jl reffes_dev.jl tensor_values_dev.jl"
3536
steps:
3637
- uses: actions/checkout@v6
3738
- uses: julia-actions/setup-julia@v3

Project.toml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "Tutorials"
22
uuid = "ab87341f-2653-5384-8dc6-691ea82e91b3"
3+
version = "0.20.0"
34
authors = ["Santiago Badia <santiago.badia@monash.edu>", "Francesc Verdugo <fverdugo@cimne.upc.edu>"]
4-
version = "0.19.9"
55

66
[deps]
77
BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
@@ -36,17 +36,19 @@ SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
3636
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
3737

3838
[compat]
39-
BlockArrays = "1.6.3"
40-
DataStructures = "0.18.22"
41-
Gridap = "0.19.9"
39+
BlockArrays = "1"
40+
DataStructures = "0.19"
41+
Gridap = "0.20"
4242
GridapDistributed = "0.4"
43+
GridapEmbedded = "0.9"
4344
GridapGmsh = "0.7"
4445
GridapP4est = "0.3"
4546
GridapPETSc = "0.5"
46-
GridapSolvers = "0.6"
47+
GridapSolvers = "0.7"
4748
MPI = "0.20"
49+
PartitionedArrays = "0.3"
4850
SpecialFunctions = "1"
49-
julia = "1.6"
51+
julia = "1.10"
5052

5153
[extras]
5254
MPIPreferences = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267"

deps/build.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ files = [
3030
"Poisson with HHO on polytopal meshes"=>"poisson_hho.jl",
3131
"Block assembly and solvers: Incompressible Stokes example"=>"stokes_blocks.jl",
3232
"Lagrange multipliers" => "lagrange_multipliers.jl",
33-
"Low-level API - Poisson equation"=>"poisson_dev_fe.jl",
33+
"Low-level API - Arrays"=>"arrays_dev.jl",
3434
"Low-level API - Geometry" => "geometry_dev.jl",
35+
"Low-level API - ReferenceFEs" => "reffes_dev.jl",
36+
"Low-level API - Poisson equation"=>"poisson_dev_fe.jl",
37+
"Low-level API - TensorValues"=>"tensor_values_dev.jl",
3538
]
3639

3740
Sys.rm(notebooks_dir;recursive=true,force=true)

docs/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
44
Tutorials = "ab87341f-2653-5384-8dc6-691ea82e91b3"
55

66
[compat]
7-
Documenter = "0.24"
7+
Documenter = "1"

docs/make.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ for (i,(title,filename)) in enumerate(Tutorials.files)
3636
tutorial_title = string("# # [Tutorial ", i, ": ", title, "](@id ", tutorial_id, ")")
3737
tutorial_file = string(tutorial_prefix,splitext(filename)[1])
3838
notebook_filename = string(tutorial_file, ".ipynb")
39-
binder_url = joinpath("@__BINDER_ROOT_URL__","notebooks", notebook_filename)
40-
nbviwer_url = joinpath("@__NBVIEWER_ROOT_URL__","notebooks", notebook_filename)
39+
binder_url = "https://mybinder.org/v2/gh/gridap/Tutorials/gh-pages?filepath=notebooks/" * notebook_filename
40+
nbviwer_url = "https://nbviewer.jupyter.org/github/gridap/Tutorials/blob/gh-pages/notebooks/" * notebook_filename
4141
binder_badge = string("# [![](",binder_logo,")](",binder_url,")")
4242
nbviwer_badge = string("# [![](",nbviwer_logo,")](",nbviwer_url,")")
4343

models/elasticFlag.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ using Gridap
22
using Gridap.Io
33
using GridapGmsh
44

5-
model = GmshDiscreteModel("elasticFlag.msh")
5+
meshdir(args...) = joinpath(@__DIR__, args...)
6+
model = GmshDiscreteModel(meshdir("elasticFlag.msh"))
67

7-
writevtk(model,"elasticFlag")
8+
writevtk(model,meshdir("elasticFlag"))
89

9-
fn = "elasticFlag.json"
10-
to_json_file(model,fn)
10+
to_json_file(model,meshdir("elasticFlag.json"))

models/elasticFlag.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

models/model.jl

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ using Gridap
33
using Gridap.Io
44
using GridapGmsh
55

6-
model = GmshDiscreteModel("model.msh")
7-
8-
writevtk(model,"model")
9-
10-
fn = "model.json"
11-
to_json_file(model,fn)
6+
meshdir(args...) = joinpath(@__DIR__, args...)
7+
model = GmshDiscreteModel(meshdir("model.msh"))
128

9+
writevtk(model,meshdir("model"))
10+
11+
to_json_file(model,meshdir("model.json"))

models/model.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

models/solid.jl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ using Gridap
33
using Gridap.Io
44
using GridapGmsh
55

6-
model = GmshDiscreteModel("solid.msh")
6+
meshdir(args...) = joinpath(@__DIR__, args...)
7+
model = GmshDiscreteModel(meshdir("solid.msh"))
78

8-
writevtk(model,"solid")
9-
10-
fn = "solid.json"
11-
to_json_file(model,fn)
9+
writevtk(model,meshdir("solid"))
1210

11+
to_json_file(model,meshdir("solid.json"))

0 commit comments

Comments
 (0)