dev

Author: davidhassell

cf/data/array/zarrarray.py

@@ -1,11 +1,12 @@
 import cfdm
 
 from ...mixin_container import Container
-#from .mixin import ActiveStorageMixin
+
+# from .mixin import ActiveStorageMixin
 
 
 class ZarrArray(
-#    ActiveStorageMixin,
+    #    ActiveStorageMixin,
     Container,
     cfdm.ZarrArray,
 ):

cf/read_write/read.py

@@ -556,7 +556,8 @@ def _finalise(self):
         UM = "UM" in self.unique_dataset_categories
 
         # ----------------------------------------------------------------
-        # Select matching fields from non-UM files (before aggregation)
+        # Select matching constructs from non-UM files (before
+        # aggregation)
         # ----------------------------------------------------------------
         select = self.select
         if select and not UM:
@@ -585,8 +586,8 @@ def _finalise(self):
                     del f._custom["standard_name"]
 
         # ----------------------------------------------------------------
-        # Select matching fields from UM files (post setting of their
-        # standard names)
+        # Select matching constructs from UM files (after setting
+        # their standard names)
         # ----------------------------------------------------------------
         if select and UM:
             self.constructs = self.constructs.select_by_identity(*select)
@@ -679,7 +680,7 @@ def _read(self, dataset):
         # ------------------------------------------------------------
         super()._read(dataset)
 
-        if self.dataset_contents:
+        if self.dataset_contents is not None:
             return
 
         # ------------------------------------------------------------
@@ -694,13 +695,13 @@ def _read(self, dataset):
                 um_kwargs = {
                     key: kwargs[key]
                     for key in (
-                        "verbose",
                         "height_at_top_of_model",
                         "squeeze",
                         "unsqueeze",
                         "domain",
-                        "file_type",
+                        "dataset_type",
                         "unpack",
+                        "verbose",
                     )
                 }
                 um_kwargs["set_standard_name"] = False
@@ -725,14 +726,14 @@ def _read(self, dataset):
                 # Successfully read the dataset
                 self.unique_dataset_categories.add("UM")
 
-        if self.dataset_contents:
+        if self.dataset_contents is not None:
             return
 
         # ------------------------------------------------------------
         # Try to read as a GRIB dataset
-        # ------------------------------------------------------------
-        # Not yet available! The framework will be:
         #
+        # Not yet available! The framework will be:
+        # ------------------------------------------------------------
         # if dataset_type is None or dataset_type.intersection(
         #     self.GRIB_dataset_types
         # ):
@@ -743,19 +744,19 @@ def _read(self, dataset):
         #             <ADD SOME CODE HERE>
         #         }
         #
-        #         self.um_read = partial(
+        #         self.grib_read = partial(
         #             GRIBRead(self.implementation).read, **grib_kwargs
         #         )
         #
         #     try:
         #         # Try to read the dataset
-        #         self.dataset_contents = self.grid_read(dataset)
+        #         self.dataset_contents = self.grib_read(dataset)
         #     except DatasetTypeError as error:
         #         if dataset_type is None:
         #             self.dataset_format_errors.append(error)
         #     else:
         #         # Successfully read the dataset
         #         self.unique_dataset_categories.add("GRIB")
         #
-        # if self.dataset_contents:
+        # if self.dataset_contents is not None:
         #     return

cf/read_write/um/umread.py

@@ -3407,7 +3407,7 @@ def read(
         squeeze=False,
         unsqueeze=False,
         domain=False,
-        file_type=None,
+        dataset_type=None,
         ignore_unknown_type=False,
         unpack=True,
     ):
@@ -3555,14 +3555,14 @@ def read(
             byte_ordering = None
 
         # ------------------------------------------------------------
-        # Parse the 'file_type' keyword parameter
+        # Parse the 'dataset_type' keyword parameter
         # ------------------------------------------------------------
-        if file_type is not None:
-            if isinstance(file_type, str):
-                file_type = (file_type,)
+        if dataset_type is not None:
+            if isinstance(dataset_type, str):
+                dataset_type = (dataset_type,)
 
-            file_type = set(file_type)
-            if not file_type.intersection(("UM",)):
+            dataset_type = set(dataset_type)
+            if not dataset_type.intersection(("UM",)):
                 # Return now if there are valid file types
                 return []