make size,type,dims name,value pairs

Author: scivision

+hdf5nc/+tests/test_hdf5.m

@@ -13,15 +13,15 @@
 h5save(basic, '/A0', A0)
 h5save(basic, '/A1', A1)
 h5save(basic, '/A2', A2)
-h5save(basic, '/A3', A3)
+h5save(basic, '/A3', A3, "size", size(A3))
 h5save(basic, '/A4', A4)
 %% test_auto_chunk_size
 assert(isequal(auto_chunk_size([1500,2500,1000,500,100]), [12,20,8,8,2]), '5D chunk fail')
 assert(isequal(auto_chunk_size([15,250,100]), [2,32,25]), '3D chunk fail')
 assert(isequal(auto_chunk_size([15,250]), [15,250]), '2D small chunk fail')
 %% test_get_variables
 vars = h5variables(basic);
-assert(isequal(sort(vars),{'A0', 'A1', 'A2', 'A3', 'A4'}), 'missing variables')
+assert(isequal(sort(vars), ["A0", "A1", "A2", "A3", "A4"]), 'missing variables')
 %% test_exists
 e0 = h5exists(basic, '/A3');
 assert(isscalar(e0))
@@ -63,9 +63,9 @@
 s = h5read(basic, '/A4');
 assert(ndims(s)==4 && isequal(s, A4), 'A4 read')
 %% test_coerce
-h5save(basic, '/int32', A0, [], 'int32')
-h5save(basic, '/int64', A0, [], 'int64')
-h5save(basic, '/float32', A0, [], 'float32')
+h5save(basic, '/int32', A0, "type", 'int32')
+h5save(basic, '/int64', A0, "type", 'int64')
+h5save(basic, '/float32', A0, "type", 'float32')
 
 assert(isa(h5read(basic, '/int32'), 'int32'), 'int32')
 assert(isa(h5read(basic, '/int64'), 'int64'), 'int64')

+hdf5nc/+tests/test_netcdf.m

@@ -13,12 +13,12 @@
 % create test data first, so that parallel tests works
 ncsave(basic, 'A0', A0)
 ncsave(basic, 'A1', A1)
-ncsave(basic, 'A2', A2, {'x2', size(A2,1), 'y2', size(A2,2)})
-ncsave(basic, 'A3', A3, {'x3', size(A3,1), 'y3', size(A3,2), 'z3', size(A3,3)})
-ncsave(basic, 'A4', A4, {'x4', size(A4,1), 'y4', size(A4,2), 'z4', size(A4,3), 'w4', size(A4,4)})
+ncsave(basic, 'A2', A2, "dims", {'x2', size(A2,1), 'y2', size(A2,2)})
+ncsave(basic, 'A3', A3, "dims", {'x3', size(A3,1), 'y3', size(A3,2), 'z3', size(A3,3)})
+ncsave(basic, 'A4', A4, "dims", {'x4', size(A4,1), 'y4', size(A4,2), 'z4', size(A4,3), 'w4', size(A4,4)})
 %% test_get_variables
 vars = ncvariables(basic);
-assert(isequal(sort(vars),{'A0', 'A1', 'A2', 'A3', 'A4'}), 'missing variables')
+assert(isequal(sort(vars), ["A0", "A1", "A2", "A3", "A4"]), 'missing variables')
 %% test_exists
 e0 = ncexists(basic, 'A3');
 assert(isscalar(e0))
@@ -60,9 +60,9 @@
 s = ncread(basic, '/A4');
 assert(ndims(s)==4 && isequal(s, A4), 'A4 read')
 %% test_coerce
-ncsave(basic, 'int32', A0, [], 'int32')
-ncsave(basic, 'int64', A0, [], 'int64')
-ncsave(basic, 'float32', A0, [], 'float32')
+ncsave(basic, 'int32', A0, "type", 'int32')
+ncsave(basic, 'int64', A0, "type", 'int64')
+ncsave(basic, 'float32', A0, "type", 'float32')
 
 assert(isa(ncread(basic, 'int32'), 'int32'), 'int32')
 assert(isa(ncread(basic, 'int64'), 'int64'), 'int64')

+hdf5nc/coerce_ds.m

@@ -6,6 +6,8 @@
 end
 
 switch dtype
+  case ""
+    return
   case {'float64', 'double'}
     if ~isa(A, 'double')
       A = double(A);

+hdf5nc/h5save.m

@@ -1,28 +1,29 @@
-function h5save(filename, varname, A, sizeA, dtype)
+function h5save(filename, varname, A, opts)
 % H5SAVE
 % create or append to HDF5 file
 % parent folder (file directory) must already exist
 arguments
   filename (1,1) string
   varname (1,1) string
   A {mustBeNumeric,mustBeNonempty}
-  sizeA (1,:) {mustBeInteger,mustBeNonnegative} = []
-  dtype (1,1) string = ""
+  opts.size (1,:) {mustBeInteger,mustBeNonnegative} = []
+  opts.type (1,1) string = ""
 end
 
 filename = hdf5nc.expanduser(filename);
 
-if isempty(sizeA)
+if isempty(opts.size)
   if isvector(A)
     sizeA = length(A);
   else
     sizeA = size(A);
   end
+else
+  sizeA = opts.size;
 end
 % coerce if needed
-if dtype ~= ""
-  A = hdf5nc.coerce_ds(A, dtype);
-end
+A = hdf5nc.coerce_ds(A, opts.type);
+
 if ischar(A)
   A = string(A);
   sizeA = size(A);

+hdf5nc/ncsave.m

@@ -1,22 +1,18 @@
-function ncsave(filename, varname, A, ncdims, dtype)
+function ncsave(filename, varname, A, opts)
 % NCSAVE
 % create or append to NetCDF4 file
 % parent folder (file directory) must already exist
 arguments
   filename (1,1) string
   varname (1,1) string
   A {mustBeNumeric,mustBeNonempty}
-  ncdims cell = {}
-  dtype (1,1) string = ""
+  opts.dims cell = {}
+  opts.type (1,1) string = ""
 end
 
 filename = hdf5nc.expanduser(filename);
 
-if ~isempty(ncdims)
-  for i = 2:2:length(ncdims)
-    sizeA(i/2) = ncdims{i};
-  end
-else
+if isempty(opts.dims)
   if isscalar(A)
     sizeA = 1;
     ncdims = [];
@@ -34,12 +30,15 @@ function ncsave(filename, varname, A, ncdims, dtype)
       otherwise, error('ncsave currently does scalar through 4D')
     end
   end % if
+else
+  ncdims = opts.dims;
+
+  for i = 2:2:length(opts.dims)
+    sizeA(i/2) = opts.dims{i};
+  end
 end
 % coerce if needed
-if dtype ~= ""
-  A = hdf5nc.coerce_ds(A, dtype);
-end
-
+A = hdf5nc.coerce_ds(A, opts.type);
 
 if isfile(filename) && hdf5nc.ncexists(filename, varname)
   exist_file(filename, varname, A, sizeA)