Merge pull request #16 from gaelforget/v0p2p2d

V0p2p2d

Dockerfile

@@ -39,8 +39,8 @@ RUN cp ${mainpath}/src/setup.py ${mainpath}/setup.py
 RUN cp ${mainpath}/src/runpluto.sh ${mainpath}/runpluto.sh
 RUN cp ${mainpath}/src/Project.toml ${mainpath}/Project.toml
 
-ENV USER_HOME_DIR /home/${NB_USER}
-RUN echo 'alias julia="${USER_HOME_DIR}/.juliaup/bin/julia"' >> ~/.bashrc
+ENV HOM /home/${NB_USER}
+RUN echo 'alias julia="${HOM}/.juliaup/bin/julia --project=${HOM}"' >> ~/.bashrc
 
 RUN conda config --env --add channels conda-forge
 RUN conda config --env --add channels r
@@ -50,8 +50,8 @@ RUN conda install octave_kernel texinfo r-irkernel
 
 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 ${HOM}/.juliaup/bin/julia --project=${HOM} -e "import Pkg; Pkg.instantiate();"
+RUN ${HOM}/.juliaup/bin/julia --project=${HOM} ${HOM}/src/warmup.jl
 
 ENV MPI_INC_DIR /usr/lib/x86_64-linux-gnu/openmpi/include
 
@@ -60,4 +60,3 @@ RUN jupyter lab build && \
     pip install ${mainpath} --no-cache-dir && \
     rm -rf ~/.cache
 
-

src/warmup.jl

@@ -13,7 +13,11 @@ MC=MITgcm.MITgcm_config(inputs=MITgcm.read_toml(fil))
 ClimateModels.setup(MC)
 ClimateModels.build(MC)
 
-mv(joinpath(MC,"MITgcm/mysetups/ECCOv4/build/mitgcmuv"),"mitgcmuv")
+cp(joinpath(dirname(p0),"..","examples","configurations","ECCO4.toml"),"src/ECCO4.toml")
+cp(joinpath(dirname(p0),"..","examples","configurations","OCCA2.toml"),"src/OCCA2.toml")
+cp(joinpath(MC,"MITgcm/mysetups/ECCOv4/input/download_files.jl"),"src/download_files.jl")
+
+mv(joinpath(MC,"MITgcm/mysetups/ECCOv4/build/mitgcmuv"),"src/mitgcmuv")
 rm(pathof(MC),recursive=true)
 
 ##
@@ -35,8 +39,9 @@ Downloads.download(
 
 ##
 
-run(`$(git()) clone https://github.com/gaelforget/OceanStateEstimation.jl`)
-nb=joinpath(ENV["HOME"],"OceanStateEstimation.jl/examples/ECCO/ECCO_standard_plots.jl")
+pth=joinpath(ENV["HOME"],"src","OceanStateEstimation.jl")
+run(`$(git()) clone https://github.com/gaelforget/OceanStateEstimation.jl $pth`)
+nb=joinpath(pth,"examples/ECCO/ECCO_standard_plots.jl")
 Pluto.activate_notebook_environment(nb)
 Pkg.instantiate()
 include(nb)