API changed: now we have explicit function to open/add meshes of specific type

This commit is contained in:
2011-05-20 11:53:49 +00:00
parent 0dbb8f22e3
commit 1a8433681f
18 changed files with 223 additions and 213 deletions
+17 -6
View File
@@ -31,12 +31,23 @@ extern "C" {
/****** General routines *****************************************************/
h5_err_t
H5FedOpenMesh (
h5_file_t * const f,
const h5_id_t mesh_id,
const h5_oid_t mesh_type_id
);
static inline h5_err_t
H5FedOpenTetrahedralMesh (
h5_file_t* const f,
const h5_id_t mesh_id
) {
H5_API_ENTER2 (h5_err_t, "f=0x%p, mesh_id=%lld", f, (long long)mesh_id);
H5_API_RETURN (h5t_open_tetrahedral_mesh (f, mesh_id));
}
static inline h5_err_t
H5FedOpenTriangleMesh (
h5_file_t* const f,
const h5_id_t mesh_id
) {
H5_API_ENTER2 (h5_err_t, "f=0x%p, mesh_id=%lld", f, (long long)mesh_id);
H5_API_RETURN (h5t_open_triangle_mesh (f, mesh_id));
}
h5_err_t
H5FedCloseMesh (
+24 -1
View File
@@ -22,7 +22,30 @@
extern "C" {
#endif
h5_ssize_t H5FedGetNumMeshes ( h5_file_t * const f, const h5_oid_t type_id );
/*!
Get number of meshes of given type.
\param[in] f File handle
\param[in] type_id Type of mesh we want the number of.
\return Number of meshes of type \c type_id or error code.
*/
static inline h5_ssize_t
H5FedGetNumTetrahedralMeshes (
h5_file_t* const f
) {
H5_API_ENTER1 (h5_err_t, "f=0x%p", f);
H5_API_RETURN (h5t_get_num_tetmeshes (f));
}
static inline h5_ssize_t
H5FedGetNumTriangleMeshes (
h5_file_t* const f
) {
H5_API_ENTER1 (h5_err_t, "f=0x%p", f);
H5_API_RETURN (h5t_get_num_trimeshes (f));
}
h5_ssize_t H5FedGetNumLevels ( h5_file_t * const f );
h5t_lvl_idx_t H5FedGetLevel ( h5_file_t * const f );
h5_ssize_t H5FedGetNumVertices ( h5_file_t * const f );
+12 -13
View File
@@ -23,22 +23,21 @@
extern "C" {
#endif
/* depricated! use explicit versions */
h5_id_t
H5FedAddMesh (
h5_file_t * const f,
const h5_oid_t mesh_type_id
);
h5_id_t
static inline h5_id_t
H5FedAddTetrahedralMesh (
h5_file_t * const f
);
h5_file_t* const f
) {
H5_API_ENTER1 (h5_id_t, "f=0x%p", f);
H5_API_RETURN (h5t_add_tetrahedral_mesh (f));
}
h5_id_t
static inline h5_id_t
H5FedAddTriangleMesh (
h5_file_t * const f
);
h5_file_t* const f
) {
H5_API_ENTER1 (h5_id_t, "f=0x%p", f);
H5_API_RETURN (h5t_add_triangle_mesh (f));
}
h5t_lvl_idx_t
H5FedAddLevel (
+7 -3
View File
@@ -2,9 +2,13 @@
#define __H5T_INQUIRY_H
h5_ssize_t
h5t_get_num_meshes (
h5_file_t * const f,
const enum h5_oid type
h5t_get_num_tetmeshes (
h5_file_t * const f
);
h5_ssize_t
h5t_get_num_trimeshes (
h5_file_t * const f
);
h5_ssize_t
+8 -3
View File
@@ -1,11 +1,16 @@
#ifndef __H5T_OPENCLOSE_H
#define __H5T_OPENCLOSE_H
h5_err_t h5t_open_mesh (
h5_err_t h5t_open_tetrahedral_mesh (
h5_file_t * const f,
const h5_id_t id,
const h5_oid_t type
const h5_id_t id
);
h5_err_t h5t_open_triangle_mesh (
h5_file_t * const f,
const h5_id_t id
);
h5_err_t h5t_set_level (
h5_file_t * const f,
const h5t_lvl_idx_t id
+7 -3
View File
@@ -2,9 +2,13 @@
#define __H5T_STOREMESH_H
h5_id_t
h5t_add_mesh (
h5_file_t * const f,
const h5_oid_t mesh_type
h5t_add_tetrahedral_mesh (
h5_file_t * const f
);
h5_id_t
h5t_add_triangle_mesh (
h5_file_t * const f
);
h5t_lvl_idx_t