diff --git a/test/H5Fed/Makefile.am b/test/H5Fed/Makefile.am index 6f5b990..e424373 100644 --- a/test/H5Fed/Makefile.am +++ b/test/H5Fed/Makefile.am @@ -3,11 +3,9 @@ OBJEXT = o # COMPILER SETTING +CC = @CC@ CXX = @CXX@ FC = @FC@ -MPIFC = @MPIFC@ -MPICXX = @MPICXX@ -MPICC = @MPICC@ # COMPILER FLAG SETTING AM_CFLAGS = @CFLAGS@ diff --git a/test/H5Fed/tetmesh_adjacencies.c b/test/H5Fed/tetmesh_adjacencies.c index bc1dbdf..506c5a7 100644 --- a/test/H5Fed/tetmesh_adjacencies.c +++ b/test/H5Fed/tetmesh_adjacencies.c @@ -14,16 +14,16 @@ static h5_err_t print_adjacencies_of_vertex ( h5_file_t* const f, h5_id_t local_id, - clock_t* t + clock_t* time_used ) { h5_idlist_t* uadj_edges; h5_idlist_t* uadj_triangles; h5_idlist_t* uadj_tets; - clock_t t1 = clock(); - H5FedGetEdgesUpAdjacentToVertex (f, local_id, &uadj_edges); - H5FedGetTrianglesUpAdjacentToVertex (f, local_id, &uadj_triangles); - H5FedGetTetsUpAdjacentToVertex (f, local_id, &uadj_tets); - *t = clock() - t1; + clock_t time_used_before = clock(); + H5FedGetAdjacencies (f, local_id, 1, &uadj_edges); + H5FedGetAdjacencies (f, local_id, 2, &uadj_triangles); + H5FedGetAdjacencies (f, local_id, 3, &uadj_tets); + *time_used = clock() - time_used_before; int n = uadj_tets->num_items; if (uadj_triangles->num_items > n) n = uadj_triangles->num_items; if (uadj_edges->num_items > n) n = uadj_edges->num_items; @@ -76,16 +76,16 @@ static h5_err_t print_adjacencies_of_edge ( h5_file_t* const f, h5_id_t local_id, - clock_t* t + clock_t* time_used ) { h5_idlist_t* dadj_vertices; h5_idlist_t* uadj_triangles; h5_idlist_t* uadj_tets; - clock_t t1 = clock(); - H5FedGetVerticesDownAdjacentToEdge (f, local_id, &dadj_vertices); - H5FedGetTrianglesUpAdjacentToEdge (f, local_id, &uadj_triangles); - H5FedGetTetsUpAdjacentToEdge (f, local_id, &uadj_tets); - *t = clock() - t1; + clock_t time_used_before = clock(); + H5FedGetAdjacencies (f, local_id, 0, &dadj_vertices); + H5FedGetAdjacencies (f, local_id, 2, &uadj_triangles); + H5FedGetAdjacencies (f, local_id, 3, &uadj_tets); + *time_used = clock() - time_used_before; int n = dadj_vertices->num_items; if (uadj_triangles->num_items > n) n = uadj_triangles->num_items; if (uadj_tets->num_items > n) n = uadj_tets->num_items; @@ -137,16 +137,16 @@ static h5_err_t print_adjacencies_of_triangle ( h5_file_t* const f, h5_id_t local_id, - clock_t* t + clock_t* time_used ) { h5_idlist_t* dadj_vertices; h5_idlist_t* dadj_edges; h5_idlist_t* uadj_tets; - clock_t t1 = clock(); - H5FedGetVerticesDownAdjacentToTriangle (f, local_id, &dadj_vertices); - H5FedGetEdgesDownAdjacentToTriangle (f, local_id, &dadj_edges); - H5FedGetTetsUpAdjacentToTriangle (f, local_id, &uadj_tets); - *t = clock() - t1; + clock_t time_used_before = clock(); + H5FedGetAdjacencies (f, local_id, 0, &dadj_vertices); + H5FedGetAdjacencies (f, local_id, 1, &dadj_edges); + H5FedGetAdjacencies (f, local_id, 3, &uadj_tets); + *time_used = clock() - time_used_before; int n = dadj_vertices->num_items; if (dadj_edges->num_items > n) n = dadj_edges->num_items; if (uadj_tets->num_items > n) n = uadj_tets->num_items; @@ -197,16 +197,16 @@ static h5_err_t print_adjacencies_of_tet ( h5_file_t* const f, h5_id_t local_id, - clock_t* t + clock_t* time_used ) { h5_idlist_t* dadj_vertices; h5_idlist_t* dadj_edges; h5_idlist_t* dadj_triangles; - clock_t t1 = clock(); - H5FedGetVerticesDownAdjacentToTet (f, local_id, &dadj_vertices); - H5FedGetEdgesDownAdjacentToTet (f, local_id, &dadj_edges); - H5FedGetTrianglesDownAdjacentToTet (f, local_id, &dadj_triangles); - *t = clock() - t1; + clock_t time_used_before = clock(); + H5FedGetAdjacencies (f, local_id, 0, &dadj_vertices); + H5FedGetAdjacencies (f, local_id, 1, &dadj_edges); + H5FedGetAdjacencies (f, local_id, 2, &dadj_triangles); + *time_used = clock() - time_used_before; int n = dadj_vertices->num_items; if (dadj_edges->num_items > n) n = dadj_edges->num_items; if (dadj_triangles->num_items > n) n = dadj_triangles->num_items; @@ -408,7 +408,7 @@ traverse_mesh ( printf (" Opening mesh with id %lld\n", mesh_id); H5FedOpenMesh (f, mesh_id, mesh_type); h5_size_t num_levels = H5FedGetNumLevels (f); - printf (" Number of levels in mesh: %lld\n", num_levels); + printf (" Number of levels in mesh: %lld\n", (long long)num_levels); /* loop over all levels */ h5_id_t level_id; @@ -433,7 +433,7 @@ main ( /* open file and get number of meshes */ h5_file_t *f = H5OpenFile (FNAME, H5_O_RDONLY, 0); h5_size_t num_meshes = H5FedGetNumMeshes (f, MESH_TYPE); - printf (" Number of meshes: %lld\n", num_meshes); + printf (" Number of meshes: %lld\n", (long long)num_meshes); /* loop over all meshes */ h5_id_t mesh_id; diff --git a/test/H5Fed/tetmesh_read.c b/test/H5Fed/tetmesh_read.c index 610d2fa..9b368d4 100644 --- a/test/H5Fed/tetmesh_read.c +++ b/test/H5Fed/tetmesh_read.c @@ -24,7 +24,7 @@ traverse_vertices ( h5_size_t num_vertices = 0; while ((local_id = H5FedTraverseEntities ( f, iter )) >= 0) { h5_float64_t P[3]; - H5FedGetVertexCoordByID (f, local_id, P); + H5FedGetVertexCoordsByID (f, local_id, P); char v[256]; snprintf (v, sizeof(v), "=%llx=", local_id); printf ("| %-18s | (%f, %f, %f) |\n", @@ -37,11 +37,13 @@ traverse_vertices ( /* report error if we got a different number then expected */ if (num_vertices != num_vertices_expect) { - fprintf (stderr, "!!! Got %lld vertices, but expected %lld.\n", - num_vertices, num_vertices_expect); + fprintf (stderr, "!!! Got %lud vertices, but expected %lud.\n", + (unsigned long)num_vertices, + (unsigned long)num_vertices_expect); } - printf (" Number of vertices on level: %lld\n", num_vertices); + printf (" Number of vertices on level: %lud\n", + (unsigned long)num_vertices); return H5_SUCCESS; } @@ -72,7 +74,7 @@ traverse_edges ( /* done */ H5FedEndTraverseEntities ( f, iter ); - printf (" Number of edges: %lld\n", num_edges); + printf (" Number of edges: %lud\n", (unsigned long)num_edges); return H5_SUCCESS; } @@ -103,7 +105,8 @@ traverse_triangles ( /* done */ H5FedEndTraverseEntities ( f, iter ); - printf (" Number of triangles: %lld\n", num_triangles); + printf (" Number of triangles: %lud\n", + (unsigned long)num_triangles); return H5_SUCCESS; } @@ -139,11 +142,11 @@ traverse_elems ( /* report error if we got a different number then expected */ if (num_elems != num_elems_expect) { fprintf (stderr, "!!! Got %lld elements, but expected %lld.\n", - num_elems, num_elems_expect); + (long long)num_elems, (long long)num_elems_expect); exit(1); } - printf (" Number of elements on level: %lld\n", num_elems); + printf (" Number of elements on level: %lld\n", (long long)num_elems); return H5_SUCCESS; } @@ -172,7 +175,7 @@ traverse_mesh ( printf (" Opening mesh with id %lld\n", mesh_id); H5FedOpenMesh (f, mesh_id, mesh_type); h5_size_t num_levels = H5FedGetNumLevels (f); - printf (" Number of levels in mesh: %lld\n", num_levels); + printf (" Number of levels in mesh: %lld\n", (long long)num_levels); /* loop over all levels */ h5_id_t level_id; @@ -197,7 +200,7 @@ main ( /* open file and get number of meshes */ h5_file_t* f = H5OpenFile (FNAME, H5_O_RDONLY, 0); h5_size_t num_meshes = H5FedGetNumMeshes (f, MESH_TYPE); - printf (" Number of meshes: %lld\n", num_meshes); + printf (" Number of meshes: %lld\n", (long long)num_meshes); /* loop over all meshes */ h5_id_t mesh_id; diff --git a/test/H5Fed/tetmesh_read_tags.c b/test/H5Fed/tetmesh_read_tags.c index 6f75d9c..07bd83b 100644 --- a/test/H5Fed/tetmesh_read_tags.c +++ b/test/H5Fed/tetmesh_read_tags.c @@ -50,7 +50,7 @@ traverse_vertices ( if ( real_num != num ) { fprintf ( stderr, "!!! Got %lld vertices, but expected %lld.\n", - real_num, num ); + (long long)real_num, (long long)num ); exit ( 1 ); } return H5_SUCCESS; @@ -131,7 +131,7 @@ traverse_tets ( H5FedEndTraverseEntities (f, iter); if ( real_num != num ) { fprintf ( stderr, "!!! Got %lld tets, but expected %lld.\n", - real_num, num ); + (long long)real_num, (long long)num ); exit(1); } @@ -156,7 +156,7 @@ traverse_mesh ( h5_id_t level_id; h5_size_t num_levels = H5FedGetNumLevels ( f ); - printf ( " Number of levels in mesh: %lld\n", num_levels ); + printf ( " Number of levels in mesh: %lld\n", (long long)num_levels ); for ( level_id = 2; level_id < num_levels; level_id++ ) { h5_err_t h5err = H5FedSetLevel ( f, level_id ); if ( h5err < 0 ) { @@ -184,7 +184,7 @@ main ( h5_file_t *f = H5OpenFile ( "simple_tet.h5", H5_O_RDONLY, 0 ); h5_size_t num_meshes = H5FedGetNumMeshes ( f, H5_TETRAHEDRAL_MESH ); - printf ( " Number of meshes: %lld\n", num_meshes ); + printf ( " Number of meshes: %lld\n", (long long)num_meshes ); h5_id_t mesh_id; for ( mesh_id = 0; mesh_id < num_meshes; mesh_id++ ) { diff --git a/test/H5Fed/tetmesh_write.c b/test/H5Fed/tetmesh_write.c index b13b98c..d14a68d 100644 --- a/test/H5Fed/tetmesh_write.c +++ b/test/H5Fed/tetmesh_write.c @@ -15,7 +15,7 @@ const char* FNAME = "simple_tet.h5"; typedef struct vertex { h5_float64_t P[3]; -} vertex_t; +} vertex_t; typedef struct elem { h5_id_t vids[4]; @@ -44,7 +44,7 @@ main ( ) { /* abort program on errors in library */ H5SetErrorHandler (H5AbortErrorhandler); - H5SetVerbosityLevel (2); + H5SetVerbosityLevel (5); /* open file and add mesh */ h5_file_t* const f = H5OpenFile (FNAME, H5_O_WRONLY, 0); diff --git a/test/H5Fed/tetmesh_write2.c b/test/H5Fed/tetmesh_write2.c index d6669c8..277050f 100644 --- a/test/H5Fed/tetmesh_write2.c +++ b/test/H5Fed/tetmesh_write2.c @@ -85,13 +85,13 @@ main ( H5FedRefineElement (f, 0); H5FedEndRefineElements (f); - /* add levels second to num_levels-1 */ + /* add levels 2 to num_levels-1 */ h5_int32_t num_elems_last_level = 1; h5_int32_t level_id; for (level_id = 2; level_id < num_levels; level_id++) { /* refine 4 to the power of level_id-1 elems */ - h5_id_t level_id = H5FedAddLevel(f); + H5FedAddLevel(f); h5_int32_t num_elems2refine = power (4, level_id-1); H5FedBeginRefineElements (f); for (i = num_elems_last_level; diff --git a/test/H5Fed/trimesh_read.c b/test/H5Fed/trimesh_read.c index 79b2578..cb3ed66 100644 --- a/test/H5Fed/trimesh_read.c +++ b/test/H5Fed/trimesh_read.c @@ -21,7 +21,7 @@ traverse_vertices ( h5_size_t num_vertices = 0; while ((local_id = H5FedTraverseEntities ( f, iter )) >= 0) { h5_float64_t P[3]; - H5FedGetVertexCoordByID (f, local_id, P); + H5FedGetVertexCoordsByID (f, local_id, P); char v[256]; snprintf (v, sizeof(v), "=%llx=", local_id); printf ("| %-18s | (%f, %f, %f) |\n", @@ -35,10 +35,10 @@ traverse_vertices ( /* report error if we got a different number then expected */ if (num_vertices != num_vertices_expect) { fprintf (stderr, "!!! Got %lld vertices, but expected %lld.\n", - num_vertices, num_vertices_expect); + (long long)num_vertices, (long long)num_vertices_expect); } - printf (" Number of vertices on level: %lld\n", num_vertices); + printf (" Number of vertices on level: %lld\n", (long long)num_vertices); return H5_SUCCESS; } @@ -69,7 +69,7 @@ traverse_edges ( /* done */ H5FedEndTraverseEntities ( f, iter ); - printf (" Number of edges: %lld\n", num_edges); + printf (" Number of edges: %lld\n", (long long)num_edges); return H5_SUCCESS; } @@ -104,11 +104,11 @@ traverse_elems ( /* report error if we got a different number then expected */ if (num_elems != num_elems_expect) { fprintf (stderr, "!!! Got %lld elements, but expected %lld.\n", - num_elems, num_elems_expect); + (long long)num_elems, (long long)num_elems_expect); exit(1); } - printf (" Number of elements on level: %lld\n", num_elems); +printf (" Number of elements on level: %lld\n", (long long)num_elems); return H5_SUCCESS; } @@ -135,7 +135,7 @@ traverse_mesh ( printf (" Opening mesh with id %lld\n", mesh_id); H5FedOpenMesh (f, mesh_id, mesh_type); h5_size_t num_levels = H5FedGetNumLevels (f); - printf (" Number of levels in mesh: %lld\n", num_levels); + printf (" Number of levels in mesh: %lld\n", (long long)num_levels); /* loop over all levels */ h5_id_t level_id; @@ -160,7 +160,7 @@ main ( /* open file and get number of meshes */ h5_file_t* f = H5OpenFile (FNAME, H5_O_RDONLY, 0); h5_size_t num_meshes = H5FedGetNumMeshes (f, MESH_TYPE); - printf (" Number of meshes: %lld\n", num_meshes); + printf (" Number of meshes: %lld\n", (long long)num_meshes); /* loop over all meshes */ h5_id_t mesh_id;