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

bug fixes, some private functions renamed, formating changes

Browse Source
This commit is contained in:
gsell
2013-06-27 16:18:08 +00:00
parent 80523c6df7
commit 65757c1974
30 changed files with 217 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/H5.h
-4
View File
@@ -215,10 +215,6 @@ static inline H5SetThrottle (
H5_API_RETURN (h5_set_throttle(f, factor));
}
#endif // PARALLEL_IO
#ifdef __cplusplus
}
#endif
/*!
\ingroup h5hut_file
src/include/H5Fed.h
-9
View File
@@ -109,15 +109,6 @@ H5FedSetMeshChanged (
H5_API_RETURN (h5t_set_mesh_changed (m));
}
static inline h5_err_t
H5FedLinkMeshToStep (
h5_file_t* const m,
const h5_id_t mesh_id
) {
H5_API_ENTER (h5_err_t, "m=%p, mesh_id=%lld", m, (long long)mesh_id);
H5_API_RETURN (h5_error_not_implemented ());
}
#ifdef __cplusplus
}
#endif
src/include/H5Fed_store.h
+25 -10
View File
@@ -28,7 +28,7 @@ H5FedAddTetrahedralMesh (
H5_API_ENTER (h5_err_t,
"f=%p, name=%s, mesh=%p",
(h5_file_p)f, name, mesh);
H5_API_RETURN (h5t_add_tetrahedral_mesh (f, name, mesh));
H5_API_RETURN (h5t_add_tetrahedral_mesh (f, name, 0, mesh));
}
static inline h5_err_t
@@ -40,7 +40,7 @@ H5FedAddChunkedTetrahedralMesh (
H5_API_ENTER (h5_err_t,
"f=%p, name=%s, mesh=%p",
(h5_file_p)f, name, mesh);
H5_API_RETURN (h5t_add_chunked_tetrahedral_mesh (f, name, mesh));
H5_API_RETURN (h5t_add_chunked_tetrahedral_mesh (f, name, 0, mesh));
}
@@ -53,7 +53,7 @@ H5FedAddTriangleMesh (
H5_API_ENTER (h5_err_t,
"f=%p, name=%s, mesh=%p",
(h5_file_p)f, name, mesh);
H5_API_RETURN (h5t_add_triangle_mesh (f, name, mesh));
H5_API_RETURN (h5t_add_triangle_mesh (f, name, 0, mesh));
}
static inline h5_err_t
@@ -65,8 +65,9 @@ H5FedAddChunkedTriangleMesh (
H5_API_ENTER(h5_err_t,
"f=%p, name=%s, mesh=%p",
(h5_file_p)f, name, mesh);
H5_API_RETURN (h5t_add_chunked_triangle_mesh (f, name, mesh));
H5_API_RETURN (h5t_add_chunked_triangle_mesh (f, name, 0, mesh));
}
/*!
\ingroup h5fed_c_api
@@ -136,13 +137,12 @@ H5FedEndStoreVertices (
static inline h5_err_t
H5FedBeginStoreElements (
h5t_mesh_t* const m,
const h5_size_t num,
const h5_weight_t num_weights
const h5_size_t num
) {
H5_API_ENTER (h5_err_t,
"m=%p, num=%llu, num_weights=%d",
m, (long long unsigned)num, num_weights);
H5_API_RETURN (h5t_begin_store_elems (m, num, num_weights));
"m=%p, num=%llu",
m, (long long unsigned)num);
H5_API_RETURN (h5t_begin_store_elems (m, num));
}
/*!
@@ -161,6 +161,21 @@ H5FedBeginStoreElements (
*/
static inline h5_loc_idx_t
H5FedStoreElement (
h5t_mesh_t* const m, /*!< file handle */
const h5_loc_idx_t local_vids[] /*!< tuple with vertex id's */
) {
H5_API_ENTER (h5_loc_idx_t, "m=%p, local_vids=%p", m, local_vids);
if (h5t_get_level (m) != 0) {
H5_API_LEAVE (
h5_error (
H5_ERR_INVAL,
"Elements can be added to level 0 only!"));
}
H5_API_RETURN (h5t_add_lvl0_cell (m, local_vids, NULL));
}
static inline h5_loc_idx_t
H5FedStoreWeightedElement (
h5t_mesh_t* const m, /*!< file handle */
const h5_loc_idx_t local_vids[], /*!< tuple with vertex id's */
const h5_weight_t weights[] // tuple with weights
@@ -172,7 +187,7 @@ H5FedStoreElement (
H5_ERR_INVAL,
"Elements can be added to level 0 only!"));
}
H5_API_RETURN (h5t_store_elem2 (m, -1, local_vids, weights));
H5_API_RETURN (h5t_add_lvl0_cell (m, local_vids, weights));
}
static inline h5_err_t
src/include/Makefile.am
+1 -25
View File
@@ -1,29 +1,5 @@
# src/C level Makefile.am
# Header files that I wish to install in $(prefix)/include
include_HEADERS = \
../include/h5core/h5.h \
../include/h5core/h5_attribs.h \
../include/h5core/h5_debug.h \
../include/h5core/h5_errorhandling.h \
../include/h5core/h5_model.h \
../include/h5core/h5_syscall.h \
../include/h5core/h5_types.h \
../include/h5core/h5b_attribs.h \
../include/h5core/h5b_model.h \
../include/h5core/h5b_io.h \
../include/h5core/h5t_adjacencies.h \
../include/h5core/h5t_map.h \
../include/h5core/h5t_model.h \
../include/h5core/h5t_retrieve.h \
../include/h5core/h5t_store.h \
../include/h5core/h5t_tags.h \
../include/h5core/h5u_model.h \
../include/h5core/h5u_io.h
# Listing of all possible headers that I may include
EXTRA_HEADERS =
SUBDIRS = h5core
clean-local:
$(RM) *~
$(RM) h5core/*~
src/include/h5core/h5.h
-1
View File
@@ -69,7 +69,6 @@ h5_err_t
h5_close_hdf5 (
void);
h5_err_t
h5_flush_step (
const h5_file_t);
src/include/h5core/h5_types.h
+9 -9
View File
@@ -25,21 +25,21 @@ extern "C" {
H5_O_APPEND: allows to append a new datasets to an existing file
H5_O_RDWR: dataset may exist
*/
#define H5_O_RDWR 0x001
#define H5_O_RDONLY 0x002
#define H5_O_WRONLY 0x004
#define H5_O_APPEND 0x008
#define H5_O_RDWR 0x00000001
#define H5_O_RDONLY 0x00000002
#define H5_O_WRONLY 0x00000004
#define H5_O_APPEND 0x00000008
#define H5_VFD_MPIPOSIX 0x00000010
#define H5_VFD_MPIIO_IND 0x00000020
#define H5_VFD_INDEPENDENT H5_VFD_MPIIO_IND // obsolete(?)
#define H5_VFD_CORE 0x00000040
#define H5_FLUSH_FILE 0x040
#define H5_FLUSH_STEP 0x080
#define H5_FLUSH_DATASET 0x100
#define H5_FLUSH_FILE 0x00001000
#define H5_FLUSH_STEP 0x00002000
#define H5_FLUSH_DATASET 0x00004000
#define H5_FS_LUSTRE 0x200
#define H5_FS_LUSTRE 0x00010000
#define H5_ID_T H5T_NATIVE_INT64
#define H5_FLOAT64_T H5T_NATIVE_DOUBLE
src/include/h5core/h5t_map.h
-15
View File
@@ -44,21 +44,6 @@ h5t_map_glb_elem_indices2loc (
h5_loc_idx_t* loc_indices
);
h5_err_t
h5t_get_loc_vertex_index_of_vertex (
h5t_mesh_t* const m,
const h5_loc_id_t entity_id,
h5_loc_idx_t* vertex_index
);
h5_err_t
h5t_get_loc_vertex_index_of_vertex2 (
h5t_mesh_t* const m,
const h5_loc_idx_t face_idx,
const h5_loc_idx_t elem_idx,
h5_loc_idx_t* vertex_indices
);
h5_err_t
h5t_get_loc_vertex_indices_of_edge (
h5t_mesh_t* const m,
src/include/h5core/h5t_model.h
+53 -25
View File
@@ -42,48 +42,76 @@ h5t_open_triangle_mesh_by_idx (
h5_err_t
h5t_open_triangle_mesh_part (
const h5_file_t, const char*, h5t_mesh_t** mesh,
const h5_file_t, const char*, h5t_mesh_t**,
h5_glb_idx_t*, h5_glb_idx_t);
h5_lvl_idx_t h5t_is_chunked (h5t_mesh_t* const);
h5_lvl_idx_t
h5t_is_chunked (
h5t_mesh_t* const);
h5_ssize_t h5t_get_num_trimeshes (const h5_file_t f);
h5_ssize_t
h5t_get_num_trimeshes (
const h5_file_t f);
h5_ssize_t h5t_get_num_leaf_levels (h5t_mesh_t* const);
h5_ssize_t
h5t_get_num_leaf_levels (
h5t_mesh_t* const);
h5_ssize_t h5t_get_num_vertices (h5t_mesh_t* const, const h5_id_t);
h5_ssize_t
h5t_get_num_vertices (
h5t_mesh_t* const, const h5_id_t);
h5_ssize_t h5t_get_num_leaf_elems (h5t_mesh_t* const, const h5_id_t);
h5_ssize_t
h5t_get_num_leaf_elems (
h5t_mesh_t* const, const h5_id_t);
h5_id_t h5t_add_chunked_tetrahedral_mesh (const h5_file_t, const char* name, h5t_mesh_t**);
h5_id_t
h5t_add_chunked_tetrahedral_mesh (
const h5_file_t, const char*, const h5_weight_t, h5t_mesh_t**);
h5_id_t h5t_add_triangle_mesh (const h5_file_t, const char*, h5t_mesh_t**);
h5_id_t
h5t_add_chunked_triangle_mesh (
const h5_file_t, const char*, const h5_weight_t, h5t_mesh_t**);
h5_id_t h5t_add_chunked_triangle_mesh (const h5_file_t, const char*, h5t_mesh_t**);
h5_lvl_idx_t
h5t_get_level (
h5t_mesh_t* const);
h5_lvl_idx_t h5t_get_level (h5t_mesh_t* const);
h5_err_t
h5t_open_tetrahedral_mesh (
const h5_file_t, const char*, h5t_mesh_t**);
h5_err_t h5t_open_tetrahedral_mesh (const h5_file_t ,
const char*, h5t_mesh_t**);
h5_err_t h5t_open_tetrahedral_mesh_by_idx (const h5_file_t ,
const h5_id_t, h5t_mesh_t**);
h5_err_t
h5t_open_tetrahedral_mesh_by_idx (
const h5_file_t, const h5_id_t, h5t_mesh_t**);
h5_err_t h5t_open_triangle_mesh (const h5_file_t,
const char*, h5t_mesh_t**);
h5_err_t h5t_open_triangle_mesh_by_idx (const h5_file_t,
const h5_id_t, h5t_mesh_t**);
h5_id_t h5t_add_tetrahedral_mesh (const h5_file_t,
const char* name, h5t_mesh_t**);
h5_id_t h5t_add_triangle_mesh (const h5_file_t,
const char*, h5t_mesh_t**);
h5_err_t
h5t_open_triangle_mesh (
const h5_file_t, const char*, h5t_mesh_t**);
h5_err_t h5t_set_level (h5t_mesh_t* const, const h5_lvl_idx_t);
h5_err_t
h5t_open_triangle_mesh_by_idx (
const h5_file_t, const h5_id_t, h5t_mesh_t**);
h5_err_t h5t_set_mesh_changed (h5t_mesh_t* const m);
h5_id_t
h5t_add_tetrahedral_mesh (
const h5_file_t, const char*, const h5_weight_t, h5t_mesh_t**);
h5_err_t h5t_close_mesh (h5t_mesh_t* const);
h5_id_t
h5t_add_triangle_mesh (
const h5_file_t, const char*, const h5_weight_t, h5t_mesh_t**);
h5_err_t
h5t_set_level (
h5t_mesh_t* const, const h5_lvl_idx_t);
h5_err_t
h5t_set_mesh_changed (
h5t_mesh_t* const m);
h5_err_t
h5t_close_mesh (
h5t_mesh_t* const);
#ifdef __cplusplus
}
src/include/h5core/h5t_store.h
+3 -7
View File
@@ -30,15 +30,11 @@ h5t_end_store_vertices (
h5_err_t
h5t_begin_store_elems (
h5t_mesh_t* const, const h5_size_t, const h5_weight_t);
h5t_mesh_t* const, const h5_size_t);
h5_loc_idx_t
h5t_store_elem (
h5t_mesh_t* const, const h5_loc_idx_t, const h5_loc_idx_t*, const h5_weight_t*);
h5_loc_idx_t
h5t_store_elem2 (
h5t_mesh_t* const, const h5_loc_idx_t, const h5_loc_idx_t*, const h5_weight_t*);
h5t_add_lvl0_cell (
h5t_mesh_t* const, const h5_loc_idx_t*, const h5_weight_t*);
h5_err_t
h5t_end_store_elems (
src/include/h5core/h5u_model.h
+1 -1
View File
@@ -41,7 +41,7 @@ h5u_set_num_particles (
h5_err_t
h5u_has_view (
const const h5_file_t);
const h5_file_t);
h5_err_t
h5u_reset_view (