added

.gitattributes

@@ -402,7 +402,9 @@ test/h5b/H5BlockTestAttributesF.f90 -text
 test/h5b/Makefile.am -text
 test/h5t/Makefile.am -text
 test/h5t/read_tet.c -text
+test/h5t/read_triangle.c -text
 test/h5t/simple_tet.c -text
+test/h5t/simple_triangle.c -text
 test/h5u/Bench.c -text
 test/h5u/H5ParallelTest.cc -text
 test/h5u/H5PartAndreasTest.cc -text

test/h5t/read_triangle.c

@@ -0,0 +1,168 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <hdf5.h>
+#include "H5Part.h"
+#include "H5Fed.h"
+
+#ifndef PARALLEL_IO
+#ifndef MPI_COMM_WORLD
+#define MPI_COMM_WORLD 0
+#endif
+#endif
+
+struct vertex {
+	h5_float64_t P[3];
+};
+
+typedef struct vertex vertex_t; 
+
+struct entity {
+	h5_id_t global_id;
+	h5_id_t parent_id;
+	h5_id_t vids[3];
+};
+typedef struct entity entity_t;
+
+h5_err_t
+read_vertices (
+	h5_file * f
+	) {
+	h5_id_t id, local_id;
+	h5_float64_t P[3];
+	h5_size_t real_num = 0;
+
+	h5_id_t level_id = H5FedGetLevel ( f );
+	h5_size_t num = H5FedGetNumVertices ( f );
+
+	printf ( "    Number of vertices on level %d: %d\n", level_id, num );
+	h5_err_t h5err = H5FedStartTraverseVertices ( f );
+	if ( h5err < 0 ) return h5err;
+	while ( (real_num < num) &&
+		((local_id = H5FedTraverseVertices ( f, &id, P )) >= 0) ) {
+		printf ( "    Vertex[%d]: local id: %d, coords: %f %f %f \n",
+			 id, local_id, P[0], P[1], P[2] );
+		real_num++;
+	}
+	if ( real_num != num ) {
+		fprintf ( stderr, "!!! Got %d vertices, but expected %d.\n",
+			  real_num, num );
+		return -1;
+	}
+	return H5_SUCCESS;
+}
+
+h5_err_t
+read_entities (
+	h5_file * f
+	) {
+	h5_id_t id, local_id, parent_id, vids[4];
+	h5_size_t real_num = 0;
+
+	h5_id_t level_id = H5FedGetLevel ( f );
+	h5_size_t num = H5FedGetNumTriangles ( f );
+	printf ( "    Number of triangles on level %d: %d\n", level_id, num );
+
+	h5_err_t h5err = H5FedStartTraverseTriangles ( f );
+	if ( h5err < 0 ) return h5err;
+	while ( (real_num < num) &&
+		((local_id = H5FedTraverseTriangles ( f, &id, &parent_id, vids )) >= 0) ) {
+		printf (
+			"    entitiy[%d]: local id: %d, parent id: %d, vids: %d %d %d\n",
+			id, local_id, parent_id, vids[0], vids[1], vids[2] );
+		real_num++;
+	}
+	if ( real_num != num ) {
+		fprintf ( stderr, "!!! Got %d tets, but expected %d.\n",
+			  real_num, num );
+		return -1;
+	}
+
+	return H5_SUCCESS;
+}
+
+h5_err_t
+read_level (
+	h5_file * f
+	) {
+	h5_err_t h5err = read_vertices ( f );
+	if ( h5err < 0 ) {
+		fprintf ( stderr, "!!! Oops ...\n" );
+		return -1;
+	}
+	h5err = read_entities ( f );
+	if ( h5err < 0 ) {
+		fprintf ( stderr, "!!! Oops ...\n" );
+		return -1;
+	}
+	return H5_SUCCESS;
+}
+
+
+h5_err_t
+read_mesh (
+	h5_file * f
+	) {
+
+	h5_id_t level_id;
+	h5_size_t num_levels = H5FedGetNumLevels ( f );
+	if ( num_levels < 0 ) {
+		fprintf ( stderr, "!!! Oops ...\n" );
+		return -1;
+	}
+	printf ( "    Number of levels in mesh: %d\n", num_levels );
+	for ( level_id = 0; level_id < num_levels; level_id++ ) {
+		printf ( "    Going to level %d\n", level_id );
+		h5_err_t h5err = H5FedSetLevel ( f, level_id );
+		if ( h5err < 0 ) {
+			fprintf ( stderr, "!!! Can't set level %d.\n", level_id );
+			return -1;
+		}
+		h5err = read_level ( f );
+		if ( h5err < 0 ) {
+			fprintf ( stderr, "!!! Oops ...\n" );
+			return -1;
+		}
+	}
+
+
+	return H5_SUCCESS;
+}
+
+int
+main (
+	int argc,
+	char *argv[]
+	) {
+
+	H5PartSetVerbosityLevel ( 4 );
+
+	h5_file *f = H5OpenFile ( "simple_triangle.h5", 0 );
+	if ( f == NULL ) {
+		fprintf ( stderr, "!!! Can't open file.\n" );
+		return -1;
+	}
+
+	h5_size_t num_meshes = H5FedGetNumMeshes ( f, TRIANGLE_MESH );
+	printf ( "    Number of meshes: %d\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, TRIANGLE_MESH );
+		if ( h5err < 0 ) {
+			fprintf ( stderr, "!!! Can't open mesh %d\n", mesh_id );
+			return -1;
+		}
+		h5err = read_mesh ( f );
+		if ( h5err < 0 ) {
+			fprintf ( stderr, "!!! Oops ...\n" );
+			return 1;
+		}
+	}
+
+	h5_err_t h5err = H5CloseFile ( f );
+	if ( h5err < 0 ) {
+		fprintf ( stderr, "!!! Can't close file.\n" );
+		return -1;
+	}
+	return 0;
+}

test/h5t/simple_triangle.c

@@ -0,0 +1,134 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <hdf5.h>
+#include "H5Part.h"
+#include "H5Fed.h"
+
+#ifndef PARALLEL_IO
+#ifndef MPI_COMM_WORLD
+#define MPI_COMM_WORLD 0
+#endif
+#endif
+
+struct vertex {
+	h5_id_t global_id;
+	h5_float64_t P[3];
+};
+
+typedef struct vertex vertex_t; 
+
+struct entity {
+	h5_id_t global_id;
+	h5_id_t parent_id;
+	h5_id_t vids[3];
+};
+typedef struct entity entity_t;
+	       
+
+vertex_t V0[4] = {
+	{ 0, {-1.0,  0.0,  0.0} },
+	{ 1, { 1.0,  0.0,  0.0} },
+	{ 2, { 0.0,  1.0,  0.0} },
+	{ 3, { 0.0, -1.0,  0.0} }
+};
+
+vertex_t V1[1] = {
+	{ 4, {0.0,  0.0,  0.0 } }
+};
+
+entity_t T0[2] = {
+	{ 1, -1, { 0, 1, 2 } },
+	{ 0, -1, { 0, 1, 3 } }
+};
+
+entity_t T1[4] = {
+	{ 2, 1, { 1, 2, 4 } },
+	{ 3, 1, { 0, 2, 4 } },
+	{ 4, 0, { 0, 3, 4 } },
+	{ 5, 0, { 1, 3, 4 } }
+};
+
+h5_err_t
+add_level (
+	h5_file *f,
+	vertex_t V[],
+	int num_verts,
+	entity_t T[],
+	int num_entities
+	) {
+
+	h5_err_t h5err = H5FedAddLevel ( f );
+	if ( h5err < 0 ) {
+		fprintf ( stderr, "!!! Can't add level.\n" );
+		return -1;
+	}
+	h5err = H5FedAddNumVertices ( f, num_verts );
+	if ( h5err < 0 ) {
+		fprintf ( stderr, "!!! Can't set number of vertices.\n" );
+		return -1;
+	}
+
+	int i;
+	for ( i = 0; i<num_verts; i++ ) {
+		h5err = H5FedStoreVertex (
+			f,
+			V[i].global_id,
+			V[i].P );
+		if ( h5err < 0 ) {
+			fprintf ( stderr, "!!! Can't store vertex.\n" );
+			return -1;
+		}
+	}
+	h5err = H5FedAddNumEntities ( f, num_entities );
+	if ( h5err < 0 ) {
+		fprintf ( stderr, "!!! Can't set number of tets.\n" );
+		return -1;
+	}
+
+	for ( i = 0; i<num_entities; i++ ) {
+		h5err = H5FedStoreTriangle (
+			f,
+			T[i].global_id,
+			T[i].parent_id,
+			T[i].vids );
+		
+		if ( h5err < 0 ) {
+			fprintf ( stderr, "!!! Can't store tet.\n" );
+			return -1;
+		}
+	}
+	return 0;
+}
+
+int
+main (
+	int argc,
+	char *argv[]
+	) {
+
+	H5PartSetVerbosityLevel ( 4 );
+
+	h5_file *f = H5OpenFile ( "simple_triangle.h5", 0 );
+	if ( f == NULL ) {
+		fprintf ( stderr, "!!! Can't open file.\n" );
+		return -1;
+	}
+
+	h5_err_t h5err = H5FedAddMesh ( f, TRIANGLE_MESH );
+	if ( h5err < 0 ) {
+		fprintf ( stderr, "!!! Can't set step.\n" );
+		return -1;
+	}
+
+	h5err = add_level ( f, V0, sizeof(V0)/sizeof(V0[0]), T0, sizeof(T0)/sizeof(T0[0]) );
+	if ( h5err < 0 ) return h5err;
+	h5err = add_level ( f, V1, sizeof(V1)/sizeof(V1[0]), T1, sizeof(T1)/sizeof(T1[0]) );
+	if ( h5err < 0 ) return h5err;
+
+	h5err = H5CloseFile ( f );
+	if ( h5err < 0 ) {
+		fprintf ( stderr, "!!! Can't close file.\n" );
+		return -1;
+	}
+	return 0;
+}