h5save: check dataset vs shape if specified

geospace-code · Oct 19, 2022 · 6ffc2d6 · 6ffc2d6
1 parent 1ad73dd
commit 6ffc2d6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/+stdlib/+hdf5nc/private/defaultSize.m b/+stdlib/+hdf5nc/private/defaultSize.m
@@ -1,6 +1,7 @@
 function s = defaultSize(A)
-
-if isvector(A)
+if isscalar(A)
+  s = 0;
+elseif isvector(A)
   s = length(A);
 else
   s = size(A);

diff --git a/+stdlib/+hdf5nc/private/h5_exist_file.m b/+stdlib/+hdf5nc/private/h5_exist_file.m
@@ -5,13 +5,17 @@ function h5_exist_file(filename, varname, A, sizeA)
 diskshape = h5size(filename, varname);
 if length(diskshape) >= 2
   % start is always a row vector, regardless of shape of array
-  start = ones(1,ndims(A));
+  start = ones(1, ndims(A));
 elseif ~isempty(diskshape)
   start = 1;
 end
 
 if isempty(sizeA)
   sizeA = defaultSize(A);
+elseif all(sizeA > 0)
+  assert(numel(A) == prod(sizeA), 'hdf5nc:h5save:shape_error', "dataset # of elements %d != prod(sizeA) %d", numel(A), prod(sizeA))
+elseif ~isscalar(sizeA)
+  error('hdf5nc:h5save:shape_error', "only scalar size may be 0")
 end
 
 if isscalar(A)

diff --git a/+stdlib/+hdf5nc/private/h5_new_file.m b/+stdlib/+hdf5nc/private/h5_new_file.m
@@ -1,13 +1,11 @@
 function h5_new_file(filename, varname, A, sizeA)
 
 if isempty(sizeA)
-  if isscalar(A)
-    sizeA = 0;
-  elseif isvector(A)
-    sizeA = length(A);
-  else
-    sizeA = size(A);
-  end
+  sizeA = defaultSize(A);
+elseif all(sizeA > 0)
+  assert(numel(A) == prod(sizeA), 'hdf5nc:h5save:shape_error', "dataset # of elements %d != prod(sizeA) %d", numel(A), prod(sizeA))
+elseif ~isscalar(sizeA)
+  error('hdf5nc:h5save:shape_error', "only scalar size may be 0")
 end
 
 if isscalar(sizeA)