Merge branch 'cfa-in-cfdm' into numpy-v2-from-cfa-in-cfdm

Author: davidhassell

cf/read_write/read.py

@@ -763,6 +763,7 @@ def __new__(
                             unsqueeze=unsqueeze,
                             domain=domain,
                             file_type=file_type,
+                            unpack=unpack,
                         )
                     except DatasetTypeError as error:
                         if file_type is None:

cf/read_write/um/umread.py

@@ -491,6 +491,7 @@ def __init__(
         info=False,
         squeeze=False,
         unsqueeze=False,
+        unpack=True,
         **kwargs,
     ):
         """**Initialisation**
@@ -559,6 +560,17 @@ def __init__(
 
                 .. versionadded:: NEXTVERSION
 
+            unpack: `bool`, optional
+                If True, the default, then unpack arrays by convention
+                when the data is read from disk.
+
+                Unpacking is determined by netCDF conventions for the
+                following variable attributes ``add_offset`` and
+                ``scale_factor``, as applied to lookup header entries
+                BDATUM and BMKS repectively.
+
+                .. versionadded:: NEXTVERSION
+
             kwargs: *optional*
                 Keyword arguments providing extra CF properties for each
                 return field construct.
@@ -579,6 +591,7 @@ def __init__(
         self.height_at_top_of_model = height_at_top_of_model
         self.byte_ordering = byte_ordering
         self.word_size = word_size
+        self.unpack = unpack
 
         self.atol = cf_atol()
 
@@ -2025,6 +2038,7 @@ def create_data(self):
         klass_name = UMArray().__class__.__name__
 
         fmt = self.fmt
+        unpack = self.unpack
 
         if len(recs) == 1:
             # --------------------------------------------------------
@@ -2050,6 +2064,7 @@ def create_data(self):
                 word_size=self.word_size,
                 byte_ordering=self.byte_ordering,
                 attributes=attributes,
+                unpack=unpack,
             )
 
             key = f"{klass_name}-{tokenize(subarray)}"
@@ -2103,6 +2118,7 @@ def create_data(self):
                         word_size=word_size,
                         byte_ordering=byte_ordering,
                         attributes=attributes,
+                        unpack=unpack,
                     )
 
                     key = f"{klass_name}-{tokenize(subarray)}"
@@ -2153,6 +2169,7 @@ def create_data(self):
                         word_size=word_size,
                         byte_ordering=byte_ordering,
                         attributes=attributes,
+                        unpack=unpack,
                     )
 
                     key = f"{klass_name}-{tokenize(subarray)}"
@@ -3392,6 +3409,7 @@ def read(
         domain=False,
         file_type=None,
         ignore_unknown_type=False,
+        unpack=True,
     ):
         """Read fields from a PP file or UM fields file.
 
@@ -3474,6 +3492,17 @@ def read(
 
                 .. versionadded:: NEXTVERSION
 
+            unpack: `bool`, optional
+                If True, the default, then unpack arrays by convention
+                when the data is read from disk.
+
+                Unpacking is determined by netCDF conventions for the
+                following variable attributes ``add_offset`` and
+                ``scale_factor``, as applied to lookup header entries
+                BDATUM and BMKS repectively.
+
+                .. versionadded:: NEXTVERSION
+
         :Returns:
 
             `list`
@@ -3555,6 +3584,7 @@ def read(
                 implementation=self.implementation,
                 select=select,
                 info=info,
+                unpack=unpack,
             )
             for var in f.vars
         ]