Some fixes for Decapodes Docs (#196)

* Some fixes for Decapodes Docs Was still us SphericalMesh/Gridmeshes and packages were outdated. Add compats for various packages. * Moved Point3D to shallow_ice
AlgebraicJulia · Feb 2, 2024 · dc5500c · dc5500c
1 parent f39547f
commit dc5500c
Show file tree

Hide file tree

Showing 10 changed files with 192 additions and 272 deletions.
diff --git a/Project.toml b/Project.toml
@@ -32,7 +32,7 @@ Catlab = "0.15, 0.16"
 CombinatorialSpaces = "0.5, 0.6"
 ComponentArrays = "0.15"
 DataStructures = "0.18.13"
-DiagrammaticEquations = "0.1.0"
+DiagrammaticEquations = "0.1.1"
 Distributions = "0.25"
 FileIO = "1.16"
 GeometryBasics = "0.4.2"

diff --git a/docs/Manifest.toml b/docs/Manifest.toml
diff --git a/docs/src/grigoriev.md b/docs/src/grigoriev.md
@@ -60,7 +60,6 @@ To use this interpolating object `ice_interp`, we can simply query it for the va
 Let's generate a triangulated grid located at the appropriate coordinates:
 
 ``` @example DEC
-include("../../examples/grid_meshes.jl")
 # Specify a resolution:
 RES_Y = (MAX_Y-MIN_Y)/30.0
 RES_X = RES_Y

diff --git a/docs/src/ice_dynamics.md b/docs/src/ice_dynamics.md
@@ -304,7 +304,6 @@ to_graphviz(ice_dynamics3)
 # Define our mesh
 
 ``` @example DEC
-include("../../examples/grid_meshes.jl")
 s′ = triangulated_grid(10_000,10_000,800,800,Point3D)
 s = EmbeddedDeltaDualComplex2D{Bool, Float64, Point3D}(s′)
 subdivide_duals!(s, Barycenter())

diff --git a/examples/climate/nonhydrostatic_buoyancy.jl b/examples/climate/nonhydrostatic_buoyancy.jl
@@ -101,7 +101,6 @@ resolve_overloads!(buoyancy)
 to_graphviz(buoyancy)
 
 
-include("../../grid_meshes.jl")
 #s′ = loadmesh(Rectangle_30x10())
 s′ = triangulated_grid(80,80, 10, 10, Point3D)
 s = EmbeddedDeltaDualComplex2D{Bool, Float64, Point3D}(s′)

diff --git a/examples/climate/shallow_ice.jl b/examples/climate/shallow_ice.jl
@@ -14,8 +14,8 @@ using ComponentArrays
 # Uncomment to load GLMakie if your system supports it.
 # Otherwise, do using CairoMakie
 #using GLMakie
-using GeometryBasics: Point2
-Point2D = Point2{Float64}
+using GeometryBasics: Point3
+Point3D = Point3{Float64}
 
 ####################
 # Define the model #
@@ -85,9 +85,6 @@ to_graphviz(ice_dynamics3)
 # Define the mesh #
 ###################
 
-#include("../../grid_meshes.jl")
-#include("../grid_meshes.jl")
-include("../../examples/grid_meshes.jl")
 s′ = triangulated_grid(10_000,10_000,800,800,Point3D)
 s = EmbeddedDeltaDualComplex2D{Bool, Float64, Point3D}(s′)
 subdivide_duals!(s, Barycenter())

diff --git a/examples/sw/pressure.jl b/examples/sw/pressure.jl
@@ -97,7 +97,6 @@ function generate(sd, my_symbol; hodge=GeometricHodge())
 end
 
 #include("coordinates.jl")
-#include("spherical_meshes.jl")
 
 radius = 6371+90
 

diff --git a/examples/sw/sw.jl b/examples/sw/sw.jl
@@ -68,7 +68,6 @@ gensim(expand_operators(ddp), [:C])
 f = eval(gensim(expand_operators(ddp), [:C]))
 
 #include("coordinates.jl")
-#include("spherical_meshes.jl")
 
 const RADIUS = 6371+90
 #primal_earth, npi, spi = makeSphere(0, 180, 5, 0, 360, 5, RADIUS);

diff --git a/examples/sw/sw_with_advection.jl b/examples/sw/sw_with_advection.jl
@@ -77,7 +77,6 @@ ddp = SummationDecapode(diffExpr)
 gensim(expand_operators(ddp), [:C, :V])
 f = eval(gensim(expand_operators(ddp), [:C, :V]))
 
-#include("spherical_meshes.jl")
 radius = 6371+90
 #primal_earth, npi, spi = makeSphere(0, 180, 5, 0, 360, 5, radius);
 #nploc = primal_earth[npi, :point]

diff --git a/src/coordinates.jl b/src/coordinates.jl
@@ -1,4 +1,5 @@
 using GeometryBasics
+using CombinatorialSpaces.MeshInterop
 # using LinearAlgebra
 
 """    CartesianPoint{T}(p)