Merge pull request #14 from gaelforget/v0p2p2b

V0p2p2b

.github/workflows/binder.yaml

@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - main
-      - v0p2p2a
+      - v0p2p2b
 jobs:
   binder:
     runs-on: ubuntu-latest

Dockerfile

@@ -52,12 +52,9 @@ RUN curl -fsSL https://install.julialang.org | sh -s -- --yes
 
 RUN ${USER_HOME_DIR}/.juliaup/bin/julia --project=${mainpath} -e "import Pkg; Pkg.instantiate();"
 RUN ${USER_HOME_DIR}/.juliaup/bin/julia --project=${mainpath} ${mainpath}/src/warmup.jl
-RUN ${USER_HOME_DIR}/.juliaup/bin/julia --project=${mainpath} ${mainpath}/src/download_stuff.jl
 
 ENV MPI_INC_DIR /usr/lib/x86_64-linux-gnu/openmpi/include
 
-RUN source ${mainpath}/src/build_MITgcm_ECCO.sh
-
 RUN jupyter lab build && \
     jupyter lab clean && \
     pip install ${mainpath} --no-cache-dir && \

binder/Dockerfile

@@ -1,2 +1,2 @@
 ### DO NOT EDIT THIS FILE! This Is Automatically Generated And Will Be Overwritten ###
-FROM gaelforget/ecco-docker:2d9321c77767
+FROM gaelforget/ecco-docker:1fdcb9aa197a

src/Project.toml

@@ -1,21 +1,8 @@
 [deps]
-ArgoData = "9eb831cf-c491-48dc-bed4-6aca718df73c"
-CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
-ClimateModels = "f6adb021-9183-4f40-84dc-8cea6f651bb0"
-DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
-Dataverse = "9c0b9be8-e31e-490f-90fe-77697562404d"
-Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
-Glob = "c27321d9-0574-5035-807b-f59d2c89b15c"
 IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a"
-IndividualDisplacements = "b92f0c32-5b7e-11e9-1d7b-238b2da8b0e6"
-JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
 MITgcm = "dce5fa8e-68ce-4431-a242-9469c69627a0"
-MeshArrays = "cb8c808f-1acf-59a3-9d2b-6e38d009f683"
-OceanRobots = "0b51df41-3294-4961-8d23-db645e32016d"
 OceanStateEstimation = "891f6deb-a4f5-4bc5-a2e3-1e8f649cdd2c"
-PlanktonIndividuals = "dfeb4ede-c75e-11e9-050d-41ab7a730e9e"
 Pluto = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 PlutoSliderServer = "2fc8631c-6f24-4c5b-bca7-cbb509c42db4"
 PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
-Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"

src/warmup.jl

@@ -1,20 +1,44 @@
-using ClimateModels, MITgcm, OceanStateEstimation
-using Pluto, PlutoUI, PlutoSliderServer, Downloads, IJulia
-#import Plots
-import CairoMakie
+using Pluto, Downloads, IJulia, Pkg
 
-MITgcm_download()
+import MITgcm, OceanStateEstimation
+import MITgcm.ClimateModels
+import MITgcm.MeshArrays
+using MITgcm.ClimateModels.Git
 
-MC=MITgcm_config(configuration="advect_cs")
-setup(MC)
-build(MC,"--allow-skip")
-launch(MC)
+##
 
-tmp=ModelConfig(model=ClimateModels.RandomWalker)
-setup(tmp)
-launch(tmp) 
+p0=pathof(MITgcm)
+fil=joinpath(dirname(p0),"..","examples","configurations","OCCA2.toml")
+MC=MITgcm.MITgcm_config(inputs=MITgcm.read_toml(fil))
+ClimateModels.setup(MC)
+ClimateModels.build(MC)
 
-notebook_url="https://raw.githubusercontent.com/gaelforget/OceanStateEstimation.jl/master/examples/ECCO/ECCO_standard_plots.jl"
-path_to_notebook = Downloads.download(notebook_url)
-#include(path_to_notebook)
+mv(joinpath(MC,"MITgcm/mysetups/ECCOv4/build/mitgcmuv"),"mitgcmuv")
+rm(pathof(MC),recursive=true)
+
+##
+
+tmp=ClimateModels.ModelConfig(model=ClimateModels.RandomWalker)
+ClimateModels.setup(tmp)
+ClimateModels.launch(tmp) 
+
+##
+
+MeshArrays.GRID_LLC90_download()
+OceanStateEstimation.ECCOdiags_add("release2")
+OceanStateEstimation.ECCOdiags_add("release4")
+
+Downloads.download(
+  "https://zenodo.org/record/5784905/files/interp_coeffs_halfdeg.jld2",
+  joinpath(OceanStateEstimation.ScratchSpaces.ECCO,"interp_coeffs_halfdeg.jld2");
+  timeout=60000.0)
+
+##
+
+run(`$(git()) clone https://github.com/gaelforget/OceanStateEstimation.jl`)
+nb=joinpath(ENV["HOME"],"OceanStateEstimation.jl/examples/ECCO/ECCO_standard_plots.jl")
+Pluto.activate_notebook_environment(nb)
+Pkg.instantiate()
+include(nb)
+Pkg.activate()