mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-21 01:04:10 +08:00
b24130dcf0
---------------------- ./configure.in ./src/H5Fprivate.h ./src/H5Fsec2.c We now detect and use lseek64() on systems that have it (e.g., Irix64) and are able to generate >2GB files on Irix XFS file systems (and anything else that supports large files). This change also removed some warning messages from the Irix `-64' compiler. > $ ls -l istore.h5 > -rw-r--r-- 1 matzke meshtv 8605436856 Feb 17 14:03 istore.h5 ./configure.in ./src/H5Fprivate.h ./src/H5Fstdio.h We now detect and use fseek64() on systems that have it (e.g., Irix64) and are able to generate >2GB files on Irix XFS file systems (and anything else that supports large files). This change also removed some warning messages from the Iris `-64' compiler. ./src/H5E.c ./src/H5Epublic.h Added the H5E_OVERFLOW error to signal file address overflow. ./src/H5Fpublic.h ./examples/h5_chunk_read.c ./examples/h5_compound.c ./examples/h5_extend_write.c ./examples/h5_group.c ./examples/h5_read.c ./examples/h5_write.c ./html/Datasets.html ./html/Files.html ./html/H5.api.html ./html/H5.intro.html ./html/H5.sample_code.html ./html/ph5example.c ./html/review1.html ./test/cmpd_dset.c ./test/dsets.c ./test/extend.c ./test/tfile.c ./test/th5p.c ./test/theap.c ./test/tohdr.c ./test/tstab.c ./testpar/phdf5.c Renamed file access constants to follow the naming scheme. Also changed the base names a little to be more accurate as to what they do. The old names H5ACC_WRITE and H5ACC_OVERWRITE will temporarily work. H5ACC_DEFAULT --> H5F_ACC_RDONLY for H5Fopen() H5ACC_DEFAULT --> H5F_ACC_EXCL for H5Fcreate() H5ACC_WRITE --> H5F_ACC_RDWR H5ACC_OVERWRITE --> H5F_ACC_TRUNC Albert or Kim: The H5ACC_INDEPENDENT and H5ACC_COLLECTIVE macros in H5Fpublic.h should be an enum typedef and have names more like H5F_MPIO_INDEPENDENT and H5F_MPIO_COLLECTIVE. Also change the access_mode argument of H5Cset_mpio(). H5Fcreate() and H5Fopen() are more strict now about which flags are acceptable for the operation. ./src/H5Fprivate.h ./src/H5F.c ./src/H5C.c Changed the file access template to make it more general. A union contains a struct for each type of low-level driver and the default template is initialized at run-time. ./src/H5Fpublic.h ./src/H5F.c Added H5Fget_access_template() and cleaned up H5Fget_create_template(). ./src/H5C.c The H5Cset_mpi() no longer trashes the file access template when an error is detected. We check for errors and *then* update the file access template. Added H5C_close() so Albert and Kim have a place to release the MPI communicator and info from the file access property list. Kim or Albert: I notice in H5Cset_mpi() you copy the MPI communicator. Do you need to do something similar in H5C_copy()? ./src/H5F.c Added more error checking for the file creation and access property lists because it used to be possible to make the library dump core by swapping the creation and access property list ID numbers of H5Fcreate(). ./test/istore.c ./test/tfile.c ./test/th5p.c ./test/theap.c ./test/tohdr.c ./test/tstab.c ./testpar/testphdf5.c One must pass H5C_DEFAULT as the file creation or access property list in order to get the default property list. It is no longer possible to pass zero or any other arbitrary bad object ID. ./src/H5Fcore.c ./src/H5Ffamly.c ./src/H5Flow.c ./src/H5Fmpio.c ./src/H5Fsec2.c ./src/H5Fsplit.c ./src/H5Fstdio.c ./src/H5MF.c The file access property list is passed to all H5F_low_...() functions and to the drivers. ./src/H5Fcore.c The block size can be set at run time on a per-file basis instead of at compile time across all files. The "5000 items in a group test" now takes 1.6 seconds. ./src/H5private.h Removed inclusion of mpi.h and mpio.h since they're included from H5public.h. ./src/H5Cpublic.h ./src/H5C.c Added H5Cset_stdio(), H5Cset_sec2(), H5Cset_core(), H5Cset_split(), and H5Cset_family() in addition to the H5Cset_mpio() that Kim and Albert already wrote. We still need the H5Cget_driver() and an H5Cget...() counterpart for each of those functions. The split and family drivers still need a little work but I'm checking this in anyway.
156 lines
3.2 KiB
C
156 lines
3.2 KiB
C
/*
|
|
* This example shows how to create a compound data type,
|
|
* write an array which has the compound data type to the file,
|
|
* and read back fields' subsets.
|
|
*/
|
|
|
|
#include "hdf5.h"
|
|
|
|
#define FILE "SDScompound.h5"
|
|
#define DATASETNAME "ArrayOfStructures"
|
|
#define LENGTH 10
|
|
#define RANK 1
|
|
|
|
main()
|
|
|
|
{
|
|
|
|
|
|
/* First structure and dataset*/
|
|
typedef struct s1_t {
|
|
int a;
|
|
float b;
|
|
double c;
|
|
} s1_t;
|
|
s1_t s1[LENGTH];
|
|
hid_t s1_tid; /* File datatype hadle */
|
|
|
|
/* Second structure (subset of s1_t) and dataset*/
|
|
typedef struct s2_t {
|
|
double c;
|
|
int a;
|
|
} s2_t;
|
|
s2_t s2[LENGTH];
|
|
hid_t s2_tid; /* Memory datatype handle */
|
|
|
|
/* Third "structure" ( will be used to read float field of s1) */
|
|
hid_t s3_tid; /* Memory datatype handle */
|
|
float s3[LENGTH];
|
|
|
|
int i;
|
|
hid_t file, datatype, dataset, space; /* Handles */
|
|
herr_t status;
|
|
size_t dim[] = {LENGTH}; /* Dataspace dimensions */
|
|
|
|
H5T_class_t class;
|
|
size_t size;
|
|
|
|
/*
|
|
* Initialize the data
|
|
*/
|
|
for (i = 0; i< LENGTH; i++) {
|
|
s1[i].a = i;
|
|
s1[i].b = i*i;
|
|
s1[i].c = 1./(i+1);
|
|
}
|
|
|
|
/*
|
|
* Create the data space.
|
|
*/
|
|
space = H5Pcreate_simple(RANK, dim, NULL);
|
|
|
|
/*
|
|
* Create the file.
|
|
*/
|
|
file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5C_DEFAULT, H5C_DEFAULT);
|
|
|
|
/*
|
|
* Create the memory data type.
|
|
*/
|
|
s1_tid = H5Tcreate (H5T_COMPOUND, sizeof(s1_t));
|
|
status = H5Tinsert(s1_tid, "a_name", HPOFFSET(s1, a), H5T_NATIVE_INT);
|
|
status = H5Tinsert(s1_tid, "c_name", HPOFFSET(s1, c), H5T_NATIVE_DOUBLE);
|
|
status = H5Tinsert(s1_tid, "b_name", HPOFFSET(s1, b), H5T_NATIVE_FLOAT);
|
|
|
|
/*
|
|
* Create the dataset.
|
|
*/
|
|
dataset = H5Dcreate(file, DATASETNAME, s1_tid, space, H5C_DEFAULT);
|
|
|
|
/*
|
|
* Wtite data to the dataset;
|
|
*/
|
|
status = H5Dwrite(dataset, s1_tid, H5P_ALL, H5P_ALL, H5C_DEFAULT, s1);
|
|
|
|
/*
|
|
* Release resources
|
|
*/
|
|
H5Tclose(s1_tid);
|
|
H5Pclose(space);
|
|
H5Dclose(dataset);
|
|
H5Fclose(file);
|
|
|
|
/*
|
|
* Open the file and the dataset.
|
|
*/
|
|
file = H5Fopen(FILE, H5F_ACC_RDONLY, H5C_DEFAULT);
|
|
|
|
dataset = H5Dopen(file, DATASETNAME);
|
|
|
|
/*
|
|
* Create a data type for s2
|
|
*/
|
|
s2_tid = H5Tcreate(H5T_COMPOUND, sizeof(s2_t));
|
|
|
|
status = H5Tinsert(s2_tid, "c_name", HPOFFSET(s2, c), H5T_NATIVE_DOUBLE);
|
|
status = H5Tinsert(s2_tid, "a_name", HPOFFSET(s2, a), H5T_NATIVE_INT);
|
|
|
|
/*
|
|
* Read two fields c and a from s1 dataset. Fields iin the file
|
|
* are found by their names "c_name" and "a_name".
|
|
*/
|
|
status = H5Dread(dataset, s2_tid, H5P_ALL, H5P_ALL, H5C_DEFAULT, s2);
|
|
|
|
/*
|
|
* Display the fields
|
|
*/
|
|
printf("\n");
|
|
printf("Field c : \n");
|
|
for( i = 0; i < LENGTH; i++) printf("%.4f ", s2[i].c);
|
|
printf("\n");
|
|
|
|
printf("\n");
|
|
printf("Field a : \n");
|
|
for( i = 0; i < LENGTH; i++) printf("%d ", s2[i].a);
|
|
printf("\n");
|
|
|
|
/*
|
|
* Create a data type for s3.
|
|
*/
|
|
s3_tid = H5Tcreate(H5T_COMPOUND, sizeof(float));
|
|
|
|
status = H5Tinsert(s3_tid, "b_name", 0, H5T_NATIVE_FLOAT);
|
|
|
|
/*
|
|
* Read field b from s1 dataset. Field in the file is found by its name.
|
|
*/
|
|
status = H5Dread(dataset, s3_tid, H5P_ALL, H5P_ALL, H5C_DEFAULT, s3);
|
|
|
|
/*
|
|
* Display the field
|
|
*/
|
|
printf("\n");
|
|
printf("Field b : \n");
|
|
for( i = 0; i < LENGTH; i++) printf("%.4f ", s3[i]);
|
|
printf("\n");
|
|
|
|
/*
|
|
* Release resources
|
|
*/
|
|
H5Tclose(s2_tid);
|
|
H5Tclose(s3_tid);
|
|
H5Dclose(dataset);
|
|
H5Pclose(space);
|
|
H5Fclose(file);
|
|
}
|