Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
matrix:
version:
- '1.10'
- '1'
os:
- ubuntu-latest
arch:
Expand All @@ -31,7 +32,7 @@ jobs:
- name: Plugins
files: "stokes_blocks.jl poisson_amr.jl poisson_unfitted.jl"
- name: Other
files: "validation.jl validation_DrWatson.jl interpolation_fe.jl poisson_dev_fe.jl geometry_dev.jl"
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"
steps:
- uses: actions/checkout@v6
- uses: julia-actions/setup-julia@v2
Expand Down
14 changes: 8 additions & 6 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Tutorials"
uuid = "ab87341f-2653-5384-8dc6-691ea82e91b3"
version = "0.20.0"
authors = ["Santiago Badia <santiago.badia@monash.edu>", "Francesc Verdugo <fverdugo@cimne.upc.edu>"]
version = "0.19.9"

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

[compat]
BlockArrays = "1.6.3"
DataStructures = "0.18.22"
Gridap = "0.19.9"
BlockArrays = "1"
DataStructures = "0.19"
Gridap = "0.20"
GridapDistributed = "0.4"
GridapEmbedded = "0.9"
GridapGmsh = "0.7"
GridapP4est = "0.3"
GridapPETSc = "0.5"
GridapSolvers = "0.6"
GridapSolvers = "0.7"
MPI = "0.20"
PartitionedArrays = "0.3"
SpecialFunctions = "1"
julia = "1.6"
julia = "1.10"

[extras]
MPIPreferences = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267"
Expand Down
5 changes: 4 additions & 1 deletion deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ files = [
"Poisson with HHO on polytopal meshes"=>"poisson_hho.jl",
"Block assembly and solvers: Incompressible Stokes example"=>"stokes_blocks.jl",
"Lagrange multipliers" => "lagrange_multipliers.jl",
"Low-level API - Poisson equation"=>"poisson_dev_fe.jl",
"Low-level API - Arrays"=>"arrays_dev.jl",
"Low-level API - Geometry" => "geometry_dev.jl",
"Low-level API - ReferenceFEs" => "reffes_dev.jl",
"Low-level API - Poisson equation"=>"poisson_dev_fe.jl",
"Low-level API - TensorValues"=>"tensor_values_dev.jl",
]

Sys.rm(notebooks_dir;recursive=true,force=true)
Expand Down
2 changes: 1 addition & 1 deletion docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
Tutorials = "ab87341f-2653-5384-8dc6-691ea82e91b3"

[compat]
Documenter = "0.24"
Documenter = "1"
4 changes: 2 additions & 2 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ for (i,(title,filename)) in enumerate(Tutorials.files)
tutorial_title = string("# # [Tutorial ", i, ": ", title, "](@id ", tutorial_id, ")")
tutorial_file = string(tutorial_prefix,splitext(filename)[1])
notebook_filename = string(tutorial_file, ".ipynb")
binder_url = joinpath("@__BINDER_ROOT_URL__","notebooks", notebook_filename)
nbviwer_url = joinpath("@__NBVIEWER_ROOT_URL__","notebooks", notebook_filename)
binder_url = "https://mybinder.org/v2/gh/gridap/Tutorials/gh-pages?filepath=notebooks/" * notebook_filename
nbviwer_url = "https://nbviewer.jupyter.org/github/gridap/Tutorials/blob/gh-pages/notebooks/" * notebook_filename
binder_badge = string("# [![](",binder_logo,")](",binder_url,")")
nbviwer_badge = string("# [![](",nbviwer_logo,")](",nbviwer_url,")")

Expand Down
8 changes: 4 additions & 4 deletions models/elasticFlag.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ using Gridap
using Gridap.Io
using GridapGmsh

model = GmshDiscreteModel("elasticFlag.msh")
meshdir(args...) = joinpath(@__DIR__, args...)
model = GmshDiscreteModel(meshdir("elasticFlag.msh"))

writevtk(model,"elasticFlag")
writevtk(model,meshdir("elasticFlag"))

fn = "elasticFlag.json"
to_json_file(model,fn)
to_json_file(model,meshdir("elasticFlag.json"))
2 changes: 1 addition & 1 deletion models/elasticFlag.json

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions models/model.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ using Gridap
using Gridap.Io
using GridapGmsh

model = GmshDiscreteModel("model.msh")

writevtk(model,"model")

fn = "model.json"
to_json_file(model,fn)
meshdir(args...) = joinpath(@__DIR__, args...)
model = GmshDiscreteModel(meshdir("model.msh"))

writevtk(model,meshdir("model"))

to_json_file(model,meshdir("model.json"))
2 changes: 1 addition & 1 deletion models/model.json

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions models/solid.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ using Gridap
using Gridap.Io
using GridapGmsh

model = GmshDiscreteModel("solid.msh")
meshdir(args...) = joinpath(@__DIR__, args...)
model = GmshDiscreteModel(meshdir("solid.msh"))

writevtk(model,"solid")

fn = "solid.json"
to_json_file(model,fn)
writevtk(model,meshdir("solid"))

to_json_file(model,meshdir("solid.json"))
2 changes: 1 addition & 1 deletion models/solid.json

Large diffs are not rendered by default.

Loading
Loading