From 0b9dcea258207d7345d54388f916c8e1233aac40 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 27 Jul 2009 15:16:30 +0000 Subject: [PATCH] set error handler to abort programm and removed all error checks --- test/H5Fed/tetmesh_read.c | 101 ++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 60 deletions(-) diff --git a/test/H5Fed/tetmesh_read.c b/test/H5Fed/tetmesh_read.c index 6470f1b..87bdde5 100644 --- a/test/H5Fed/tetmesh_read.c +++ b/test/H5Fed/tetmesh_read.c @@ -1,5 +1,6 @@ #include #include +#include #include #include "H5Part.h" #include "H5Fed.h" @@ -23,8 +24,8 @@ struct tet { }; typedef struct tet tet_t; -h5_err_t -read_vertices ( +static h5_err_t +traverse_vertices ( h5_file_t * f ) { h5_id_t id, local_id; @@ -34,12 +35,13 @@ read_vertices ( h5_size_t num = H5FedGetNumVerticesTotal ( f ); printf ( " Number of vertices on level: %lld\n", num ); - h5_err_t h5err = H5FedBeginTraverseVertices ( f ); - if ( h5err < 0 ) return h5err; + H5FedBeginTraverseVertices ( f ); while ( (real_num < num) && ((local_id = H5FedTraverseVertices ( f, &id, P )) >= 0) ) { - printf ( " Vertex[%lld]: local id: %lld, coords: %f %f %f \n", - id, local_id, P[0], P[1], P[2] ); + char v[256]; + snprintf ( v, sizeof(v), "=%llx=", local_id ); + printf ( "| %-18s | (%f, %f, %f) |\n", + v, P[0], P[1], P[2] ); real_num++; } H5FedEndTraverseVertices ( f ); @@ -47,19 +49,18 @@ read_vertices ( if ( real_num != num ) { fprintf ( stderr, "!!! Got %lld vertices, but expected %lld.\n", real_num, num ); - return -1; + exit ( 1 ); } return H5_SUCCESS; } -h5_err_t +static h5_err_t traverse_edges ( h5_file_t * f ) { h5_id_t local_id, vids[4]; - h5_err_t h5err = H5FedBeginTraverseEdges ( f ); - if ( h5err < 0 ) return h5err; + H5FedBeginTraverseEdges ( f ); printf ( "Edges on level %lld:\n", H5FedGetLevel(f) ); while ( (local_id = H5FedTraverseEdges ( f, vids )) >= 0 ) { char v[256]; @@ -71,18 +72,17 @@ traverse_edges ( local_vids[0], local_vids[1] ); printf ( "| %-18s | %-18s |\n", k, v ); } - h5err = H5FedEndTraverseEdges ( f ); - return h5err; + H5FedEndTraverseEdges ( f ); + return H5_SUCCESS; } -h5_err_t +static h5_err_t traverse_triangles ( h5_file_t * f ) { h5_id_t local_id, vids[4]; - h5_err_t h5err = H5FedBeginTraverseTriangles ( f ); - if ( h5err < 0 ) return h5err; + H5FedBeginTraverseTriangles ( f ); printf ( "Triangles on level %lld:\n", H5FedGetLevel(f) ); while ( (local_id = H5FedTraverseTriangles ( f, vids )) >= 0 ) { char v[256]; @@ -94,12 +94,12 @@ traverse_triangles ( local_vids[0], local_vids[1], local_vids[2] ); printf ( "| %-18s | %-18s |\n", d, v ); } - h5err = H5FedEndTraverseTriangles ( f ); - return h5err; + H5FedEndTraverseTriangles ( f ); + return H5_SUCCESS; } -h5_err_t -read_tets ( +static h5_err_t +traverse_tets ( h5_file_t * f ) { h5_id_t id, local_id, parent_id, vids[4]; @@ -108,9 +108,7 @@ read_tets ( h5_size_t num = H5FedGetNumElementsTotal ( f ); printf ( " Number of tetrahedra on level: %lld\n", num ); - h5_err_t h5err = H5FedBeginTraverseElements ( f ); - if ( h5err < 0 ) return h5err; - + H5FedBeginTraverseElements ( f ); while ( (real_num < num) && ((local_id = H5FedTraverseElements ( f, &id, &parent_id, vids )) >= 0) ) { @@ -128,33 +126,25 @@ read_tets ( if ( real_num != num ) { fprintf ( stderr, "!!! Got %lld tets, but expected %lld.\n", real_num, num ); - return -1; + exit(1); } return H5_SUCCESS; } -h5_err_t +static h5_err_t read_level ( h5_file_t * f ) { - h5_err_t h5err = read_vertices ( f ); - if ( h5err < 0 ) { - fprintf ( stderr, "!!! Oops ...\n" ); - return -1; - } - h5err = traverse_edges ( f ); - h5err = traverse_triangles ( f ); - h5err = read_tets ( f ); - if ( h5err < 0 ) { - fprintf ( stderr, "!!! Oops ...\n" ); - return -1; - } + traverse_vertices ( f ); + traverse_edges ( f ); + traverse_triangles ( f ); + traverse_tets ( f ); return H5_SUCCESS; } -h5_err_t -read_mesh ( +static h5_err_t +traverse_mesh ( h5_file_t * f ) { @@ -182,36 +172,27 @@ main ( int argc, char *argv[] ) { - - H5SetVerbosityLevel ( 4 ); + H5SetVerbosityLevel ( 2 ); + H5SetErrorHandler ( H5AbortErrorhandler ); h5_file_t *f = H5OpenFile ( "simple_tet.h5", H5_O_RDONLY, 0 ); - if ( f == NULL ) { - fprintf ( stderr, "!!! Can't open file.\n" ); - return -1; - } - h5_size_t num_meshes = H5FedGetNumMeshes ( f, H5_TETRAHEDRAL_MESH ); printf ( " Number of meshes: %lld\n", num_meshes ); h5_id_t mesh_id; for ( mesh_id = 0; mesh_id < num_meshes; mesh_id++ ) { - h5_err_t h5err = H5FedOpenMesh ( f, mesh_id, H5_TETRAHEDRAL_MESH ); - if ( h5err < 0 ) { - fprintf ( stderr, "!!! Can't open mesh %lld\n", mesh_id ); - return -1; - } - h5err = read_mesh ( f ); - if ( h5err < 0 ) { - fprintf ( stderr, "!!! Oops ...\n" ); - return 1; - } + fprintf ( + stderr, + "Time used: %f\n", + (float)clock()/(float)CLOCKS_PER_SEC ); + H5FedOpenMesh ( f, mesh_id, H5_TETRAHEDRAL_MESH ); + fprintf ( + stderr, + "Time used: %f\n", + (float)clock()/(float)CLOCKS_PER_SEC ); + traverse_mesh ( f ); } - h5_err_t h5err = H5CloseFile ( f ); - if ( h5err < 0 ) { - fprintf ( stderr, "!!! Can't close file.\n" ); - return -1; - } + H5CloseFile ( f ); return 0; }