From e962caf1b9b4119e7b5ea51e6f03945e862aad87 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 14 Jun 2007 15:10:37 +0000 Subject: [PATCH] src/H5BlockF.c * h5b_3d_set_field_origin() and h5b_3d_get_field_origin() added * wrong types in h5b_3d_{g,s}et_field_spacing fixed --- src/H5BlockF.c | 62 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 7 deletions(-) diff --git a/src/H5BlockF.c b/src/H5BlockF.c index 1064ac1..45b5e8c 100755 --- a/src/H5BlockF.c +++ b/src/H5BlockF.c @@ -74,9 +74,15 @@ #define h5bl_3d_set_field_spacing ( \ h5bl_3d_set_field_spacing_, \ H5BL_3D_SET_FIELD_SPACING ) -#define h5bl_3d_set_field_spacing ( \ +#define h5bl_3d_get_field_spacing ( \ h5bl_3d_get_field_spacing_, \ H5BL_3D_GET_FIELD_SPACING ) +#define h5bl_3d_set_field_origin ( \ + h5bl_3d_set_field_origin_, \ + H5BL_3D_SET_FIELD_ORIGIN ) +#define h5bl_3d_get_field_origin ( \ + h5bl_3d_get_field_origin_, \ + H5BL_3D_GET_FIELD_origin ) #endif h5part_int64_t @@ -494,9 +500,9 @@ h5part_int64_t h5b_3d_get_field_spacing ( h5part_int64_t *f, const char *field_name, - h5part_int64_t *x, - h5part_int64_t *y, - h5part_int64_t *z, + h5part_float64_t *x, + h5part_float64_t *y, + h5part_float64_t *z, const int l_field_name ) { @@ -515,9 +521,9 @@ h5part_int64_t h5b_3d_set_field_spacing ( h5part_int64_t *f, const char *field_name, - const h5part_int64_t *x, - const h5part_int64_t *y, - const h5part_int64_t *z, + const h5part_float64_t *x, + const h5part_float64_t *y, + const h5part_float64_t *z, const int l_field_name ) { @@ -531,3 +537,45 @@ h5b_3d_set_field_spacing ( free ( field_name2 ); return herr; } + +h5part_int64_t +h5b_3d_get_field_origin ( + h5part_int64_t *f, + const char *field_name, + h5part_float64_t *x, + h5part_float64_t *y, + h5part_float64_t *z, + const int l_field_name + ) { + + H5PartFile *filehandle = (H5PartFile*)(size_t)*f; + + char *field_name2 = _H5Part_strdupfor2c ( field_name, l_field_name ); + + h5part_int64_t herr = H5Block3dGetFieldOrigin ( + filehandle, field_name2, x, y, z ); + + free ( field_name2 ); + return herr; +} + +h5part_int64_t +h5b_3d_set_field_origin ( + h5part_int64_t *f, + const char *field_name, + const h5part_float64_t *x, + const h5part_float64_t *y, + const h5part_float64_t *z, + const int l_field_name + ) { + + H5PartFile *filehandle = (H5PartFile*)(size_t)*f; + + char *field_name2 = _H5Part_strdupfor2c ( field_name, l_field_name ); + + h5part_int64_t herr = H5Block3dSetFieldOrigin ( + filehandle, field_name2, *x, *y, *z ); + + free ( field_name2 ); + return herr; +}