H5hut/src_old
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mapping of tets and triangles to global and local id added

Browse Source
This commit is contained in:
gsell
2008-08-20 14:30:57 +00:00
parent 4f37dbe55a
commit 0f34916a56
6 changed files with 116 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/H5Block.c
+64 -64
View File
@@ -112,7 +112,7 @@ _normalize_partition (
Gather layout to all processors
\return H5PART_SUCCESS or error code
\return H5_SUCCESS or error code
*/
#ifdef PARALLEL_IO
static h5part_int64_t
@@ -131,7 +131,7 @@ _allgather (
MPI_Allgather ( partition, 1, partition_m, layout, 1, partition_m,
f->comm );
return H5PART_SUCCESS;
return H5_SUCCESS;
}
#else
static h5part_int64_t
@@ -139,7 +139,7 @@ _allgather (
const h5_file *f /*!< IN: file handle */
) {
return H5PART_SUCCESS;
return H5_SUCCESS;
}
#endif
@@ -248,7 +248,7 @@ _volume_of_ghostzone (
if \c { p->i_start <= q->i_end <= p->i_end }. In this case \c -1 will be
returned.
\return H5PART_SUCCESS or -1
\return H5_SUCCESS or -1
*/
static h5part_int64_t
_dissolve_X_ghostzone (
@@ -276,7 +276,7 @@ _dissolve_X_ghostzone (
if \c { p->j_start <= q->j_end <= p->j_end }. In this case \c -1 will be
returned.
\return H5PART_SUCCESS or -1
\return H5_SUCCESS or -1
*/
static h5part_int64_t
_dissolve_Y_ghostzone (
@@ -304,7 +304,7 @@ _dissolve_Y_ghostzone (
if \c { p->k_start <= q->k_end <= p->k_end }. In this case \c -1 will be
returned.
\return H5PART_SUCCESS or -1
\return H5_SUCCESS or -1
*/
static h5part_int64_t
_dissolve_Z_ghostzone (
@@ -335,7 +335,7 @@ _dissolve_Z_ghostzone (
to dissolve the ghost-zone. The "best" is the one with the largest
remaining volume of the partitions.
\return H5PART_SUCCESS or error code.
\return H5_SUCCESS or error code.
*/
static h5part_int64_t
_dissolve_ghostzone (
@@ -391,7 +391,7 @@ _dissolve_ghostzone (
*p = p_best;
*q = q_best;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -414,7 +414,7 @@ _dissolve_ghostzone (
\b {Error Codes}
\b H5PART_NOMEM_ERR
\return H5PART_SUCCESS or error code.
\return H5_SUCCESS or error code.
*/
static h5part_int64_t
_dissolve_ghostzones (
@@ -519,7 +519,7 @@ _dissolve_ghostzones (
(long long)p->j_start, (long long)p->j_end,
(long long)p->k_start, (long long)p->k_end );
}
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -549,7 +549,7 @@ _release_hyperslab (
if ( herr < 0 ) return H5PART_ERR_HDF5;
f->block->memshape = -1;
}
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -558,7 +558,7 @@ _release_hyperslab (
Define the field layout given the dense index space at the actual
time step.
\return \c H5PART_SUCCESS on success<br>
\return \c H5_SUCCESS on success<br>
\c H5PART_ERR_MPI<br>
\c H5PART_ERR_HDF5
*/
@@ -599,7 +599,7 @@ H5BlockDefine3DFieldLayout(
b->have_layout = 1;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -608,7 +608,7 @@ H5BlockDefine3DFieldLayout(
Return partition of processor \c proc as specified with
\c H5BlockDefine3dLayout().
\return \c H5PART_SUCCESS on success.<br>
\return \c H5_SUCCESS on success.<br>
\c H5PART_ERR_INVAL if proc is invalid.
*/
h5part_int64_t
@@ -638,7 +638,7 @@ H5Block3dGetPartitionOfProc (
*k_start = p->k_start;
*k_end = p->k_end;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -647,7 +647,7 @@ H5Block3dGetPartitionOfProc (
Return reduced (ghost-zone free) partition of processor \c proc
as specified with \c H5BlockDefine3dLayout().
\return \c H5PART_SUCCESS on success.<br>
\return \c H5_SUCCESS on success.<br>
\c H5PART_ERR_INVAL if proc is invalid.
*/
h5part_int64_t
@@ -677,7 +677,7 @@ H5Block3dGetReducedPartitionOfProc (
*k_start = p->k_start;
*k_end = p->k_end;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
@@ -687,7 +687,7 @@ H5Block3dGetReducedPartitionOfProc (
Returns the processor computing the reduced (ghostzone-free)
partition given by the coordinates \c i, \c j and \c k.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5Block3dGetProcOf (
@@ -720,7 +720,7 @@ H5Block3dGetProcOf (
\internal
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
static h5part_int64_t
_open_block_group (
@@ -742,7 +742,7 @@ _open_block_group (
}
b->step_idx = f->step_idx;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/********************** functions for reading ********************************/
@@ -766,7 +766,7 @@ _have_object (
\internal
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
static h5part_int64_t
_open_field_group (
@@ -787,7 +787,7 @@ _open_field_group (
b->field_group_id = herr;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -795,7 +795,7 @@ _open_field_group (
\internal
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
_close_field_group (
@@ -805,7 +805,7 @@ _close_field_group (
herr_t herr = H5Gclose ( f->block->field_group_id );
if ( herr < 0 ) return HANDLE_H5G_CLOSE_ERR;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -813,7 +813,7 @@ _close_field_group (
\internal
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
static h5part_int64_t
_select_hyperslab_for_reading (
@@ -893,7 +893,7 @@ _select_hyperslab_for_reading (
(long long)part_dims[1],
(long long)part_dims[0] );
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -901,7 +901,7 @@ _select_hyperslab_for_reading (
\internal
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
_read_data (
@@ -930,7 +930,7 @@ _read_data (
herr = H5Dclose ( dataset_id );
if ( herr < 0 ) return HANDLE_H5D_CLOSE_ERR;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -942,7 +942,7 @@ _read_data (
You must use the FORTRAN indexing scheme to access items in \c data.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5Block3dReadScalarField (
@@ -964,7 +964,7 @@ H5Block3dReadScalarField (
herr = _close_field_group ( f );
if ( herr < 0 ) return herr;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -977,7 +977,7 @@ H5Block3dReadScalarField (
You must use the FORTRAN indexing scheme to access items in the buffers.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5Block3dRead3dVectorField (
@@ -1005,7 +1005,7 @@ H5Block3dRead3dVectorField (
herr = _close_field_group ( f );
if ( herr < 0 ) return herr;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/********************** functions for writing ********************************/
@@ -1015,7 +1015,7 @@ H5Block3dRead3dVectorField (
\internal
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
static h5part_int64_t
_select_hyperslab_for_writing (
@@ -1025,7 +1025,7 @@ _select_hyperslab_for_writing (
/*
re-use existing hyperslab
*/
if ( f->block->shape >= 0 ) return H5PART_SUCCESS;
if ( f->block->shape >= 0 ) return H5_SUCCESS;
herr_t herr;
struct h5b_fdata *b = f->block;
@@ -1123,7 +1123,7 @@ _select_hyperslab_for_writing (
NULL );
if ( herr < 0 ) return HANDLE_H5S_SELECT_HYPERSLAB_ERR;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -1131,7 +1131,7 @@ _select_hyperslab_for_writing (
\internal
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
static h5part_int64_t
_create_block_group (
@@ -1151,7 +1151,7 @@ _create_block_group (
if ( herr < 0 ) return HANDLE_H5G_CREATE_ERR ( H5BLOCK_GROUPNAME_BLOCK );
f->block->blockgroup = herr;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -1159,7 +1159,7 @@ _create_block_group (
\internal
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
static h5part_int64_t
_create_field_group (
@@ -1188,7 +1188,7 @@ _create_field_group (
if ( herr < 0 ) return HANDLE_H5G_CREATE_ERR ( name );
b->field_group_id = herr;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -1196,7 +1196,7 @@ _create_field_group (
\internal
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
static h5part_int64_t
_write_field_data (
@@ -1227,7 +1227,7 @@ _write_field_data (
You must use the FORTRAN indexing scheme to access items in \c data.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5Block3dWriteScalarField (
@@ -1252,7 +1252,7 @@ H5Block3dWriteScalarField (
herr = _close_field_group ( f );
if ( herr < 0 ) return herr;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -1266,7 +1266,7 @@ H5Block3dWriteScalarField (
You must use the FORTRAN indexing scheme to access items in \c data.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5Block3dWrite3dVectorField (
@@ -1295,7 +1295,7 @@ H5Block3dWrite3dVectorField (
herr = _close_field_group ( f );
if ( herr < 0 ) return herr;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/********************** query information about available fields *************/
@@ -1305,7 +1305,7 @@ H5Block3dWrite3dVectorField (
Query number of fields in current time step.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5BlockGetNumFields (
@@ -1326,7 +1326,7 @@ H5BlockGetNumFields (
\internal
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
static h5part_int64_t
_get_field_info (
@@ -1373,7 +1373,7 @@ _get_field_info (
herr = H5Gclose ( group_id );
if ( herr < 0 ) return HANDLE_H5G_CLOSE_ERR;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -1387,7 +1387,7 @@ _get_field_info (
minus one. The number of fields bound to the current time-step
can be queried by calling the function \c H5BlockGetNumFields().
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5BlockGetFieldInfo (
@@ -1421,7 +1421,7 @@ H5BlockGetFieldInfo (
Get the rank and dimensions of the field specified by its name.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5BlockGetFieldInfoByName (
@@ -1446,7 +1446,7 @@ H5BlockGetFieldInfoByName (
\internal
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
static h5part_int64_t
_write_field_attrib (
@@ -1472,7 +1472,7 @@ _write_field_attrib (
herr = _close_field_group ( f );
if ( herr < 0 ) return herr;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -1481,7 +1481,7 @@ _write_field_attrib (
Write \c attrib_value with type \c attrib_type as attribute \c attrib_name
to field \c field_name.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5BlockWriteFieldAttrib (
@@ -1510,7 +1510,7 @@ H5BlockWriteFieldAttrib (
Write string \c attrib_value as attribute \c attrib_name to field
\c field_name..
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5BlockWriteFieldAttribString (
@@ -1568,7 +1568,7 @@ H5BlockGetNumFieldAttribs (
field name \c field_name. The function returns the name of the attribute,
the type of the attribute and the number of elements of this type.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5BlockGetFieldAttribInfo (
@@ -1599,7 +1599,7 @@ H5BlockGetFieldAttribInfo (
herr = _close_field_group ( f );
if ( herr < 0 ) return herr;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -1609,7 +1609,7 @@ H5BlockGetFieldAttribInfo (
Read attribute \c attrib_name of field \c field_name.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
static h5part_int64_t
_read_field_attrib (
@@ -1633,7 +1633,7 @@ _read_field_attrib (
herr = _close_field_group ( f );
if ( herr < 0 ) return herr;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/*!
@@ -1641,7 +1641,7 @@ _read_field_attrib (
Read attribute \c attrib_name of field \c field_name.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5BlockReadFieldAttrib (
@@ -1667,7 +1667,7 @@ H5BlockReadFieldAttrib (
Get field origin.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5Block3dGetFieldOrigin (
@@ -1700,7 +1700,7 @@ H5Block3dGetFieldOrigin (
Set field origin.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5Block3dSetFieldOrigin (
@@ -1731,7 +1731,7 @@ H5Block3dSetFieldOrigin (
Get field spacing for field \c field_name in the current time step.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5Block3dGetFieldSpacing (
@@ -1764,7 +1764,7 @@ H5Block3dGetFieldSpacing (
Set field spacing for field \c field_name in the current time step.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5Block3dSetFieldSpacing (
@@ -1796,7 +1796,7 @@ H5Block3dSetFieldSpacing (
/*
Checks whether the current time-step has field data or not.
\return \c H5PART_SUCCESS if field data is available otherwise \c
\return \c H5_SUCCESS if field data is available otherwise \c
H5PART_ERR_NOENTRY.
*/
h5part_int64_t
@@ -1810,5 +1810,5 @@ H5BlockHasFieldData (
if ( ! _have_object ( f->step_gid, H5BLOCK_GROUPNAME_BLOCK ) ) {
return H5PART_ERR_NOENTRY;
}
return H5PART_SUCCESS;
return H5_SUCCESS;
}
src/H5Fed.h
+1
View File
@@ -20,6 +20,7 @@
#define __H5FED_H
#include "H5.h"
#include "H5Fed_map.h"
/****** General routines *****************************************************/
src/H5Fed_inquiry.c
+5 -5
View File
@@ -61,7 +61,7 @@ H5FedGetNumVertices (
h5_file * fh /*!< file handle */
) {
SET_FNAME ( __func__ );
return h5t_get_num_vertices ( fh );
return h5t_get_num_vertices_on_level ( fh );
}
/*!
@@ -78,7 +78,7 @@ H5FedGetNumVerticesTotal(
h5_file * fh /*!< file handle */
) {
SET_FNAME ( __func__ );
return h5t_get_num_vertices ( fh );
return h5t_get_num_vertices_on_level ( fh );
}
/*!
@@ -103,7 +103,7 @@ h5_size_t
H5FedGetNumTriangles (
h5_file * fh /*!< file handle */
) {
return h5t_get_num_entities ( fh );
return h5t_get_num_entities_on_level ( fh );
}
/*!
@@ -119,7 +119,7 @@ h5_size_t
H5FedGetNumTrianglesTotal (
h5_file * fh /*!< file handle */
) {
return h5t_get_num_entities ( fh );
return h5t_get_num_entities_on_level ( fh );
}
@@ -156,7 +156,7 @@ H5FedGetNumTetrahedraTotal(
h5_file * fh /*!< file handle */
) {
SET_FNAME ( __func__ );
return h5t_get_num_entities ( fh );
return h5t_get_num_entities_on_level ( fh );
}
/*!
src/H5Part.c
+41 -45
View File
@@ -94,10 +94,6 @@ Last modified on April 19, 2007.
#include "h5/h5_private.h"
#include "H5Part.h"
extern h5part_error_handler _err_handler;
extern h5part_int64_t _h5part_errno;
extern unsigned _debug;
/********* Private Variable Declarations *************/
@@ -175,7 +171,7 @@ H5PartOpenFile (
Closes an open file.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5PartCloseFile (
@@ -212,7 +208,7 @@ H5PartDefineStepName (
operations will assume this number of particles will be written.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5PartSetNumParticles (
@@ -249,7 +245,7 @@ H5PartSetNumParticles (
The data is committed to disk before the routine returns.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5PartWriteDataFloat64 (
@@ -287,7 +283,7 @@ H5PartWriteDataFloat64 (
The data is committed to disk before the routine returns.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5PartWriteDataInt64 (
@@ -320,7 +316,7 @@ H5PartWriteDataInt64 (
If the attribute already exists an error will be returned. There
is currently no way to change the content of an existing attribute.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5PartWriteFileAttribString (
@@ -331,7 +327,7 @@ H5PartWriteFileAttribString (
SET_FNAME ( "H5PartWriteFileAttribString" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_write_attrib (
@@ -354,7 +350,7 @@ H5PartWriteFileAttribString (
If the attribute already exists an error will be returned. There
is currently no way to change the content of an existing attribute.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
@@ -366,7 +362,7 @@ H5PartWriteStepAttribString (
SET_FNAME ( "H5PartWriteStepAttribString" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_write_attrib (
@@ -393,7 +389,7 @@ H5PartWriteStepAttribString (
If the attribute already exists an error will be returned. There
is currently no way to change the content of an existing attribute.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
@@ -407,7 +403,7 @@ H5PartWriteStepAttrib (
SET_FNAME ( "H5PartWriteStepAttrib" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_write_attrib (
@@ -434,7 +430,7 @@ H5PartWriteStepAttrib (
If the attribute already exists an error will be returned. There
is currently no way to change the content of an existing attribute.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
@@ -448,7 +444,7 @@ H5PartWriteFileAttrib (
SET_FNAME ( "H5PartWriteFileAttrib" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_write_attrib (
@@ -473,7 +469,7 @@ H5PartGetNumStepAttribs (
SET_FNAME ( "H5PartGetNumStepAttribs" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_get_num_attribs ( f, f->step_gid );
@@ -493,7 +489,7 @@ H5PartGetNumFileAttribs (
SET_FNAME ( "H5PartGetNumFileAttribs" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_get_num_attribs ( f, f->root_gid );
@@ -511,7 +507,7 @@ H5PartGetNumFileAttribs (
time-step can be queried by calling the function
\c H5PartGetNumStepAttribs().
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5PartGetStepAttribInfo (
@@ -527,7 +523,7 @@ H5PartGetStepAttribInfo (
SET_FNAME ( "H5PartGetStepAttribInfo" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_get_attrib_info (
@@ -550,7 +546,7 @@ H5PartGetStepAttribInfo (
one. The number of attributes bound to file \c f can be queried
by calling the function \c H5PartGetNumFileAttribs().
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
@@ -567,7 +563,7 @@ H5PartGetFileAttribInfo (
SET_FNAME ( "H5PartGetFileAttribInfo" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_get_attrib_info (
@@ -584,7 +580,7 @@ H5PartGetFileAttribInfo (
Reads an attribute bound to current time-step.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5PartReadStepAttrib (
@@ -595,7 +591,7 @@ H5PartReadStepAttrib (
SET_FNAME ( "H5PartReadStepAttrib" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_read_attrib ( f->step_gid, attrib_name, attrib_value );
@@ -606,7 +602,7 @@ H5PartReadStepAttrib (
Reads an attribute bound to file \c f.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5PartReadFileAttrib (
@@ -617,7 +613,7 @@ H5PartReadFileAttrib (
SET_FNAME ( "H5PartReadFileAttrib" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_read_attrib ( f->root_gid, attrib_name, attrib_value );
@@ -650,7 +646,7 @@ H5PartReadFileAttrib (
In read-mode you can use this function to random-access the file for a
particular step.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5PartSetStep (
@@ -660,7 +656,7 @@ H5PartSetStep (
SET_FNAME ( "H5PartSetStep" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_set_step ( f, step );
@@ -687,7 +683,7 @@ H5PartHasStep (
SET_FNAME ( "H5PartHasStep" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_has_step( f, step );
@@ -711,7 +707,7 @@ H5PartGetNumSteps (
SET_FNAME ( "H5PartGetNumSteps" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_get_num_objects_matching_pattern (
@@ -736,7 +732,7 @@ H5PartGetNumDatasets (
SET_FNAME ( "H5PartGetNumDatasets" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_get_num_objects ( f->file, f->step_name, H5G_DATASET );
@@ -750,7 +746,7 @@ H5PartGetNumDatasets (
If the number of datasets is \c n, the range of \c _index is \c 0 to \c n-1.
\result \c H5PART_SUCCESS
\result \c H5_SUCCESS
*/
h5part_int64_t
H5PartGetDatasetName (
@@ -762,7 +758,7 @@ H5PartGetDatasetName (
SET_FNAME ( "H5PartGetDatasetName" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return h5_get_object_name (
@@ -782,7 +778,7 @@ H5PartGetDatasetName (
Type is one of \c H5T_NATIVE_DOUBLE or \c H5T_NATIVE_INT64.
\return \c H5PART_SUCCESS
\return \c H5_SUCCESS
*/
h5part_int64_t
H5PartGetDatasetInfo (
@@ -797,7 +793,7 @@ H5PartGetDatasetInfo (
SET_FNAME ( "H5PartGetDatasetInfo" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
return H5U_get_dataset_info ( f, idx,
@@ -821,7 +817,7 @@ H5PartGetNumParticles (
SET_FNAME ( "H5PartGetNumParticles" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
if ( f->step_gid < 0 ) {
@@ -841,7 +837,7 @@ H5PartResetView (
) {
SET_FNAME ( "H5PartResetView" );
if ( h5_check_filehandle ( f ) != H5PART_SUCCESS )
if ( h5_check_filehandle ( f ) != H5_SUCCESS )
return _h5part_errno;
CHECK_READONLY_MODE ( f );
@@ -882,7 +878,7 @@ H5PartHasView (
The range is inclusive (the start and the end index).
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5PartSetView (
@@ -940,7 +936,7 @@ H5PartGetView (
appropriate domain decomposition of the data arrays for the degree
of parallelism and set the "view" accordingly.
\return H5PART_SUCCESS or error code
\return H5_SUCCESS or error code
*/
/*
\note
@@ -979,7 +975,7 @@ H5PartSetCanonicalView (
but it is useful to arrive at some common naming
convention when sharing data with other groups.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5PartReadDataFloat64 (
@@ -1005,7 +1001,7 @@ H5PartReadDataFloat64 (
but it is useful to arrive at some common naming
convention when sharing data with other groups.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5PartReadDataInt64 (
@@ -1033,7 +1029,7 @@ H5PartReadDataInt64 (
See also \c H5PartReadDataInt64() and \c H5PartReadDataFloat64() if you want
to just read in one of the many datasets.
\return \c H5PART_SUCCESS or error code
\return \c H5_SUCCESS or error code
*/
h5part_int64_t
H5PartReadParticleStep (
@@ -1077,7 +1073,7 @@ H5PartReadParticleStep (
herr = H5U_read_elems ( f, "id", (void*)id, H5T_NATIVE_INT64 );
if ( herr < 0 ) return herr;
return H5PART_SUCCESS;
return H5_SUCCESS;
}
/****************** error handling ******************/
@@ -1087,7 +1083,7 @@ H5PartReadParticleStep (
Set verbosity level to \c level.
\return \c H5PART_SUCCESS
\return \c H5_SUCCESS
*/
h5part_int64_t
H5PartSetVerbosityLevel (
@@ -1102,7 +1098,7 @@ H5PartSetVerbosityLevel (
Set error handler to \c handler.
\return \c H5PART_SUCCESS
\return \c H5_SUCCESS
*/
h5part_int64_t
H5PartSetErrorHandler (
src/H5Part.h
+1 -1
View File
@@ -13,7 +13,7 @@
extern "C" {
#endif
#define H5PART_SUCCESS H5_SUCCESS
// #define H5PART_SUCCESS H5_SUCCESS
#define H5PART_ERR_NOMEM H5_ERR_NOMEM
#define H5PART_ERR_INVAL H5_ERR_INVAL
#define H5PART_ERR_BADFD H5_ERR_BADFD
src/Makefile.am
+4 -2
View File
@@ -45,7 +45,8 @@ EXTRA_LIBRARIES = libH5Part.a
include_HEADERS = \
H5Part.h \
H5Block.h \
H5Fed.h
H5Fed.h \
H5Fed_map.h
# Listing of all possible headers that I may include
EXTRA_HEADERS =
@@ -58,6 +59,7 @@ libH5Part_a_SOURCES = \
H5Fed_adjacency.c \
H5Fed_dof.c \
H5Fed_inquiry.c \
H5Fed_map.c \
H5Fed_retrieve.c \
H5Fed_store.c \
H5Part.c
@@ -68,7 +70,7 @@ SUBDIRS = h5 bindings
# ------------ Serial Lib build commands ------------
libH5Part.a: $(libH5Part_a_OBJECTS)
${AR} rucs $@ $^
%.o : %.c
$(CC) $(CFLAGS) $(INC) -c $<