continued merging H5Block: still some functionality missing (attribs, read, write); added H5Part regression tests; simplified several Makefile.am files and configure.ac; began merging new Fortran interface

This commit is contained in:
Marc Howison
2010-07-09 16:24:57 +00:00
parent b2dbc55839
commit 9f3fd3b053
65 changed files with 7708 additions and 2939 deletions
+12 -10
View File
@@ -3,40 +3,42 @@
#define H5_ATTRIB_FILE 0
#define H5_ATTRIB_STEP 1
#define H5_ATTRIB_FIELD 2
h5_int64_t
h5_err_t
h5_read_attrib (
h5_file_t * const f,
const char type,
const char mode,
const char *attrib_name,
const hid_t attrib_type,
void *attrib_value
);
h5_int64_t
h5_err_t
h5_write_attrib (
h5_file_t * const f,
const char type,
const char mode,
const char *attrib_name,
const hid_t attrib_type,
const void *attrib_value,
const hsize_t attrib_nelem
);
h5_int64_t
h5_err_t
h5_get_attrib_info (
h5_file_t *const f,
const char type,
const h5_int64_t attrib_idx,
const char mode,
const h5_size_t attrib_idx,
char *attrib_name,
const h5_int64_t len_attrib_name,
const h5_size_t len_attrib_name,
h5_int64_t *attrib_type,
h5_int64_t *attrib_nelem
h5_size_t *attrib_nelem
);
h5_ssize_t
h5_get_num_attribs (
h5_file_t *const f,
const char type
const char mode
);
#endif
+4
View File
@@ -10,9 +10,13 @@
#include "h5_maps.h"
#include "h5_openclose.h"
#include "h5_readwrite.h"
#include "h5u_readwrite.h"
#include "h5u_model.h"
#include "h5b_model.h"
#include "h5b_attribs.h"
#include "h5t_core.h"
#endif
+5
View File
@@ -44,6 +44,11 @@ h5_get_num_procs (
h5_file_t* const f
);
hid_t
h5_get_hdf5_file(
h5_file_t* const f
);
h5_size_t
h5_get_num_steps (
h5_file_t* const f
+2 -1
View File
@@ -18,7 +18,7 @@ h5_set_step (
const h5_int64_t step /*!< [in] Time-step to set. */
);
hid_t
h5_int64_t
h5_normalize_h5_type (
h5_file_t * const f,
hid_t type
@@ -39,6 +39,7 @@ h5_has_index (
h5_err_t
h5_normalize_dataset_name (
h5_file_t *const f,
const char *name,
char *name2
);
+3
View File
@@ -25,8 +25,11 @@
#define H5_FLOAT32_T H5T_NATIVE_FLOAT
#define H5_INT64_T H5T_NATIVE_INT64
#define H5_INT32_T H5T_NATIVE_INT32
#define H5_STRING_T H5T_NATIVE_CHAR
#define H5_COMPOUND_T H5T_COMPOUND
#define H5_VER_STRING "2.0.0"
extern const char * const H5_O_MODES[];
#ifdef WIN32
+31
View File
@@ -0,0 +1,31 @@
#ifndef __H5B_ATTRIBS_H
#define __H5B_ATTRIBS_H
h5_err_t
h5_write_field_attrib (
h5_file_t *const f, /*!< IN: file handle */
const char *field_name, /*!< IN: field name */
const char *attrib_name, /*!< IN: attribute name */
const hid_t attrib_type, /*!< IN: attribute type */
const void *attrib_value, /*!< IN: attribute value */
const h5_int64_t attrib_nelem /*!< IN: number of elements */
);
h5_ssize_t
h5b_get_num_field_attribs (
h5_file_t *const f, /*<! IN: file handle */
const char *field_name /*<! IN: field name */
);
h5_err_t
h5b_get_field_attrib_info (
h5_file_t *const f, /*!< IN: file handle */
const char *field_name, /*!< IN: field name */
const h5_size_t attrib_idx, /*!< IN: attribute index */
char *attrib_name, /*!< OUT: attribute name */
const h5_size_t len_attrib_name, /*!< IN: buffer size */
h5_int64_t *attrib_type, /*!< OUT: attribute type */
h5_size_t *attrib_nelem /*!< OUT: number of elements */
);
#endif
+90
View File
@@ -0,0 +1,90 @@
#ifndef __H5B_MODEL_H
#define __H5B_MODEL_H
h5_err_t
h5b_3d_set_view (
h5_file_t *const f, /*!< IN: File handle */
const h5_size_t i_start, /*!< IN: start index of \c i */
const h5_size_t i_end, /*!< IN: end index of \c i */
const h5_size_t j_start, /*!< IN: start index of \c j */
const h5_size_t j_end, /*!< IN: end index of \c j */
const h5_size_t k_start, /*!< IN: start index of \c k */
const h5_size_t k_end /*!< IN: end index of \c k */
);
h5_err_t
h5b_3d_set_chunk (
h5_file_t *const f, /*!< IN: File handle */
const h5_size_t i, /*!< IN: size of \c i */
const h5_size_t j, /*!< IN: size of \c j */
const h5_size_t k /*!< IN: size of \c k */
);
h5_err_t
h5b_3d_get_chunk (
h5_file_t *const f, /*!< IN: File handle */
const char *field_name, /*!< IN: name of dataset */
h5_size_t *dims /*!< OUT: array containing the chunk dimensions */
);
h5_err_t
h5b_3d_get_view (
h5_file_t *const f, /*!< IN: File handle */
const int proc, /*!< IN: Processor to get partition from */
h5_size_t *i_start, /*!< OUT: start index of \c i */
h5_size_t *i_end, /*!< OUT: end index of \c i */
h5_size_t *j_start, /*!< OUT: start index of \c j */
h5_size_t *j_end, /*!< OUT: end index of \c j */
h5_size_t *k_start, /*!< OUT: start index of \c k */
h5_size_t *k_end /*!< OUT: end index of \c k */
);
h5_err_t
h5b_3d_get_reduced_view (
h5_file_t *const f, /*!< IN: File handle */
const int proc, /*!< IN: Processor to get partition from */
h5_size_t *i_start, /*!< OUT: start index of \c i */
h5_size_t *i_end, /*!< OUT: end index of \c i */
h5_size_t *j_start, /*!< OUT: start index of \c j */
h5_size_t *j_end, /*!< OUT: end index of \c j */
h5_size_t *k_start, /*!< OUT: start index of \c k */
h5_size_t *k_end /*!< OUT: end index of \c k */
);
int
h5b_3d_get_proc (
h5_file_t *const f, /*!< IN: File handle */
const h5_int64_t i, /*!< IN: \c i coordinate */
const h5_int64_t j, /*!< IN: \c j coordinate */
const h5_int64_t k /*!< IN: \c k coordinate */
);
h5_ssize_t
h5b_get_num_fields (
h5_file_t *const f /*!< IN: File handle */
);
h5_err_t
h5b_get_field_info_by_name (
h5_file_t *const f, /*!< IN: file handle */
const char *name, /*!< OUT: field name */
h5_size_t *grid_rank, /*!< OUT: grid rank */
h5_size_t *grid_dims, /*!< OUT: grid dimensions */
h5_size_t *field_rank, /*!< OUT: field rank */
h5_int64_t *type /*!< OUT: datatype */
);
h5_err_t
h5b_get_field_info (
h5_file_t *const f, /*!< IN: file handle */
const h5_size_t idx, /*!< IN: index of field */
char *name, /*!< OUT: field name */
const h5_size_t len_name, /*!< IN: buffer size */
h5_size_t *grid_rank, /*!< OUT: grid rank */
h5_size_t *grid_dims, /*!< OUT: grid dimensions */
h5_size_t *field_rank, /*!< OUT: field rank */
h5_int64_t *type /*!< OUT: datatype */
);
#endif
+7
View File
@@ -70,5 +70,12 @@ h5u_set_chunk (
const h5_size_t size
);
h5_err_t
h5u_get_chunk (
h5_file_t *const f,
const char *name,
h5_size_t *size
);
#endif