Remove NetcdfFileBuffer.parse_name

variable is a (str, str) tuple of field name to variable name in the NetCDF file. variable[1] is never a list

Author: VeckoTheGecko

parcels/field.py

@@ -568,7 +568,7 @@ def from_netcdf(
                 interp_method=interp_method,
                 gridindexingtype=gridindexingtype,
             ) as filebuffer:
-                filebuffer.name = filebuffer.parse_name(variable[1])
+                filebuffer.name = variable[1]
                 if dimensions["depth"] == "not_yet_set":
                     depth = filebuffer.depth_dimensions
                     kwargs["depth_field"] = "not_yet_set"
@@ -628,7 +628,7 @@ def from_netcdf(
                 ) as filebuffer:
                     # If Field.from_netcdf is called directly, it may not have a 'data' dimension
                     # In that case, assume that 'name' is the data dimension
-                    filebuffer.name = filebuffer.parse_name(variable[1])
+                    filebuffer.name = variable[1]
                     buffer_data = filebuffer.data
                     if len(buffer_data.shape) == 4:
                         errormessage = (
@@ -1112,7 +1112,7 @@ def computeTimeChunk(self, data, tindex):
         time_data = g.time_origin.reltime(time_data)
         filebuffer.ti = (time_data <= g.time[tindex]).argmin() - 1
         if self.netcdf_engine != "xarray":
-            filebuffer.name = filebuffer.parse_name(self.filebuffername)
+            filebuffer.name = self.filebuffername
         buffer_data = filebuffer.data
         if len(buffer_data.shape) == 2:
             buffer_data = np.reshape(buffer_data, sum(((1, 1), buffer_data.shape), ()))

parcels/fieldfilebuffer.py

@@ -51,16 +51,6 @@ def close(self):
             self.dataset.close()
             self.dataset = None
 
-    def parse_name(self, name):
-        if isinstance(name, list):
-            for nm in name:
-                if hasattr(self.dataset, nm):
-                    name = nm
-                    break
-        if isinstance(name, list):
-            raise OSError("None of variables in list found in file")
-        return name
-
     @property
     def latlon(self):
         lon = self.dataset[self.dimensions["lon"]]