Merge pull request #21 from kthyng/main

Get up to date

Author: hetland

.github/workflows/pre-commit.yml

@@ -11,8 +11,6 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - uses: actions/setup-python@v1
-    - name: set PY
-      run: echo "::set-env name=PY::$(python --version --version | sha256sum | cut -d' ' -f1)"
     - uses: actions/cache@v1
       with:
         path: ~/.cache/pre-commit

xroms/interp.py

@@ -2,6 +2,7 @@
 Interpolation functions.
 """
 
+import sys
 import warnings
 
 import numpy as np
@@ -13,8 +14,8 @@
 
 try:
     import xesmf as xe
-except ImportError:
-    warnings.warn("xESMF is not installed, so `interpll` will not run.", ImportWarning)
+except ModuleNotFoundError:
+    warnings.warn("xESMF is not installed, so `interpll` will not run.")
 
 
 def interpll(var, lons, lats, which="pairs"):
@@ -59,6 +60,13 @@ def interpll(var, lons, lats, which="pairs"):
     >>> xroms.interpll(var, [-96, -97, -96.5], [26.5, 27, 26.5], which='grid')
     """
 
+    # make sure that xesmf was read in for this function to run
+    try:
+        xe
+    except NameError:
+        print("xESMF is not installed, so `interpll` will not run.")
+        return
+
     # rename coords for use with xESMF
     lonkey = [coord for coord in var.coords if "lon_" in coord][0]
     latkey = [coord for coord in var.coords if "lat_" in coord][0]

xroms/roms_seawater.py

@@ -143,8 +143,9 @@ def density(temp, salt, z=None):
         var.attrs["long_name"] = "density"
         var.attrs["units"] = "kg/m^3"  # inherits grid from temp
         var.name = var.attrs["name"]
-        var.coords["lon_rho"].attrs["standard_name"] = "longitude"
-        var.coords["lat_rho"].attrs["standard_name"] = "latitude"
+        if "lon_rho" in var:
+            var.coords["lon_rho"].attrs["standard_name"] = "longitude"
+            var.coords["lat_rho"].attrs["standard_name"] = "latitude"
 
     return var
 

xroms/tests/test_accessor.py

@@ -531,7 +531,7 @@ def test_to_grid():
 
 def test_sel2d():
     lon0, lat0 = -94.8, 28.0
-    testvars = ["salt", "u", "v", "z_w"]
+    testvars = ["salt", "u", "v"]
     for testvar in testvars:
         acc = ds[testvar].xroms.sel2d(lon0, lat0)
         out = xroms.sel2d(
@@ -556,7 +556,7 @@ def test_sel2d():
 
 def test_argsel2d():
     lon0, lat0 = -94.8, 28.0
-    testvars = ["salt", "u", "v", "z_w"]
+    testvars = ["salt", "u", "v"]
     for testvar in testvars:
         inds = ds[testvar].xroms.argsel2d(lon0, lat0)
         outinds = xroms.argsel2d(
@@ -566,7 +566,7 @@ def test_argsel2d():
 
 
 def test_gridmean():
-    testvars = ["salt", "u", "v", "z_w"]
+    testvars = ["salt", "u", "v"]
     for testvar in testvars:
         for axis in ["Z", "Y", "X"]:
             var1 = ds[testvar].xroms.gridmean(axis)
@@ -575,7 +575,7 @@ def test_gridmean():
 
 
 def test_gridsum():
-    testvars = ["salt", "u", "v", "z_w"]
+    testvars = ["salt", "u", "v"]
     for testvar in testvars:
         for axis in ["Z", "Y", "X"]:
             var1 = ds[testvar].xroms.gridsum(axis)
@@ -586,7 +586,7 @@ def test_gridsum():
 def test_interpll():
     ie, ix = 2, 3
     indexer = {"eta_rho": [ie], "xi_rho": [ix]}
-    testvars = ["salt", "u", "v", "z_w"]
+    testvars = ["salt", "u", "v"]
     for testvar in testvars:
         var1 = xroms.interpll(
             ds[testvar], ds.lon_rho.isel(indexer), ds.lat_rho.isel(indexer)
@@ -598,7 +598,7 @@ def test_interpll():
 
 
 def test_zslice():
-    testvars = ["salt", "u", "v", "z_w"]
+    testvars = ["salt", "u", "v"]
     for testvar in testvars:
         varin = ds[testvar]
         depths = np.asarray(ds[testvar].cf["vertical"][0, :, 0, 0].values)