Fix Scipy and other updates

OGGM · Feb 11, 2023 · 616bedc · 616bedc
1 parent 197b2f2
commit 616bedc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/oggm/core/centerlines.py b/oggm/core/centerlines.py
@@ -513,7 +513,7 @@ def _filter_lines_slope(lines, heads, topo, gdir, min_slope):
     # (0, 0) is also located in the center of the pixel
     xy = (np.arange(0, gdir.grid.ny-0.1, 1),
           np.arange(0, gdir.grid.nx-0.1, 1))
-    interpolator = RegularGridInterpolator(xy, topo)
+    interpolator = RegularGridInterpolator(xy, topo.astype(np.float64))
 
     olines = [lines[0]]
     oheads = [heads[0]]
@@ -1271,7 +1271,7 @@ def compute_downstream_bedshape(gdir):
         x = nc.variables['x'][:]
         y = nc.variables['y'][:]
     xy = (np.arange(0, len(y)-0.1, 1), np.arange(0, len(x)-0.1, 1))
-    interpolator = RegularGridInterpolator(xy, topo)
+    interpolator = RegularGridInterpolator(xy, topo.astype(np.float64))
 
     bs, terrain_heights = _parabolic_bed_from_topo(gdir, cl, interpolator)
     assert len(bs) == cl.nx, 'len(bs) == cl.nx'
@@ -1732,7 +1732,7 @@ def initialize_flowlines(gdir):
     # (0, 0) is also located in the center of the pixel
     xy = (np.arange(0, gdir.grid.ny-0.1, 1),
           np.arange(0, gdir.grid.nx-0.1, 1))
-    interpolator = RegularGridInterpolator(xy, topo)
+    interpolator = RegularGridInterpolator(xy, topo.astype(np.float64))
 
     # Smooth window
     sw = cfg.PARAMS['flowline_height_smooth']

diff --git a/oggm/tests/test_prepro.py b/oggm/tests/test_prepro.py
@@ -666,7 +666,7 @@ def test_downstream_bedshape(self):
                 x = nc.variables['x'][:]
                 y = nc.variables['y'][:]
             xy = (np.arange(0, len(y) - 0.1, 1), np.arange(0, len(x) - 0.1, 1))
-            interpolator = RegularGridInterpolator(xy, topo)
+            interpolator = RegularGridInterpolator(xy, topo.astype(np.float64))
 
             zref = [interpolator((p.xy[1][0], p.xy[0][0])) for p in points]
 

diff --git a/oggm/utils/_funcs.py b/oggm/utils/_funcs.py
@@ -741,7 +741,10 @@ def filter_rgi_name(name):
     This seems to be unnecessary with RGI V6
     """
 
-    if name is None or len(name) == 0:
+    try:
+        if name is None or len(name) == 0:
+            return ''
+    except TypeError:
         return ''
 
     if name[-1] in ['À', 'È', 'è', '\x9c', '3', 'Ð', '°', '¾',

diff --git a/oggm/utils/_workflow.py b/oggm/utils/_workflow.py
@@ -2617,7 +2617,6 @@ def __init__(self, rgi_entity, base_dir=None, reset=False,
             self.rgi_subregion = (self.rgi_region + '-' +
                                   '{:02d}'.format(int(rgi_entity.O2Region)))
 
-
         try:
             name = str(rgi_entity.name)
             rgi_datestr = rgi_entity.src_date