Fixes to allow successfull use of subarray_shape in s3nc_cfa_split.py

Author: nmassey001

S3netCDF4/CFA/_CFAClasses.pyx

@@ -425,13 +425,13 @@ cdef class CFAGroup:
                 )
             else:
                 # check the size of the specified subarray
-                if len(subarray_shape) != len(dim_names):
+                if subarray_shape.size != len(dim_names):
                     raise CFASubArrayError(
                         "Number of dimensions in subarray_shape does not match"
                         " those in shape."
                     )
                 # check each dimension is not longer than that in array
-                for i in range(0, len(subarray_shape)):
+                for i in range(0, subarray_shape.size):
                     if subarray_shape[i] > self.cfa_dims[dim_names[i]].getLen():
                         raise CFASubArrayError(
                             "Dimension in desired sub_array is larger than"
@@ -902,10 +902,16 @@ cdef class CFAVariable:
         """Create the file name path that is common between all subarray files"""
         # create the base filename
         file_path = self.getGroup().getDataset().getName()
-        # trim the ".nc" off the end
-        file_path = file_path.replace(".nc", "")
-        # get just the filename, stripped of ".nc"
-        file_name = os.path.basename(file_path).replace(".nc", "")
+        # trim the ".nc" or ".nca" off the end
+        if ".nca" in file_path: # note order is important as nca contains nc
+            sf = ".nca"
+        elif ".nc" in file_path:
+            sf = ".nc"
+        else:
+            sf = ""
+        file_path = file_path.replace(sf, "")
+        # get just the filename, stripped of ".nc" or ".nca"
+        file_name = os.path.basename(file_path).replace(sf, "")
         # construct the base path of the subarray filenames
         base_filename = file_path + "/" + file_name
         # add the group if it is not root

bin/s3nc_cfa_split.py

@@ -35,7 +35,20 @@ def copy_vars(nc_object, s3_object, subarray_size, subarray_shape=[]):
             fill_value = None
         # create the variable - the createVariable method needs to distinguish
         # between whether the shape or size has been passed in
+        # Also, if the subarray_shape has been passed in then only attempt to
+        # do it for variables with the same number of dimensions as the subarray
+        # shape.
+        use_shape = False
         if subarray_shape!=[]:
+            shape_list = [int(x) for x in subarray_shape.strip("[]").split(",")]
+            shape_array = np.array(shape_list)
+            # check if shape_array.size is the same as the number of dims in the
+            # netCDF variable
+            if(shape_array.size == nc_var.ndim):
+                use_shape = True
+
+        if use_shape:
+            # subarray shape at this moment is a string, [a,b,c,d]
             s3_var = s3_object.createVariable(
                         # can only fill in endian from original dataset as
                         # other initialisation variables are not stored in the
@@ -45,7 +58,7 @@ def copy_vars(nc_object, s3_object, subarray_size, subarray_shape=[]):
                         endian=nc_var.endian(),
                         fill_value=fill_value,
                         dimensions=nc_var.dimensions,
-                        max_subarray_shape=subarray_shape)
+                        subarray_shape=shape_array)
         else:
             s3_var = s3_object.createVariable(
                         # can only fill in endian from original dataset as
@@ -209,7 +222,7 @@ def split_into_CFA(output_path, input_path,
 
     parser.add_argument(
         "--subarray_shape", action="store", default=[],
-        metavar="<subarray shape>",
+        metavar="<subarray_shape>",
         help=(
             "Shape for the subarray files (optional).  Without this argument, "
             "the shape will be automatically determined."

setup.py

@@ -104,7 +104,7 @@
 
 setup(
     name='S3netCDF4',
-    version='2.0.10',
+    version='2.0.11',
     packages=['S3netCDF4'],
     install_requires=[
       'numpy>=1.19.0',