Merge pull request #211 from gaelforget/examples_update

Examples update

Author: gaelforget

docs/make.jl

@@ -29,8 +29,10 @@ makedocs(;
     authors="gaelforget <gforget@mit.edu>",
 )
 
-lst=("basics.jl","geography.jl","vectors.jl","JuliaGeoDev/MeshArrays_to_Polygons.jl","JuliaGeoDev/GeometryOps_exploration.jl")
-pth=("tutorials","tutorials","tutorials","dev","dev")
+lst=("basics.jl","geography.jl","vectors.jl",
+	"dev/MeshArrays_to_Polygons.jl","dev/GeometryOps_exploration.jl")
+pth=("tutorials","tutorials","tutorials",
+	"dev","dev")
 
 for ii in 1:length(lst)
     i=lst[ii]

docs/src/dev.md

@@ -3,7 +3,7 @@
 
 ## [JuliaGeo](@id id_JuliaGeo)
 
-[The Polygons notebook](MeshArrays_to_Polygons.html) ([code link](https://raw.githubusercontent.com/JuliaClimate/MeshArrays.jl/master/examples/JuliaGeoDev/MeshArrays_to_Polygons.jl)) illustrates how grids in `MeshArrays.jl` can be represented as sets of Polygons (2D) or LineStrings (3D) using [GeoInterface.jl](https://github.com/JuliaGeo/GeoInterface.jl).
+[The Polygons notebook](MeshArrays_to_Polygons.html) ([code link](https://raw.githubusercontent.com/JuliaClimate/MeshArrays.jl/master/examples/dev/MeshArrays_to_Polygons.jl)) illustrates how grids in `MeshArrays.jl` can be represented as sets of Polygons (2D) or LineStrings (3D) using [GeoInterface.jl](https://github.com/JuliaGeo/GeoInterface.jl).
 
-[The GeometryOps notebook](GeometryOps_exploration.html) ([code link](https://raw.githubusercontent.com/JuliaClimate/MeshArrays.jl/master/examples/JuliaGeoDev/GeometryOps_exploration.jl)) has a few more tests with [GeometryOps.jl](https://github.com/JuliaGeo/GeometryOps.jl).
+[The GeometryOps notebook](GeometryOps_exploration.html) ([code link](https://raw.githubusercontent.com/JuliaClimate/MeshArrays.jl/master/examples/dev/GeometryOps_exploration.jl)) has a few more tests with [GeometryOps.jl](https://github.com/JuliaGeo/GeometryOps.jl).
 

examples/basics.jl

@@ -493,9 +493,9 @@ weakdeps = ["SparseArrays"]
     ChainRulesCoreSparseArraysExt = "SparseArrays"
 
 [[deps.ChunkCodecCore]]
-git-tree-sha1 = "51f4c10ee01bda57371e977931de39ee0f0cdb3e"
+git-tree-sha1 = "1a3ad7e16a321667698a19e77362b35a1e94c544"
 uuid = "0b6fb165-00bc-4d37-ab8b-79f91016dbe1"
-version = "1.0.0"
+version = "1.0.1"
 
 [[deps.ChunkCodecLibZlib]]
 deps = ["ChunkCodecCore", "Zlib_jll"]
@@ -1085,9 +1085,9 @@ version = "0.1.6"
 
 [[deps.JpegTurbo_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "4255f0032eafd6451d707a51d5f0248b8a165e4d"
+git-tree-sha1 = "b6893345fd6658c8e475d40155789f4860ac3b21"
 uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8"
-version = "3.1.3+0"
+version = "3.1.4+0"
 
 [[deps.JuliaSyntaxHighlighting]]
 deps = ["StyledStrings"]
@@ -1275,9 +1275,9 @@ version = "0.6.7"
 
 [[deps.MeshArrays]]
 deps = ["CatViews", "Dates", "Distributed", "GeoInterface", "Glob", "LazyArtifacts", "NearestNeighbors", "Pkg", "Printf", "SharedArrays", "SparseArrays", "Statistics", "Unitful"]
-git-tree-sha1 = "6b256a7d5c13337f304b79b30aa351e2142759cd"
+git-tree-sha1 = "d333bc6aa00ba7be0636af73698d85b306ff49f4"
 uuid = "cb8c808f-1acf-59a3-9d2b-6e38d009f683"
-version = "0.5.1"
+version = "0.5.2"
 
     [deps.MeshArrays.extensions]
     MeshArraysDataDepsExt = ["DataDeps"]
@@ -1324,10 +1324,10 @@ uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
 version = "1.1.3"
 
 [[deps.NearestNeighbors]]
-deps = ["Distances", "StaticArrays"]
-git-tree-sha1 = "5a47e9b249869754ac274953fbe9b7232856eb20"
+deps = ["AbstractTrees", "Distances", "StaticArrays"]
+git-tree-sha1 = "2949f294f82b5ad7192fd544a988a1e785438ee2"
 uuid = "b8a86587-4115-5ab1-83bc-aa920d37bbce"
-version = "0.4.25"
+version = "0.4.26"
 
 [[deps.Netpbm]]
 deps = ["FileIO", "ImageCore", "ImageMetadata"]

…s/JuliaGeoDev/GeometryOps_exploration.jl examples/dev/GeometryOps_exploration.jlexamples/JuliaGeoDev/GeometryOps_exploration.jl renamed to examples/dev/GeometryOps_exploration.jl examples/JuliaGeoDev/GeometryOps_exploration.jl renamed to examples/dev/GeometryOps_exploration.jl

@@ -501,9 +501,9 @@ version = "1.11.0"
 
 [[deps.DelaunayTriangulation]]
 deps = ["AdaptivePredicates", "EnumX", "ExactPredicates", "Random"]
-git-tree-sha1 = "783b21581a051ac91a3921ee37e26a23ed7f57a6"
+git-tree-sha1 = "c55f5a9fd67bdbc8e089b5a3111fe4292986a8e8"
 uuid = "927a84f5-c5f4-47a5-9785-b46e178433df"
-version = "1.6.5"
+version = "1.6.6"
 
 [[deps.Distributed]]
 deps = ["Random", "Serialization", "Sockets"]
@@ -742,9 +742,9 @@ weakdeps = ["GeoInterface"]
 
 [[deps.GeometryOps]]
 deps = ["AbstractTrees", "AdaptivePredicates", "CoordinateTransformations", "DataAPI", "DelaunayTriangulation", "ExactPredicates", "Extents", "GeoFormatTypes", "GeoInterface", "GeometryOpsCore", "LinearAlgebra", "Random", "SortTileRecursiveTree", "StaticArrays", "Statistics", "Tables"]
-git-tree-sha1 = "9fa16be9c28d9c01bf2b5d73f7768d482c12b118"
+git-tree-sha1 = "3e8bfdb7b924c0346ce15a1d11a6938d490a76a3"
 uuid = "3251bfac-6a57-4b6d-aa61-ac1fef2975ab"
-version = "0.1.31"
+version = "0.1.32"
 
     [deps.GeometryOps.extensions]
     GeometryOpsDataFramesExt = "DataFrames"
@@ -762,9 +762,9 @@ version = "0.1.31"
 
 [[deps.GeometryOpsCore]]
 deps = ["DataAPI", "GeoInterface", "StableTasks", "Tables"]
-git-tree-sha1 = "69fc98947b06f8ac4279cf5bf8810373fe042be4"
+git-tree-sha1 = "55ca4091a2808f7918eb857fe35844107b728c5d"
 uuid = "05efe853-fabf-41c8-927e-7063c8b9f013"
-version = "0.1.7"
+version = "0.1.8"
 
 [[deps.GettextRuntime_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll"]
@@ -998,9 +998,9 @@ version = "0.1.6"
 
 [[deps.JpegTurbo_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "4255f0032eafd6451d707a51d5f0248b8a165e4d"
+git-tree-sha1 = "b6893345fd6658c8e475d40155789f4860ac3b21"
 uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8"
-version = "3.1.3+0"
+version = "3.1.4+0"
 
 [[deps.JuliaSyntaxHighlighting]]
 deps = ["StyledStrings"]
@@ -1172,9 +1172,9 @@ uuid = "20f20a25-4f0e-4fdf-b5d1-57303727442b"
 version = "0.9.5"
 
 [[deps.MappedArrays]]
-git-tree-sha1 = "2dab0221fe2b0f2cb6754eaa743cc266339f527e"
+git-tree-sha1 = "0ee4497a4e80dbd29c058fcee6493f5219556f40"
 uuid = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900"
-version = "0.4.2"
+version = "0.4.3"
 
 [[deps.Markdown]]
 deps = ["Base64", "JuliaSyntaxHighlighting", "StyledStrings"]
@@ -1771,15 +1771,16 @@ version = "0.4.1"
 
 [[deps.Unitful]]
 deps = ["Dates", "LinearAlgebra", "Random"]
-git-tree-sha1 = "9046387d65115030265736cd264d0b4eae3881f9"
+git-tree-sha1 = "c25751629f5baaa27fef307f96536db62e1d754e"
 uuid = "1986cc42-f94f-5a68-af5c-568840ba703d"
-version = "1.26.0"
+version = "1.27.0"
 
     [deps.Unitful.extensions]
     ConstructionBaseUnitfulExt = "ConstructionBase"
     ForwardDiffExt = "ForwardDiff"
     InverseFunctionsUnitfulExt = "InverseFunctions"
     LatexifyExt = ["Latexify", "LaTeXStrings"]
+    NaNMathExt = "NaNMath"
     PrintfExt = "Printf"
 
     [deps.Unitful.weakdeps]
@@ -1788,6 +1789,7 @@ version = "1.26.0"
     InverseFunctions = "3587e190-3f89-42d0-90ee-14403ec27112"
     LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
     Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
+    NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
     Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
 [[deps.WebP]]
@@ -1892,9 +1894,9 @@ version = "2.0.4+0"
 
 [[deps.libpng_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"]
-git-tree-sha1 = "5cb3c5d039f880c0b3075803c8bf45cb95ae1e91"
+git-tree-sha1 = "de8ab4f01cb2d8b41702bab9eaad9e8b7d352f73"
 uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f"
-version = "1.6.51+0"
+version = "1.6.53+0"
 
 [[deps.libsixel_jll]]
 deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "libpng_jll"]

…es/JuliaGeoDev/MeshArrays_to_Polygons.jl examples/dev/MeshArrays_to_Polygons.jlexamples/JuliaGeoDev/MeshArrays_to_Polygons.jl renamed to examples/dev/MeshArrays_to_Polygons.jl examples/JuliaGeoDev/MeshArrays_to_Polygons.jl renamed to examples/dev/MeshArrays_to_Polygons.jl

@@ -206,14 +206,12 @@ PLUTO_PROJECT_TOML_CONTENTS = """
 CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 GeometryOps = "3251bfac-6a57-4b6d-aa61-ac1fef2975ab"
 MITgcm = "dce5fa8e-68ce-4431-a242-9469c69627a0"
-MeshArrays = "cb8c808f-1acf-59a3-9d2b-6e38d009f683"
 PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
 
 [compat]
 CairoMakie = "~0.15.7"
 GeometryOps = "~0.1.31"
 MITgcm = "~0.5.12"
-MeshArrays = "~0.4.0"
 PlutoUI = "~0.7.75"
 """
 
@@ -223,7 +221,7 @@ PLUTO_MANIFEST_TOML_CONTENTS = """
 
 julia_version = "1.12.1"
 manifest_format = "2.0"
-project_hash = "621754fcf1125ccf170eaad89bd3ffdfdd380afd"
+project_hash = "98fcc991a2150e4e795d97b4f0693eb5fd12b3ac"
 
 [[deps.AbstractFFTs]]
 deps = ["LinearAlgebra"]

…es/dev_NEMO/NEMO_MeridionalTransports.jl examples/dev/NEMO_MeridionalTransports.jlexamples/dev_NEMO/NEMO_MeridionalTransports.jl renamed to examples/dev/NEMO_MeridionalTransports.jl examples/dev_NEMO/NEMO_MeridionalTransports.jl renamed to examples/dev/NEMO_MeridionalTransports.jl

@@ -192,7 +192,8 @@ begin
 	MOHT_SW=1e-15*Float64.(mean(ds["ORAS5"][:,1:12],dims=2))[:];
 
 	fig=Figure(); ax=Axis(fig[1,1], xlabel="latitude", ylabel="PW")
-	lines!(-89.0:89.0,MOHT_GF,label="GF")
+	lines!(-89.0:89.0,MT_heat,label="GF from u,v,T")
+	lines!(-89.0:89.0,MOHT_GF,label="GF from uT,vT")
 	lines!(lon_SW,MOHT_SW,label="SW")
 	axislegend()
 	fig_MHT_ref=current_figure()
@@ -386,9 +387,9 @@ weakdeps = ["SparseArrays"]
     ChainRulesCoreSparseArraysExt = "SparseArrays"
 
 [[deps.ChunkCodecCore]]
-git-tree-sha1 = "51f4c10ee01bda57371e977931de39ee0f0cdb3e"
+git-tree-sha1 = "1a3ad7e16a321667698a19e77362b35a1e94c544"
 uuid = "0b6fb165-00bc-4d37-ab8b-79f91016dbe1"
-version = "1.0.0"
+version = "1.0.1"
 
 [[deps.ChunkCodecLibZlib]]
 deps = ["ChunkCodecCore", "Zlib_jll"]
@@ -1002,9 +1003,9 @@ version = "0.1.6"
 
 [[deps.JpegTurbo_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "4255f0032eafd6451d707a51d5f0248b8a165e4d"
+git-tree-sha1 = "b6893345fd6658c8e475d40155789f4860ac3b21"
 uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8"
-version = "3.1.3+0"
+version = "3.1.4+0"
 
 [[deps.JuliaSyntaxHighlighting]]
 deps = ["StyledStrings"]
@@ -1225,9 +1226,9 @@ version = "0.6.7"
 
 [[deps.MeshArrays]]
 deps = ["CatViews", "Dates", "Distributed", "GeoInterface", "Glob", "LazyArtifacts", "NearestNeighbors", "Pkg", "Printf", "SharedArrays", "SparseArrays", "Statistics", "Unitful"]
-git-tree-sha1 = "6b256a7d5c13337f304b79b30aa351e2142759cd"
+git-tree-sha1 = "d333bc6aa00ba7be0636af73698d85b306ff49f4"
 uuid = "cb8c808f-1acf-59a3-9d2b-6e38d009f683"
-version = "0.5.1"
+version = "0.5.2"
 
     [deps.MeshArrays.extensions]
     MeshArraysDataDepsExt = ["DataDeps"]
@@ -1292,10 +1293,10 @@ uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
 version = "1.1.3"
 
 [[deps.NearestNeighbors]]
-deps = ["Distances", "StaticArrays"]
-git-tree-sha1 = "5a47e9b249869754ac274953fbe9b7232856eb20"
+deps = ["AbstractTrees", "Distances", "StaticArrays"]
+git-tree-sha1 = "2949f294f82b5ad7192fd544a988a1e785438ee2"
 uuid = "b8a86587-4115-5ab1-83bc-aa920d37bbce"
-version = "0.4.25"
+version = "0.4.26"
 
 [[deps.NetCDF_jll]]
 deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "TOML", "XML2_jll", "Zlib_jll", "Zstd_jll", "libaec_jll", "libzip_jll"]

examples/exchange_methods.jl examples/dev/exchange_methods.jlexamples/exchange_methods.jl renamed to examples/dev/exchange_methods.jl

@@ -64,6 +64,17 @@ PlutoUI.TableOfContents()
 # ╔═╡ 71612f73-1051-4e97-a308-21a407d32642
 md"""## Load Grids"""
 
+# ╔═╡ 4f164c56-3a0f-4c81-b017-505d8b734e0f
+function set_OISST_grid()
+	γ = MeshArrays.GridSpec_default(ID=:OISST,tile=(180,180))
+#	Γ_OISST=GridLoad(ID=:OISST,γ)
+	Γ_OISST=MeshArrays.GridLoad_default(γ)
+#	heatmap(Γ_OISST.XC)
+end
+
+# ╔═╡ 6d54a652-484a-4886-978f-7435e2818287
+Γ_OISST=set_OISST_grid();
+
 # ╔═╡ 32d493af-0e5f-44ef-8c4a-e6c38f22c38a
 begin
 	Γ_LL360 = GridLoad(ID=:onedegree)
@@ -142,16 +153,21 @@ This uses the new `MeshArrays.neighbor_locations` method to provide arrays of lo
 
 ### `neighbor_locations` in `:wh` format"""
 
+# ╔═╡ 9b407b06-cacd-44ba-8612-6aa942d4c057
+@bind gr2 Select([:CS32,:OISST])
+
 # ╔═╡ 002a877c-fdae-4937-b786-eaa58163082a
-locs_wh=MeshArrays.neighbor_locations(Γ_CS32,format=:wh)
+locs_wh=(gr2==:CS32 ? MeshArrays.neighbor_locations(Γ_CS32,format=:wh)
+					: MeshArrays.neighbor_locations(Γ_OISST,format=:wh)
+		)
 
 # ╔═╡ fe278b93-3643-47e3-b38a-6f7402ba7e46
 @bind ff Select(1:length(locs_wh.MA))
 
 # ╔═╡ b4d43587-e358-4feb-a4fc-98f5e5b23247
 begin
 	fig=Figure(size=(300,300)); ax=Axis(fig[1,1])
-	heatmap!([x[3] for x in locs_wh.MA.f[ff]],colorrange=(1,6))
+	heatmap!([x[3] for x in locs_wh.MA.f[ff]],colorrange=(1,length(locs_wh.MA)))
 	fig
 end
 
@@ -203,7 +219,6 @@ PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
 
 [compat]
 CairoMakie = "~0.15.8"
-MeshArrays = "~0.5.1"
 PlutoUI = "~0.7.76"
 """
 
@@ -213,7 +228,7 @@ PLUTO_MANIFEST_TOML_CONTENTS = """
 
 julia_version = "1.12.1"
 manifest_format = "2.0"
-project_hash = "2ba776f762950a75975eb5aa688bbbd8dacbdda7"
+project_hash = "82fd984eb91a1771f46441a1db146d67a7b4f7b9"
 
 [[deps.AbstractFFTs]]
 deps = ["LinearAlgebra"]
@@ -920,9 +935,9 @@ version = "0.1.6"
 
 [[deps.JpegTurbo_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "4255f0032eafd6451d707a51d5f0248b8a165e4d"
+git-tree-sha1 = "b6893345fd6658c8e475d40155789f4860ac3b21"
 uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8"
-version = "3.1.3+0"
+version = "3.1.4+0"
 
 [[deps.JuliaSyntaxHighlighting]]
 deps = ["StyledStrings"]
@@ -1110,9 +1125,9 @@ version = "0.6.7"
 
 [[deps.MeshArrays]]
 deps = ["CatViews", "Dates", "Distributed", "GeoInterface", "Glob", "LazyArtifacts", "NearestNeighbors", "Pkg", "Printf", "SharedArrays", "SparseArrays", "Statistics", "Unitful"]
-path = "/Users/gaelforget/work/code/julia_pkg/MeshArrays.jl/"
+git-tree-sha1 = "d333bc6aa00ba7be0636af73698d85b306ff49f4"
 uuid = "cb8c808f-1acf-59a3-9d2b-6e38d009f683"
-version = "0.5.1"
+version = "0.5.2"
 
     [deps.MeshArrays.extensions]
     MeshArraysDataDepsExt = ["DataDeps"]
@@ -1875,6 +1890,8 @@ version = "4.1.0+0"
 # ╟─7e32b36f-2a80-4637-a8be-306e7a0efa9a
 # ╟─6dc76c23-ff3a-4182-ab90-a87d5b65c768
 # ╟─71612f73-1051-4e97-a308-21a407d32642
+# ╠═4f164c56-3a0f-4c81-b017-505d8b734e0f
+# ╠═6d54a652-484a-4886-978f-7435e2818287
 # ╟─32d493af-0e5f-44ef-8c4a-e6c38f22c38a
 # ╟─c1c0e7ff-7c4f-48ba-be26-94d85dc1504a
 # ╟─7af41d1e-1013-49e2-823f-4aafc0a5ef49
@@ -1885,6 +1902,7 @@ version = "4.1.0+0"
 # ╟─a171ef2e-f942-4552-8f27-a544cbed7dff
 # ╟─e90245cc-0b2c-4877-9d18-de036eba37ce
 # ╟─5b3c9b52-4d9d-47a7-a824-645173f1d49e
+# ╟─9b407b06-cacd-44ba-8612-6aa942d4c057
 # ╟─002a877c-fdae-4937-b786-eaa58163082a
 # ╟─fe278b93-3643-47e3-b38a-6f7402ba7e46
 # ╟─b4d43587-e358-4feb-a4fc-98f5e5b23247