Merge pull request #129 from gaelforget/CStream_movies_update20241102

C stream movies update20241102
JuliaClimate · Nov 2, 2024 · 74b52dc · 74b52dc
2 parents a2a7c43 + c6f3cf7
commit 74b52dc
Show file tree

Hide file tree

Showing 18 changed files with 4,565 additions and 364 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 .DS_Store
 .ipynb_checkpoints/
-Manifest.toml
+./Manifest.toml
 devel
 */*.cov
 */*/*.cov

diff --git a/Artifacts.toml b/Artifacts.toml
diff --git a/Project.toml b/Project.toml
@@ -4,19 +4,21 @@ authors = ["gaelforget <[email protected]>"]
 version = "0.5.0"
 
 [deps]
-Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
 CyclicArrays = "6023044f-b3ef-4c22-8399-3ec90a0c9b75"
+DataDeps = "124859b0-ceae-595e-8997-d05f6a7a8dfe"
+Dataverse = "9c0b9be8-e31e-490f-90fe-77697562404d"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
-LazyArtifacts = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
+Glob = "c27321d9-0574-5035-807b-f59d2c89b15c"
 MeshArrays = "cb8c808f-1acf-59a3-9d2b-6e38d009f683"
 OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [compat]
-Artifacts = "1"
 CyclicArrays = "0.5"
+DataDeps = "0.7"
 DataFrames = "1"
-LazyArtifacts = "1"
+Dataverse = "0.2"
+Glob = "1"
 MeshArrays = "0.3"
 OrdinaryDiffEq = "6"
 julia = "^1.10"
diff --git a/docs/make.jl b/docs/make.jl
@@ -2,9 +2,11 @@ using Documenter, Literate, PlutoSliderServer, IndividualDisplacements
 using Climatology
 
 #download data dependencies if needed
-IndividualDisplacements.flt_example_download()
+IndividualDisplacements.datadeps.getdata("flt_example")
 Climatology.get_ecco_velocity_if_needed();
 Climatology.get_occa_velocity_if_needed();
+Climatology.get_ecco_variable_if_needed("THETA")
+Climatology.get_ecco_variable_if_needed("SALT")
 
 # generate tutorials and how-to guides using Literate
 src = joinpath(@__DIR__, "src/")

diff --git a/examples/more/detailed_look.jl b/examples/more/detailed_look.jl
@@ -32,10 +32,9 @@ include(joinpath(p,"../examples/more/example123.jl"))
 #
 # from `MITgcm/pkg/flt`
 
-IndividualDisplacements.flt_example_download()
-dirIn=IndividualDisplacements.flt_example_path
+flt_example_path = IndividualDisplacements.datadeps.getdata("flt_example")
 prec=Float32
-df=read_flt(dirIn,prec);
+df=read_flt(flt_example_path*"/",prec);
 
 #md plt=plot_paths(df,300,100000.0)
 

diff --git a/examples/more/example123.jl b/examples/more/example123.jl
@@ -92,10 +92,9 @@ example2_xy()
 Read MITgcm/pkg/flt output
 """
 function example2_xy(𝑃)
-IndividualDisplacements.flt_example_download()
-dirIn=IndividualDisplacements.flt_example_path
+flt_example_path = IndividualDisplacements.datadeps.getdata("flt_example")
 prec=Float32
-df=read_flt(dirIn,prec)
+df=read_flt(flt_example_path*"/",prec)
 #
 tmp=df[df.ID .== 200, :]
 nSteps=Int32(tmp[end,:time]/3600)-2
@@ -124,9 +123,8 @@ function example2_setup()
 
    ###### 1) Get gridded variables via MeshArrays.jl
 
-   IndividualDisplacements.flt_example_download()
-   dirIn=IndividualDisplacements.flt_example_path
-   γ=gcmgrid(dirIn,"PeriodicChannel",1,[(80,42)], [80 42], Float32, read, write)
+   flt_example_path = IndividualDisplacements.datadeps.getdata("flt_example")
+   γ=gcmgrid(flt_example_path*"/","PeriodicChannel",1,[(80,42)], [80 42], Float32, read, write)
    nr=8
 
    ## Put grid variables in a dictionary:

diff --git a/examples/more/particle_cloud.jl b/examples/more/particle_cloud.jl
@@ -54,6 +54,6 @@ I=(position=xy,record=deepcopy(tr),velocity=dxdt!,
 
 # Compare with trajectory output from `MITgcm`
 
-#IndividualDisplacements.flt_example_download()
-#df=read_flt(IndividualDisplacements.flt_example_path,Float32)
+#flt_example_path = IndividualDisplacements.datadeps.getdata("flt_example")
+#df=read_flt(flt_example_path*"/",Float32)
 #ref=plot_paths(df,size(xy,2),100000.0)