Skip to content

Commit

Permalink
Merge pull request #12 from gaelforget/v0p2p1a
Browse files Browse the repository at this point in the history
update README, compile ECCO
  • Loading branch information
gaelforget authored Mar 31, 2024
2 parents 910cdf0 + c04eb35 commit 50cc6ea
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/binder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
push:
branches:
- main
- 20240330_updates
- v0p2p1a
jobs:
binder:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ RUN ${USER_HOME_DIR}/.juliaup/bin/julia --project=${mainpath} ${mainpath}/src/do

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 && \
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@

[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/gaelforget/ECCO-Docker/HEAD)
[![DOI](https://zenodo.org/badge/507698620.svg)](https://zenodo.org/badge/latestdoi/507698620)

This [Docker image configuration](https://www.docker.com) makes it easy to analyze and run [ECCO](https://ecco-group.org) estimates and other [MITgcm](http://mitgcm.org) model solutions.

It includes :

- [MITgcm](https://mitgcm.readthedocs.io/en/latest/?badge=latest) (67z) compiled for [ECCOv4](https://eccov4.readthedocs.io/en/latest/) (r2)
- [MITgcm](https://mitgcm.readthedocs.io/en/latest/?badge=latest) (version 68o) compiled for [ECCO4](https://eccov4.readthedocs.io/en/latest/)
- gfortran, MPI, and NetCDF libraries for MITgcm
- Julia, R, Python, and Octave kernels for Jupyter
- Pluto notebook support (+ Jupyter + terminal)
- Notebook support (Jupyter and Pluto)

## Directions

Expand Down Expand Up @@ -41,6 +40,6 @@ docker run -p 8888:8888 ecco-docker-1

In all cases (method 1, 2a, or 2b), the result should look like this in your web browser window :

![Screen Shot 2022-06-26 at 10 43 40 PM](https://user-images.githubusercontent.com/20276764/175850300-04fd85a4-45ac-4d88-8b32-91f585baa8cb.png)
![Screen Shot 2022-06-26 at 10 43 40 PM](https://private-user-images.githubusercontent.com/20276764/318265855-b51bb390-c127-4a1a-93e9-6fcf75331e60.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTE4ODc1NzcsIm5iZiI6MTcxMTg4NzI3NywicGF0aCI6Ii8yMDI3Njc2NC8zMTgyNjU4NTUtYjUxYmIzOTAtYzEyNy00YTFhLTkzZTktNmZjZjc1MzMxZTYwLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDAzMzElMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwMzMxVDEyMTQzN1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWUwNmFmOWE4Y2YwZmYwZjk0MDY4ZWE2MTFkYjU4Y2M0YTQ5MmEyZTExNThmYTQwMmI3YWQwMmEzNGVlOGVhNzQmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.1NZm6frwr81hBrbUGGbNXHYQEyojCNTg2Zul9b3YvZc)

_Note: this repository derives from the [JuliaClimate/Notebooks](https://github.com/JuliaClimate/Notebooks) Docker configuration._
2 changes: 1 addition & 1 deletion binder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
### DO NOT EDIT THIS FILE! This Is Automatically Generated And Will Be Overwritten ###
FROM gaelforget/ecco-docker:54d366cd1f0b
FROM gaelforget/ecco-docker:0c90d06cc0dc
3 changes: 3 additions & 0 deletions src/Project.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[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"
Expand All @@ -12,7 +13,9 @@ JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
MITgcm = "dce5fa8e-68ce-4431-a242-9469c69627a0"
MeshArrays = "cb8c808f-1acf-59a3-9d2b-6e38d009f683"
NCTiles = "4c1fdd90-559f-11e9-1abf-07ceafc4ffc0"
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"
Expand Down

0 comments on commit 50cc6ea

Please sign in to comment.