Globsim 4.0

.github/workflows/tests.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.11,3.12]
 
     steps:
     - uses: actions/checkout@v2
@@ -34,6 +34,7 @@ jobs:
         sudo apt-get install libhdf5-serial-dev netcdf-bin libnetcdf-dev
         python -m pip install --upgrade pip
         pip install flake8
+        python -m pip install setuptools
         python -m pip install -r requirements.txt
         python -m pip install pygrib 
         python -m pip install xarray

globsim/_version.py

@@ -1,3 +1,3 @@
-__version__ = "3.9.3"
+__version__ = "4.0.0"
 
 

globsim/boundingbox.py

@@ -62,9 +62,51 @@ def stations_bbox(stations) -> BoundingBox:
 
 
 def netcdf_bbox(ncf: "Union[str, nc.Dataset]") -> BoundingBox:
+
     if isinstance(ncf, str):
         ncf = nc.Dataset(ncf)
+    if isinstance(ncf, nc.Dataset):
+        x,y = _nc_get_lat_lon(ncf)
+        xval = x[:]
+        yval = y[:]
+
+    else:  # XARRAY
+        x,y = _xr_get_lat_lon(ncf)
+        xval = x.values
+        yval = y.values
+
+    bbx = BoundingBox(np.min(xval), np.max(xval), np.min(yval), np.max(yval))
+
+    return bbx
+
+
+def _xr_get_lat_lon(xrf):
+    # TODO: implement this
+    return xrf['longitude'], xrf['latitude']
 
+    x = xrf.filter_by_attrs(axis='X')
+    if not x:
+        x = xrf.filter_by_attrs(standard_name='longitude')
+    if not x:
+        x = xrf.filter_by_attrs(long_name='longitude')
+    if not x:
+        x = xrf['longitude'] if 'longitude' in xrf.coords else None
+    if not x:
+        raise KeyError("Could not find x-coordinate")
+
+    y = xrf.filter_by_attrs(axis='Y')
+    if not y:
+        y = xrf.filter_by_attrs(standard_name='latitude')
+    if not y:
+        y = xrf.filter_by_attrs(long_name='latitude')
+    if not y:
+        y = xrf['latitude'] if 'latitude' in xrf.coords else None
+    if not y:
+        raise KeyError("Could not find y-coordinate")
+
+    return x, y
+
+def _nc_get_lat_lon(ncf):
     x = ncf.get_variables_by_attributes(axis='X')
     if not x:
         x = ncf.get_variables_by_attributes(standard_name='longitude')
@@ -84,15 +126,8 @@ def netcdf_bbox(ncf: "Union[str, nc.Dataset]") -> BoundingBox:
         y = ncf['latitude'] if 'latitude' in ncf.variables else None
     if not y:
         raise KeyError("Could not find y-coordinate")
-
-    xval = x[:]
-    yval = y[:]
-
-    bbx = BoundingBox(np.min(xval), np.max(xval), np.min(yval), np.max(yval))
-
-    return bbx
-
-
+
+    return x,y
 """
 
 from collections import namedtuple

globsim/common_utils.py

@@ -36,8 +36,8 @@ def variables_skip(variable_name):
     Which variable names to use? Drop the ones that are dimensions.
     """
     skip = 0
-    dims = ('time', 'number', 'level',
-            'latitude', 'longitude', 'station', 'height')
+    dims = ('time', 'number', 'level','valid_time', 'pressure_level','expver',
+            'latitude', 'longitude', 'station', 'height', 'skip')
     if variable_name in dims:
         skip = 1
     return skip
@@ -153,7 +153,6 @@ def create_globsim_directory(target_dir, name):
     mkdir(TL)
 
     # create subdirectories
-    mkdir(path.join(TL, "eraint"))
     mkdir(path.join(TL, "Grib"))
     mkdir(path.join(TL, "jra55"))
     mkdir(path.join(TL, "merra2"))
@@ -204,3 +203,4 @@ def get_begin_date(par, data_folder, match_strings):
 
     print("Found some files in directory. Beginning download on {}".format(begin_date.strftime("%Y-%m-%d")))
     return(begin_date)
+