hdf5: functions to private files

Author: scivision

+stdlib/+hdf5nc/h5save.m

@@ -78,31 +78,8 @@ function new_file(filename, varname, A, sizeA)
 end
 
 if isscalar(A) && ~isstring(A)
-  dcpl = 'H5P_DEFAULT';
-
-  if isfile(filename)
-    fid = H5F.open(filename, 'H5F_ACC_RDWR', dcpl);
-  else
-    fid = H5F.create(filename);
-  end
-
-  create_hdf5_group(fid, varname);
-
-  space_id = H5S.create('H5S_SCALAR');
-  t = class2h5t(A);
-  type_id = H5T.copy(t);
-  dset_id = H5D.create(fid, varname, type_id, space_id, dcpl);
-  H5D.write(dset_id,'H5ML_DEFAULT','H5S_ALL','H5S_ALL', dcpl, A);
-
-  H5S.close(space_id);
-  H5T.close(type_id);
-  H5D.close(dset_id);
-  H5F.close(fid);
-
-  return
-end
-
-if isvector(A)
+  h5_write_scalar(filename, varname, A)
+elseif isvector(A)
   h5create(filename, varname, sizeA, 'DataType', class(A))
 else
   % enable Gzip compression--remember Matlab's dim order is flipped from
@@ -117,43 +94,6 @@ function new_file(filename, varname, A, sizeA)
 end % function
 
 
-function t = class2h5t(A)
-% gets HDF5 H5T of variable A
-
-switch class(A)
-  case 'double', t = 'H5T_NATIVE_DOUBLE';
-  case 'single', t = 'H5T_NATIVE_FLOAT';
-  case 'int32', t = 'H5T_STD_I32LE';
-  case 'int64', t = 'H5T_STD_I64LE';
-  otherwise, error('h5save:class2h5t: unknown data class %s', class(A))
-end
-
-end
-
-
-function create_hdf5_group(fid, name)
-
-grps = split(name, "/");
-if length(grps) < 3
-  return
-end
-
-plist = 'H5P_DEFAULT';
-groot = H5G.open(fid, "/");
-
-for i = 0:length(grps) - 3
-  n = join(grps(1:i+2), "/");
-
-  if ~H5L.exists(groot, n, plist)
-    gid = H5G.create(fid, n, plist, plist, plist);
-    H5G.close(gid)
-  end
-end % for
-
-H5G.close(groot)
-end % function
-
-
 % Copyright 2020 Michael Hirsch
 
 % Licensed under the Apache License, Version 2.0 (the "License");

+stdlib/+hdf5nc/private/class2h5t.m

@@ -0,0 +1,12 @@
+function t = class2h5t(A)
+% gets HDF5 H5T of variable A
+
+switch class(A)
+  case 'double', t = 'H5T_NATIVE_DOUBLE';
+  case 'single', t = 'H5T_NATIVE_FLOAT';
+  case 'int32', t = 'H5T_STD_I32LE';
+  case 'int64', t = 'H5T_STD_I64LE';
+  otherwise, error('h5save:class2h5t: unknown data class %s', class(A))
+end
+
+end

+stdlib/+hdf5nc/private/create_hdf5_group.m

@@ -0,0 +1,21 @@
+function create_hdf5_group(fid, name)
+
+grps = split(name, "/");
+if length(grps) < 3
+  return
+end
+
+plist = 'H5P_DEFAULT';
+groot = H5G.open(fid, "/");
+
+for i = 0:length(grps) - 3
+  n = join(grps(1:i+2), "/");
+
+  if ~H5L.exists(groot, n, plist)
+    gid = H5G.create(fid, n, plist, plist, plist);
+    H5G.close(gid)
+  end
+end % for
+
+H5G.close(groot)
+end

+stdlib/+hdf5nc/private/h5_write_scalar.m

@@ -0,0 +1,25 @@
+function h5_write_scalar(filename, varname, A)
+%% write HDF5 scalar as a scalar
+%  h5create doesn't support scalars
+dcpl = 'H5P_DEFAULT';
+
+if isfile(filename)
+  fid = H5F.open(filename, 'H5F_ACC_RDWR', dcpl);
+else
+  fid = H5F.create(filename);
+end
+
+create_hdf5_group(fid, varname);
+
+space_id = H5S.create('H5S_SCALAR');
+t = class2h5t(A);
+type_id = H5T.copy(t);
+dset_id = H5D.create(fid, varname, type_id, space_id, dcpl);
+H5D.write(dset_id,'H5ML_DEFAULT','H5S_ALL','H5S_ALL', dcpl, A);
+
+H5S.close(space_id);
+H5T.close(type_id);
+H5D.close(dset_id);
+H5F.close(fid);
+
+end