- local IDs and indices are now 32bit (in the future it will be possible

to compile the library with 32bit or 64bit IDs/indices.
- bugfixes
This commit is contained in:
2011-02-03 10:40:40 +00:00
parent d0ce31c8c0
commit 2bc7cc1024
39 changed files with 545 additions and 389 deletions
+1 -1
View File
@@ -42,7 +42,7 @@ H5FedCloseMesh (
h5_err_t
H5FedSetLevel (
h5_file_t * f,
const h5_id_t level_id
const h5t_lvl_idx_t level_id
);
h5_err_t
+2 -2
View File
@@ -6,13 +6,13 @@ H5FedGetAdjacencies (
h5_file_t* const f,
const h5_loc_id_t entity_id,
const h5_int32_t dim,
h5_idlist_t** list
h5_loc_idlist_t** list
);
h5_err_t
H5FedReleaseListOfAdjacencies (
h5_file_t * const f,
h5_idlist_t **list
h5_loc_idlist_t **list
);
#endif
+3 -3
View File
@@ -55,10 +55,10 @@ H5FedBeginStoreElements (
);
h5_err_t
h5_loc_idx_t
H5FedStoreElement (
h5_file_t * const f,
const h5_loc_idx_t vertex_indices[]
h5_file_t* const f,
const h5_loc_idx_t local_vids[]
);
h5_err_t
+7 -9
View File
@@ -42,9 +42,11 @@ typedef int64_t h5_id_t;
typedef int16_t h5t_lvl_idx_t;
typedef h5_int32_t h5t_elem_flags_t;
typedef int64_t h5_glb_idx_t; // type for a global index
typedef int64_t h5_loc_idx_t; // type for a local index
//typedef int64_t h5_loc_idx_t; // type for a local index
typedef int32_t h5_loc_idx_t; // type for a local index
typedef int64_t h5_glb_id_t; // type for a global ID
typedef int64_t h5_loc_id_t; // type for a local ID
//typedef int64_t h5_loc_id_t; // type for a local ID
typedef int32_t h5_loc_id_t; // type for a local ID
typedef uint64_t h5_size_t; /* size in number of elements */
typedef int64_t h5_ssize_t; /* size in number of elements */
typedef int64_t h5_err_t;
@@ -56,12 +58,8 @@ typedef struct h5_complex {
h5_float64_t r,i;
} h5_complex_t;
typedef h5_id_t h5_2id_t[2];
typedef h5_id_t h5_3id_t[3];
typedef h5_id_t h5_4id_t[4];
typedef h5_float64_t h5_coord3d_t[3];
struct h5_file;
typedef struct h5_file h5_file_t;
@@ -75,11 +73,11 @@ typedef unsigned long MPI_Comm;
typedef unsigned long MPI_Datatype;
#endif
typedef struct h5_idlist {
typedef struct h5_loc_idlist {
int32_t size; /* allocated space in number of items */
int32_t num_items; /* stored items */
h5_id_t items[1];
} h5_idlist_t;
h5_loc_id_t items[1];
} h5_loc_idlist_t;
struct h5_idxmap;
typedef struct h5_idxmap h5_idxmap_t;
+3 -3
View File
@@ -6,13 +6,13 @@ h5t_get_adjacencies (
h5_file_t * const f,
const h5_loc_id_t entity_id,
const h5_int32_t dim,
h5_idlist_t **list
h5_loc_idlist_t **list
);
h5_err_t
h5t_release_list_of_adjacencies (
h5_file_t * const f,
h5_idlist_t **list
h5_loc_idlist_t **list
);
h5_err_t
@@ -20,7 +20,7 @@ h5t_find_te2 (
h5_file_t* const f,
h5_loc_idx_t face_idx,
h5_loc_idx_t elem_idx,
h5_idlist_t** retval
h5_loc_idlist_t** retval
);
#endif
+3 -3
View File
@@ -1,9 +1,9 @@
#ifndef __H5T_MAP_H
#define __H5T_MAP_H
h5_id_t
h5_loc_idx_t
h5t_map_global_vertex_idx2local (
h5_file_t * const f,
h5_file_t* const f,
h5_glb_idx_t glb_idx
);
@@ -33,7 +33,7 @@ h5_err_t
h5t_get_vertex_index_of_vertex (
h5_file_t* const f,
const h5_loc_id_t entity_id,
h5_id_t* vertex_index
h5_loc_idx_t* vertex_index
);
h5_err_t
+5 -5
View File
@@ -11,8 +11,8 @@ typedef struct {
h5_loc_idx_t elem_idx;
h5_loc_idx_t face_idx; // face according reference element
int codim; // dimension of entities to traverse
h5_err_t (*find)(h5_file_t *const f, h5_id_t face_idx,
h5_id_t elem_idx, h5_idlist_t **retval);
h5_err_t (*find)(h5_file_t *const f, h5_loc_id_t face_idx,
h5_loc_id_t elem_idx, h5_loc_idlist_t **retval);
} h5t_leaf_iterator_t;
typedef struct {
@@ -22,8 +22,8 @@ typedef struct {
h5_loc_idx_t elem_idx;
h5_loc_idx_t face_idx; // face according reference element
int codim; // dimension of entities to traverse
h5_err_t (*find)(h5_file_t *const f, h5_id_t face_idx,
h5_id_t elem_idx, h5_idlist_t **retval);
h5_err_t (*find)(h5_file_t *const f, h5_loc_id_t face_idx,
h5_loc_id_t elem_idx, h5_loc_idlist_t **retval);
} h5t_level_iterator_t;
typedef struct {
@@ -73,7 +73,7 @@ h5t_release_entity_iterator (
h5t_iterator_t* iter
);
h5_id_t
h5_loc_id_t
h5t_iterate_entities (
h5_file_t * const f,
h5t_iterator_t *iter
+2 -2
View File
@@ -18,7 +18,7 @@ h5t_begin_store_vertices (
const h5_size_t num
);
h5_id_t
h5_loc_id_t
h5t_store_vertex (
h5_file_t * const f,
const h5_glb_id_t glb_id,
@@ -53,7 +53,7 @@ h5t_begin_refine_elems (
h5_file_t * const f
);
h5_id_t
h5_err_t
h5t_refine_marked_elems (
h5_file_t * const f
);