From bd4908eebaf817dd5093582fad77b424d99ce90c Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 27 May 2010 13:26:22 +0000 Subject: [PATCH] adapted to coding style --- src/h5core/h5t_map.c | 214 +++++++++++++++++++++---------------------- 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/src/h5core/h5t_map.c b/src/h5core/h5t_map.c index 8828e4b..b6109e3 100644 --- a/src/h5core/h5t_map.c +++ b/src/h5core/h5t_map.c @@ -19,21 +19,21 @@ cmp_vertices ( h5_float64_t P1[3] ) { int i; - for ( i = 0; i < 3; i++ ) { - h5_int64_t diff = h5priv_fcmp ( P0[i], P1[i], 10 ); - if ( diff < 0 ) return -1; - else if ( diff > 0 ) return 1; + for (i = 0; i < 3; i++) { + h5_int64_t diff = h5priv_fcmp (P0[i], P1[i], 10); + if (diff < 0) return -1; + else if (diff > 0) return 1; } return 0; } static int qsort_cmp_vertices ( - void * _f, + void* _f, const void* _local_vid1, const void* _local_vid2 ) { - h5_file_t *f = (h5_file_t*)_f; + h5_file_t* f = (h5_file_t*)_f; h5_id_t local_vid1 = *(h5_id_t*)_local_vid1; h5_id_t local_vid2 = *(h5_id_t*)_local_vid2; @@ -47,16 +47,16 @@ qsort_cmp_vertices ( */ h5_err_t h5tpriv_sort_vertices ( - h5_file_t * const f + h5_file_t* const f ) { - h5t_fdata_t *t = f->t; - if ( t->num_levels <= 0 ) return H5_SUCCESS; + h5t_fdata_t* t = f->t; + if (t->num_levels <= 0) return H5_SUCCESS; h5_id_t local_vid = t->cur_level > 0 ? t->num_vertices[t->cur_level-1] : 0; h5_id_t num_vertices = t->num_vertices[t->num_levels-1]; - for ( ; local_vid < num_vertices; local_vid++ ) { + for (; local_vid < num_vertices; local_vid++) { t->sorted_lvertices.items[local_vid] = local_vid; } t->sorted_lvertices.num_items = num_vertices; @@ -64,9 +64,9 @@ h5tpriv_sort_vertices ( h5priv_qsort_r ( t->sorted_lvertices.items, num_vertices, - sizeof(t->sorted_lvertices.items[0]), + sizeof (t->sorted_lvertices.items[0]), f, - qsort_cmp_vertices ); + qsort_cmp_vertices); return H5_SUCCESS; } @@ -80,10 +80,10 @@ h5tpriv_sort_vertices ( */ h5_id_t h5tpriv_get_local_vid ( - h5_file_t * const f, + h5_file_t* const f, h5_float64_t P[3] ) { - h5t_fdata_t *t = f->t; + h5t_fdata_t*t = f->t; register h5_id_t low = 0; register h5_id_t high = t->sorted_lvertices.num_items - 1; while (low <= high) { @@ -119,21 +119,21 @@ h5tpriv_get_local_vid ( */ static int vcmp_elems ( - h5_file_t *f, - h5_id_t *e1, - h5_id_t *e2 + h5_file_t* const f, + const h5_id_t* e1, + const h5_id_t* e2 ) { - struct h5t_fdata *t = f->t; + h5t_fdata_t* t = f->t; int i; int num_vertices = t->ref_element->num_faces[0]; - for ( i = 0; i < num_vertices; i++ ) { + for (i = 0; i < num_vertices; i++) { int r = cmp_vertices ( t->vertices[e1[i]].P, t->vertices[e2[i]].P ); - if ( r < 0 ) return -1; - else if ( r > 0 ) return 1; + if (r < 0) return -1; + else if (r > 0) return 1; } return 0; } @@ -143,26 +143,26 @@ vcmp_elems ( */ static int cmp_elems ( - h5_file_t * f, - h5_id_t local_eid1, - h5_id_t local_eid2 + h5_file_t* const f, + const h5_id_t local_eid1, + const h5_id_t local_eid2 ) { - struct h5t_fdata *t = f->t; + h5t_fdata_t* t = f->t; int num_vertices = t->ref_element->num_faces[0]; int i; - for ( i = 0; i < num_vertices; i++ ) { + for (i = 0; i < num_vertices; i++) { int r = cmp_vertices ( - get_vertex_of_elem ( f, i, local_eid1 ), - get_vertex_of_elem ( f, i, local_eid2 ) ); - if ( r < 0 ) return -1; - else if ( r > 0 ) return 1; + get_vertex_of_elem (f, i, local_eid1), + get_vertex_of_elem (f, i, local_eid2)); + if (r < 0) return -1; + else if (r > 0) return 1; } return 0; } static int cmp_elems1 ( - h5_file_t * f, + h5_file_t* f, h5_id_t local_eid1, h5_id_t local_eid2 ) { @@ -183,26 +183,26 @@ cmp_elems1 ( static int qsort_cmp_elems0 ( - void *_f, + void* _f, const void* _local_eid1, const void* _local_eid2 ) { - h5_file_t *f = (h5_file_t*)_f; + h5_file_t* f = (h5_file_t*)_f; h5_id_t local_eid1 = *(h5_id_t*)_local_eid1; h5_id_t local_eid2 = *(h5_id_t*)_local_eid2; - return cmp_elems ( f, local_eid1, local_eid2 ); + return cmp_elems (f, local_eid1, local_eid2); } static int qsort_cmp_elems1 ( - void *_f, + void* _f, const void* _local_eid1, const void* _local_eid2 ) { - h5_file_t *f = (h5_file_t*)_f; + h5_file_t* f = (h5_file_t*)_f; h5_id_t local_eid1 = *(h5_id_t*)_local_eid1; h5_id_t local_eid2 = *(h5_id_t*)_local_eid2; - return cmp_elems1 ( f, local_eid1, local_eid2 ); + return cmp_elems1 (f, local_eid1, local_eid2); } /*! @@ -211,18 +211,18 @@ qsort_cmp_elems1 ( */ h5_err_t h5tpriv_sort_elems ( - h5_file_t *f + h5_file_t* const f ) { - h5t_fdata_t *t = f->t; - if ( t->num_levels <= 0 ) return H5_SUCCESS; + h5t_fdata_t* t = f->t; + if (t->num_levels <= 0) return H5_SUCCESS; h5_id_t local_eid = t->cur_level > 0 ? t->num_elems[t->cur_level-1] : 0; h5_size_t num_elems = t->num_elems[t->num_levels-1]; int k; h5_id_t i; - for ( k = 0; k < 2; k++ ) { - TRY( h5priv_alloc_idlist_items ( f, &t->sorted_elems[k], num_elems ) ); - for ( i = local_eid; i < num_elems; i++ ) { + for (k = 0; k < 2; k++) { + TRY( h5priv_alloc_idlist_items (f, &t->sorted_elems[k], num_elems) ); + for (i = local_eid; i < num_elems; i++) { t->sorted_elems[k].items[i] = i; } t->sorted_elems[k].num_items = num_elems; @@ -231,15 +231,15 @@ h5tpriv_sort_elems ( h5priv_qsort_r ( t->sorted_elems[0].items, num_elems, - sizeof(t->sorted_elems[0].items[0]), + sizeof (t->sorted_elems[0].items[0]), f, - qsort_cmp_elems0 ); + qsort_cmp_elems0); h5priv_qsort_r ( t->sorted_elems[1].items, num_elems, - sizeof(t->sorted_elems[1].items[0]), + sizeof (t->sorted_elems[1].items[0]), f, - qsort_cmp_elems1 ); + qsort_cmp_elems1); return H5_SUCCESS; } @@ -249,21 +249,21 @@ h5tpriv_sort_elems ( */ h5_err_t h5tpriv_sort_local_vids ( - h5_file_t * const f, - h5_id_t * const local_vids, /* IN/OUT: local vertex ids */ + h5_file_t* const f, + h5_id_t* const local_vids, /* IN/OUT: local vertex ids */ const h5_size_t size /* size of array */ ) { - struct h5t_fdata *t = f->t; + h5t_fdata_t* t = f->t; h5_size_t i; - for ( i = 1; i < size; ++i ) { + for (i = 1; i < size; ++i) { h5_id_t local_vid = local_vids[i]; h5_id_t j = i; - while ( (j >= 1 ) && cmp_vertices ( - t->vertices[local_vid].P, - t->vertices[local_vids[j-1]].P - ) < 0 ) { + while ((j >= 1 ) && cmp_vertices ( + t->vertices[local_vid].P, + t->vertices[local_vids[j-1]].P + ) < 0 ) { local_vids[j] = local_vids[j-1]; --j; } @@ -279,10 +279,10 @@ h5tpriv_sort_local_vids ( */ static h5_id_t search_elem ( - h5_file_t *f, - h5_id_t * const local_vids /* local vertex ids */ + h5_file_t* const f, + h5_id_t* const local_vids /* local vertex ids */ ) { - h5t_fdata_t *t = f->t; + h5t_fdata_t* t = f->t; int num_vertices = t->ref_element->num_faces[0]; h5tpriv_sort_local_vids ( f, local_vids, num_vertices ); @@ -295,14 +295,14 @@ search_elem ( h5_id_t local_eid = t->sorted_elems[0].items[mid]; h5_id_t *elem2 = t->elems_ldta[local_eid].local_vids; int diff = vcmp_elems ( f, elem1, elem2 ); - if ( diff < 0 ) + if (diff < 0) high = mid - 1; - else if ( diff > 0 ) + else if (diff > 0) low = mid + 1; else return mid; // found } - return h5tpriv_error_local_elem_nexist ( f, local_vids ); + return h5tpriv_error_local_elem_nexist (f, local_vids); } /*! @@ -310,28 +310,28 @@ search_elem ( */ h5_id_t h5t_map_global_vid2local ( - h5_file_t *f, + h5_file_t* const f, const h5_id_t global_id ) { - struct h5t_fdata *t = f->t; + h5t_fdata_t* t = f->t; - h5_id_t local_id = h5priv_search_idmap ( &t->map_vertex_g2l, global_id ); - if ( local_id < 0 ) - return h5tpriv_error_global_id_nexist ( f, "vertex", global_id ); + h5_id_t local_id = h5priv_search_idmap (&t->map_vertex_g2l, global_id); + if (local_id < 0) + return h5tpriv_error_global_id_nexist (f, "vertex", global_id); return local_id; } h5_err_t h5t_map_global_vids2local ( - h5_file_t *f, - const h5_id_t * const global_vids, + h5_file_t* const f, + const h5_id_t* const global_vids, const h5_id_t size, - h5_id_t * const local_vids + h5_id_t* const local_vids ) { h5_id_t i; - for ( i = 0; i < size; i++ ) { - TRY ( ( local_vids[i] = h5t_map_global_vid2local ( - f, global_vids[i] ) ) ); + for (i = 0; i < size; i++) { + TRY( (local_vids[i] = h5t_map_global_vid2local ( + f, global_vids[i])) ); } return H5_SUCCESS; } @@ -346,58 +346,58 @@ h5t_map_global_vids2local ( */ h5_id_t h5t_map_global_eid2local ( - h5_file_t * const f, + h5_file_t* const f, const h5_id_t global_eid ) { - struct h5t_fdata *t = f->t; - h5_id_t local_eid = h5priv_search_idmap ( &t->map_elem_g2l, global_eid ); - if ( local_eid < 0 ) - return h5tpriv_error_global_id_nexist ( f, "elem", global_eid ); + h5t_fdata_t* t = f->t; + h5_id_t local_eid = h5priv_search_idmap (&t->map_elem_g2l, global_eid); + if (local_eid < 0) + return h5tpriv_error_global_id_nexist (f, "elem", global_eid); return local_eid; } h5_err_t h5tpriv_rebuild_global_2_local_map_of_vertices ( - h5_file_t * const f + h5_file_t* const f ) { - struct h5t_fdata *t = f->t; - if ( t->num_levels <= 0 ) return H5_SUCCESS; + h5t_fdata_t* t = f->t; + if (t->num_levels <= 0) return H5_SUCCESS; h5_id_t local_vid = t->cur_level > 0 ? t->num_vertices[t->cur_level-1] : 0; - for ( ; local_vid < t->num_vertices[t->num_levels-1]; local_vid++ ) { + for (; local_vid < t->num_vertices[t->num_levels-1]; local_vid++) { t->map_vertex_g2l.items[local_vid].global_id = t->vertices[local_vid].global_vid; t->map_vertex_g2l.items[local_vid].local_id = local_vid; t->map_vertex_g2l.num_items++; } - h5priv_sort_idmap ( &t->map_vertex_g2l ); + h5priv_sort_idmap (&t->map_vertex_g2l); return H5_SUCCESS; } h5_err_t h5tpriv_rebuild_global_2_local_map_of_elems ( - h5_file_t * const f + h5_file_t* const f ) { - h5t_fdata_t *t = f->t; - if ( t->num_levels <= 0 ) return H5_SUCCESS; + h5t_fdata_t* t = f->t; + if (t->num_levels <= 0) return H5_SUCCESS; h5_id_t local_eid = t->cur_level > 0 ? t->num_elems[t->cur_level-1] : 0; h5_id_t num_elems = t->num_elems[t->num_levels-1]; h5_idmap_el_t *item = &t->map_elem_g2l.items[local_eid]; size_t offset = h5tpriv_sizeof_elem[t->mesh_type]; void *elemp = t->elems.data + local_eid*offset; - for ( ; - local_eid < num_elems; - local_eid++, - item++, - elemp+=offset ) { - h5_elem_t *elem = (h5_elem_t*)elemp; + for (; + local_eid < num_elems; + local_eid++, + item++, + elemp+=offset) { + h5_elem_t* elem = (h5_elem_t*)elemp; item->global_id = elem->global_eid; item->local_id = local_eid; t->map_elem_g2l.num_items++; } - h5priv_sort_idmap ( &t->map_elem_g2l ); + h5priv_sort_idmap (&t->map_elem_g2l); return H5_SUCCESS; } @@ -412,9 +412,9 @@ map_entity_type_to_dimension[] = { -1, h5_err_t h5t_get_vertex_indices_of_entity ( - h5_file_t * const f, + h5_file_t* const f, const h5_id_t entity_id, - h5_id_t *vertex_indices + h5_id_t* vertex_indices ) { h5_id_t entity_type = h5tpriv_get_entity_type (entity_id); h5_id_t face_idx = h5tpriv_get_face_idx (entity_id); @@ -462,9 +462,9 @@ h5t_get_vertex_index_of_vertex2 ( */ h5_err_t h5t_get_vertex_indices_of_edge ( - h5_file_t * const f, + h5_file_t* const f, const h5_id_t entity_id, - h5_id_t *vertex_indices + h5_id_t* vertex_indices ) { h5_id_t face_idx = h5tpriv_get_face_idx (entity_id); h5_id_t elem_idx = h5tpriv_get_elem_idx (entity_id); @@ -481,13 +481,13 @@ h5t_get_vertex_indices_of_edge ( */ h5_err_t h5t_get_vertex_indices_of_edge2 ( - h5_file_t * const f, + h5_file_t* const f, const h5_id_t face_idx, // edge index according ref. element const h5_id_t elem_idx, // local element index - h5_id_t *vertex_indices // OUT: vertex ID's + h5_id_t* vertex_indices // OUT: vertex ID's ) { const h5t_ref_element_t* ref_element = f->t->ref_element; - h5_elem_ldta_t *el = &f->t->elems_ldta[elem_idx]; + h5_elem_ldta_t* el = &f->t->elems_ldta[elem_idx]; vertex_indices[0] = el->local_vids[ref_element->map[1][face_idx][0]]; vertex_indices[1] = el->local_vids[ref_element->map[1][face_idx][1]]; @@ -496,9 +496,9 @@ h5t_get_vertex_indices_of_edge2 ( h5_err_t h5t_get_vertex_indices_of_triangle ( - h5_file_t * const f, + h5_file_t* const f, const h5_id_t entity_id, - h5_id_t *vertex_indices + h5_id_t* vertex_indices ) { h5_id_t face_idx = h5tpriv_get_face_idx (entity_id); h5_id_t elem_idx = h5tpriv_get_elem_idx (entity_id); @@ -508,13 +508,13 @@ h5t_get_vertex_indices_of_triangle ( h5_err_t h5t_get_vertex_indices_of_triangle2 ( - h5_file_t * const f, + h5_file_t* const f, const h5_id_t face_idx, const h5_id_t elem_idx, - h5_id_t *vertex_indices + h5_id_t* vertex_indices ) { const h5t_ref_element_t* ref_element = f->t->ref_element; - h5_elem_ldta_t *el = &f->t->elems_ldta[elem_idx]; + h5_elem_ldta_t* el = &f->t->elems_ldta[elem_idx]; vertex_indices[0] = el->local_vids[ref_element->map[2][face_idx][0]]; vertex_indices[1] = el->local_vids[ref_element->map[2][face_idx][1]]; @@ -525,13 +525,13 @@ h5t_get_vertex_indices_of_triangle2 ( h5_err_t h5t_get_vertex_indices_of_tet ( - h5_file_t * const f, + h5_file_t* const f, const h5_id_t entity_id, - h5_id_t *vertex_indices + h5_id_t* vertex_indices ) { h5_id_t elem_idx = h5tpriv_get_elem_idx (entity_id); const h5t_ref_element_t* ref_element = f->t->ref_element; - h5_elem_ldta_t *el = &f->t->elems_ldta[elem_idx]; + h5_elem_ldta_t* el = &f->t->elems_ldta[elem_idx]; vertex_indices[0] = el->local_vids[ref_element->map[3][0][0]]; vertex_indices[1] = el->local_vids[ref_element->map[3][0][1]];