Change .drop to .drop_vars, solve test and some code typo

Author: hulecom

lenapy/lenapy_ocean.py

@@ -470,7 +470,7 @@ def ocean_depth(self):
     @property
     def mld_theta0(self):
 
-        theta0 = self.PT.interp(depth=10).drop("depth")
+        theta0 = self.PT.interp(depth=10).drop_vars("depth")
         mld1 = self.PT.lngeo.isosurface(
             theta0 - self.oml_theta0_threshold, "depth", upper=True
         )
@@ -491,7 +491,7 @@ def mld_theta0(self):
     @property
     def mld_theta0minus_only(self):
 
-        theta0 = self.PT.interp(depth=10).drop("depth")
+        theta0 = self.PT.interp(depth=10).drop_vars("depth")
         self.mld_theta0_ = (
             self.PT.lngeo.isosurface(
                 theta0 - self.oml_theta0_threshold, "depth", upper=True
@@ -506,7 +506,7 @@ def mld_theta0minus_only(self):
     @property
     def mld_sigma0(self):
 
-        sigma0 = self.sigma0.interp(depth=10).drop("depth")
+        sigma0 = self.sigma0.interp(depth=10).drop_vars("depth")
         self.mld_sigma0_ = (
             self.sigma0.lngeo.isosurface(
                 sigma0 + self.oml_sigma0_threshold, "depth", upper=True
@@ -524,7 +524,7 @@ def mld_sigma0var(self):
         ref["PT"] = ref["PT"] - self.oml_theta0_threshold
         self.mld_sigma0var_ = (
             self.sigma0.lngeo.isosurface(
-                ref.lnocean.sigma0.drop("depth"), "depth", upper=True
+                ref.lnocean.sigma0.drop_vars("depth"), "depth", upper=True
             )
             .rename("OMLD_sigma0var")
             .fillna(self.ocean_depth)

lenapy/readers/ocean.py

@@ -217,11 +217,11 @@ def year(f):
                     "temp": (
                         temp.groupby("time.month")
                         + climtemp.groupby("time.month").mean("time")
-                    ).drop("month"),
+                    ).drop_vars("month"),
                     "psal": (
                         sal.groupby("time.month")
                         + climsal.groupby("time.month").mean("time")
-                    ).drop("month"),
+                    ).drop_vars("month"),
                 }
             )
 
@@ -477,7 +477,7 @@ def preproc(ds):
                 ds = (
                     ds.set_index(i="longitude", j="latitude", k="Z")
                     .rename(i="longitude", j="latitude", k="depth")
-                    .drop("timestep")
+                    .drop_vars("timestep")
                 )
                 return ds.assign_coords(depth=-ds.depth)
 

lenapy/utils/geo.py

@@ -106,15 +106,15 @@ def isosurface(data, target, dim, coord=None, upper=False):
     slice0 = {dim: slice(None, -1)}
     slice1 = {dim: slice(1, None)}
 
-    field0 = data.isel(slice0).drop(coord)
-    field1 = data.isel(slice1).drop(coord)
+    field0 = data.isel(slice0).drop_vars(coord)
+    field1 = data.isel(slice1).drop_vars(coord)
 
     crossing_mask_decr = (field0 > target) & (field1 <= target)
     crossing_mask_incr = (field0 < target) & (field1 >= target)
     crossing_mask = xr.where(crossing_mask_decr | crossing_mask_incr, 1, np.nan)
 
-    coords0 = crossing_mask * data[coord].isel(slice0).drop(coord)
-    coords1 = crossing_mask * data[coord].isel(slice1).drop(coord)
+    coords0 = crossing_mask * data[coord].isel(slice0).drop_vars(coord)
+    coords1 = crossing_mask * data[coord].isel(slice1).drop_vars(coord)
     field0 = crossing_mask * field0
     field1 = crossing_mask * field1
 

lenapy/utils/gravity.py

@@ -1354,7 +1354,7 @@ def sh_to_deflection_of_vertical(
         radius=radius,
         ellipsoidal_earth=ellipsoidal_earth,
         normalization_plm=normalization_plm,
-        dtype=dtype_plm,
+        dtype_plm=dtype_plm,
         use_dask=use_dask,
         chunks_lfactor=chunks_lfactor,
         chunks_plm=chunks_plm,

lenapy/utils/harmo.py

@@ -1325,7 +1325,7 @@ def _prefix_parser(unit: str) -> float:
     ----------
     unit : str
         Unit name that may include a prefix. The function accepts common ASCII and Unicode forms for the micro prefix
-        (both 'u' and 'µ') and is case\-sensitive where relevant (e.g. 'M' for mega vs 'm' for milli).
+        (both 'u' and 'µ') and is case-sensitive where relevant (e.g. 'M' for mega vs 'm' for milli).
 
         Unit cannot be defined using 'm' for milli because it is used for meter unit,
         so 'milli' or 'mm' should be used instead. Same for 'p' for pico, 'pico' should be used instead.