Merge branch 'main' into joss-paper

COSIMA · Aug 5, 2024 · 5d3d1ae · 5d3d1ae
2 parents 226e4a0 + 4781919
commit 5d3d1ae
Show file tree

Hide file tree

Showing 7 changed files with 344 additions and 173 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -24,7 +24,7 @@ jobs:
         shell: bash -el {0}
     strategy:
       matrix:
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.12"]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/demos/premade_run_directories/common_files/MOM_input b/demos/premade_run_directories/common_files/MOM_input
@@ -72,6 +72,7 @@ TOPO_CONFIG = "file"            !
                                 !     Phillips - ACC-like idealized topography used in the Phillips config.
                                 !     dense - Denmark Strait-like dense water formation and overflow.
                                 !     USER - call a user modified routine.
+TOPO_FILE = "bathymetry.nc"     ! Name of the file containing bathymetry information. 
 MINIMUM_DEPTH = 4.5             !   [m] default = 0.0
                                 ! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is
                                 ! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is

diff --git a/demos/reanalysis-forced.ipynb b/demos/reanalysis-forced.ipynb
@@ -288,16 +288,14 @@
     "    glorys_path / \"ic_unprocessed.nc\", # directory where the unprocessed initial condition is stored, as defined earlier\n",
     "    ocean_varnames,\n",
     "    arakawa_grid=\"A\"\n",
-    "    )\n",
+    "    )    \n",
     "\n",
-    "# Now iterate through our four boundaries \n",
-    "for i, orientation in enumerate([\"south\", \"north\", \"west\", \"east\"]):\n",
-    "    expt.rectangular_boundary(\n",
-    "        glorys_path / (orientation + \"_unprocessed.nc\"),\n",
+    "# Set up the four boundary conditions. Remember that in the glorys_path, we have four boundary files names north_unprocessed.nc etc. \n",
+    "expt.rectangular_boundaries(\n",
+    "        glorys_path,\n",
     "        ocean_varnames,\n",
-    "        orientation,    # Needs to know the cardinal direction of the boundary\n",
-    "        i + 1,          # Just a number to identify the boundary. Indexes from 1 \n",
-    "        arakawa_grid=\"A\"\n",
+    "        boundaries = [\"south\", \"north\", \"west\", \"east\"],\n",
+    "        arakawa_grid = \"A\"\n",
     "        )"
    ]
   },

diff --git a/environment-ci.yml b/environment-ci.yml
@@ -3,3 +3,4 @@ channels:
   - conda-forge
 dependencies:
   - esmpy
+  - numpy<2.0.0
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,7 +12,7 @@ dependencies = [
   "dask[array]",
   "dask[distributed]",
   "netCDF4",
-  "numpy >= 1.17.0",
+  "numpy >= 1.17.0, < 2.0.0",
   "scipy >= 1.2.0",
   "xarray",
   "xesmf >= 0.8.4",