bugfixes

.gitattributes

@@ -368,7 +368,6 @@ src/C++/Makefile.am -text
 src/C/H5.c -text
 src/C/H5Block.c -text
 src/C/H5Block_readwrite.c -text
-src/C/H5Fed.c -text
 src/C/H5Fed_adjacency.c -text
 src/C/H5Fed_inquiry.c -text
 src/C/H5Fed_retrieve.c -text

src/C/H5Fed.c

@@ -1,43 +0,0 @@
-/*
-  Copyright 2007-2009
- 	Paul Scherrer Institut, Villigen, Switzerland;
- 	Benedikt Oswald;
- 	Achim Gsell
- 	All rights reserved.
- 
-  Authors
- 	Achim Gsell
-  
-  Warning
-	This code is under development.
- 
- */
-#include "h5core/h5_core.h"
-#include "H5Fed.h"
-
-
-h5_err_t
-H5FedCloseMesh (
-	h5_file_t* const f
-	) {
-	H5_API_ENTER1 (h5_err_t, "f=0x%p", f);
-	H5_API_RETURN (h5t_close_mesh (f));
-}
-
-h5_err_t
-H5FedSetLevel (
-	h5_file_t* const f,
-	const h5t_lvl_idx_t level_id
-	) {
-	H5_API_ENTER2 (h5_err_t, "f=0x%p, level_id=%d", f, level_id);
-	H5_API_RETURN (h5t_set_level (f, level_id));
-}
-
-h5_err_t
-H5FedLinkMeshToStep (
-	h5_file_t* const f,
-	const h5_id_t mesh_id
-	) {
-	H5_API_ENTER2 (h5_err_t, "f=0x%p, mesh_id=%lld", f, (long long)mesh_id);
-	H5_API_RETURN (h5_error_not_implemented ());
-}

src/C/Makefile.am

@@ -38,7 +38,6 @@ ___lib_libH5hutC_a_SOURCES =			\
 	H5Part.c                                \
 	H5Block.c				\
 	H5Block_readwrite.c			\
-	H5Fed.c					\
 	H5Fed_adjacency.c			\
 	H5Fed_inquiry.c				\
 	H5Fed_retrieve.c			\

src/h5core/h5t_model_tetm.c

@@ -72,15 +72,19 @@ h5t_open_tetrahedral_mesh (
 	t->dsinfo_elems.type_id = t->dtypes.h5_tet_t;
 	t->methods = tet_funcs;
 	t->ref_elem = &h5t_tet_ref_elem;
-	TRY (open_tetmesh_group (f, id));
 
-	if (id == -1) {			// append new
-		id = t->num_meshes;
-		t->num_meshes++;
-		t->mesh_changed = id;
+	if (id == -1) {			// add new
+		id = 0;
+		t->num_meshes = 1;
+		t->cur_mesh = 0;
+		t->mesh_changed = 0;
+		t->leaf_level = 0;
 		t->num_leaf_levels = 0;
+		TRY (open_tetmesh_group (f, id));
 	} else {			// read existing
+		TRY (open_tetmesh_group (f, id));
 		TRY (h5tpriv_read_mesh (f));
+		t->leaf_level = 0;
 	} 
 	H5_CORE_API_RETURN (H5_SUCCESS);
 }

src/h5core/h5t_model_trim.c

@@ -9,7 +9,9 @@ static struct h5t_methods tri_funcs = {
 	&h5tpriv_trim_adjacency_methods
 };
 
-
+/*
+  Open container of triangle meshes
+ */
 static inline h5_err_t
 open_trimeshes_group (
 	h5_file_t* const f
@@ -30,7 +32,7 @@ open_trimeshes_group (
 }
 
 /*
-  open HDF5 group with data of specific mesh.
+  Open container of specific triangle mesh
  */
 static inline h5_err_t
 open_trimesh_group (
@@ -73,16 +75,20 @@ h5t_open_triangle_mesh (
 	t->dsinfo_elems.type_id = t->dtypes.h5_triangle_t;
 	t->methods = tri_funcs;
 	t->ref_elem = &h5t_tri_ref_elem;
-	TRY (open_trimesh_group (f, id));
 
 	if (id == -1) {			// add new
-		id = t->num_meshes;
-		t->num_meshes++;
-		t->mesh_changed = id;
+		id = 0;
+		t->num_meshes = 1;
+		t->cur_mesh = 0;
+		t->mesh_changed = 0;
+		t->leaf_level = 0;
 		t->num_leaf_levels = 0;
+		TRY (open_trimesh_group (f, 0));
 	} else {			// read existing
+		TRY (open_trimesh_group (f, 0));
 		TRY (h5tpriv_read_mesh (f));
-	} 
+		t->leaf_level = 0;
+	}
 	H5_CORE_API_RETURN (H5_SUCCESS);
 }
 

src/include/H5Fed.h

@@ -49,22 +49,31 @@ H5FedOpenTriangleMesh (
 	H5_API_RETURN (h5t_open_triangle_mesh (f, mesh_id));
 }
 
-h5_err_t
+static inline h5_err_t
 H5FedCloseMesh (
-	h5_file_t * const f
-	);
+	h5_file_t* const f
+	) {
+	H5_API_ENTER1 (h5_err_t, "f=0x%p", f);
+	H5_API_RETURN (h5t_close_mesh (f));
+}
 
-h5_err_t
+static inline h5_err_t
 H5FedSetLevel (
-	h5_file_t * f,
+	h5_file_t* const f,
 	const h5t_lvl_idx_t level_id
-	);
+	) {
+	H5_API_ENTER2 (h5_err_t, "f=0x%p, level_id=%d", f, level_id);
+	H5_API_RETURN (h5t_set_level (f, level_id));
+}
 
-h5_err_t
+static inline h5_err_t
 H5FedLinkMeshToStep (
-	h5_file_t * f,
+	h5_file_t* const f,
 	const h5_id_t mesh_id
-	);
+	) {
+	H5_API_ENTER2 (h5_err_t, "f=0x%p, mesh_id=%lld", f, (long long)mesh_id);
+	H5_API_RETURN (h5_error_not_implemented ());
+}
 
 #ifdef __cplusplus
 }