|
 |
98e6a77 |
--- mgl/mgl_data_io.cpp 2009-07-02 01:49:42.000000000 +1000
|
|
|
98e6a77 |
+++ mgl/mgl_data_io.cpp.new 2009-07-25 12:16:55.000000000 +1000
|
|
|
98e6a77 |
@@ -918,7 +918,7 @@
|
|
|
98e6a77 |
hid_t hf,hd,hs;
|
|
|
98e6a77 |
hsize_t dims[3];
|
|
|
98e6a77 |
long rank = 3, res;
|
|
|
98e6a77 |
- H5Eset_auto(0,0);
|
|
|
98e6a77 |
+ H5Eset_auto2(0,0,0);
|
|
|
98e6a77 |
res=H5Fis_hdf5(fname);
|
|
|
98e6a77 |
if(res>0 && !rewrite) hf = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
|
|
|
98e6a77 |
else hf = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
|
|
|
98e6a77 |
@@ -928,10 +928,10 @@
|
|
|
98e6a77 |
else { rank = 3; dims[0] = nz; dims[1] = ny; dims[2] = nx; }
|
|
|
98e6a77 |
hs = H5Screate_simple(rank, dims, 0);
|
|
|
98e6a77 |
#if(MGL_USE_DOUBLE==1)
|
|
|
98e6a77 |
- hd = H5Dcreate(hf, data, H5T_NATIVE_DOUBLE, hs, H5P_DEFAULT);
|
|
|
98e6a77 |
+ hd = H5Dcreate(hf, data, H5T_NATIVE_DOUBLE, hs, H5P_DEFAULT,H5P_DEFAULT);
|
|
|
98e6a77 |
H5Dwrite(hd, H5T_NATIVE_DOUBLE, hs, hs, H5P_DEFAULT, a);
|
|
|
98e6a77 |
#else
|
|
|
98e6a77 |
- hd = H5Dcreate(hf, data, H5T_NATIVE_FLOAT, hs, H5P_DEFAULT);
|
|
|
98e6a77 |
+ hd = H5Dcreate(hf, data, H5T_NATIVE_FLOAT, hs, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT);
|
|
|
98e6a77 |
H5Dwrite(hd, H5T_NATIVE_FLOAT, hs, hs, H5P_DEFAULT, a);
|
|
|
98e6a77 |
#endif
|
|
|
98e6a77 |
H5Dclose(hd); H5Sclose(hs); H5Fclose(hf);
|
|
|
98e6a77 |
@@ -943,7 +943,7 @@
|
|
|
98e6a77 |
hsize_t dims[3];
|
|
|
98e6a77 |
long rank;
|
|
|
98e6a77 |
hf = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT);
|
|
|
98e6a77 |
- hd = H5Dopen(hf,data);
|
|
|
98e6a77 |
+ hd = H5Dopen(hf,data,H5P_DEFAULT);
|
|
|
98e6a77 |
hs = H5Dget_space(hd);
|
|
|
98e6a77 |
rank = H5Sget_simple_extent_ndims(hs);
|
|
|
98e6a77 |
if(rank>0 && rank<=3)
|