Merge branch 'main' into ak-nb-edit

COSIMA · Apr 23, 2024 · 20a5b22 · 20a5b22
2 parents 848d64e + 102c5f9
commit 20a5b22
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/demos/access_om2-forced.ipynb b/demos/access_om2-forced.ipynb
@@ -22,14 +22,6 @@
     "Additionally, you'll need access to `/g/data/x77/` if you want to use the same executable using the latest FMS build (a good idea for troubleshooting)."
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "To use your own version of the `regional_mom6` package, clone the entire [github repository](https://github.com/COSIMA/regional-mom6)\n",
-    "on your machine and set the regional-mom6 path using the `os` library, as shown below:"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -38,10 +30,9 @@
    },
    "outputs": [],
    "source": [
-    "import os\n",
-    "os.chdir(\"/g/data/v45/nc3020/dhruvs-regional-mom6/\")\n",
-    "\n",
     "import regional_mom6 as rmom6\n",
+    "\n",
+    "import os\n",
     "import xarray as xr\n",
     "from pathlib import Path\n",
     "from dask.distributed import Client"
@@ -140,8 +131,8 @@
    "source": [
     "expt_name = \"tassie-access-om2-forced\"\n",
     "\n",
-    "latitude_extent = [-48, -38.95]\n",
-    "longitude_extent = [143, 150]\n",
+    "latitude_extent = (-48, -38.95)\n",
+    "longitude_extent = (143, 150)\n",
     "\n",
     "date_range = [\"2003-01-01 00:00:00\", \"2003-01-05 00:00:00\"]\n",
     "\n",

diff --git a/demos/reanalysis-forced.ipynb b/demos/reanalysis-forced.ipynb
@@ -44,8 +44,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import os\n",
     "import regional_mom6 as rmom6\n",
+    "\n",
+    "import os\n",
     "from pathlib import Path\n",
     "from dask.distributed import Client"
    ]
@@ -386,7 +387,7 @@
     "\n",
     "Ideally, MOM6 runs. If not, the first thing you should try is reducing the timestep. You can do this by adding `#override DT=XXXX` to your `MOM_override` file. \n",
     "\n",
-    "If there's strange behaviour on your boundaries, you could play around with the `nudging timescale` (an example is already included in the `MOM_override` file). Sometimes, if your boundary has a lot going on (like all of the eddies spinning off the ACC), it can be hard to avoid these edge effects. This is because the chaotic, submesoscale structures developed within the regional domain won't match the flow at the boundary. \n",
+    "If there's strange behaviour on your boundaries, you could play around with the `nudging timescale` (an example is already included in the `MOM_override` file). Sometimes, if your boundary has a lot going on (like all of the eddies spinning off the western boundary currents or off the Antarctic Circumpolar current), it can be hard to avoid these edge effects. This is because the chaotic, submesoscale structures developed within the regional domain won't match the flow at the boundary. \n",
     "\n",
     "Another thing that can go wrong is little bays that create non-advective cells at your boundaries. Keep an eye out for tiny bays where one side is taken up by a boundary segment. You can either fill them in manually, or move your boundary slightly to avoid them"
    ]

diff --git a/regional_mom6/regional_mom6.py b/regional_mom6/regional_mom6.py
@@ -925,8 +925,8 @@ def setup_bathymetry(
         self,
         *,
         bathymetry_path,
-        longitude_coordinate_name="lat",
-        latitude_coordinate_name="lon",
+        longitude_coordinate_name="lon",
+        latitude_coordinate_name="lat",
         vertical_coordinate_name="elevation",
         fill_channels=False,
         minimum_layers=3,