From 21ba443bcd938d6e67e612e93a1ba48ee1e0a451 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Fri, 20 Aug 2010 15:47:40 +0000
Subject: [PATCH] - new adjacency API implemented - some minor fixes

---
 src/C/H5Fed.c           |   1 +
 src/C/H5Fed_adjacency.c | 117 ++--------------------------------------
 src/C/H5Fed_retrieve.c  |   2 +-
 src/C/H5Fed_store.c     |   2 +-
 4 files changed, 7 insertions(+), 115 deletions(-)

diff --git a/src/C/H5Fed.c b/src/C/H5Fed.c
index e5b5fb9..1f634fb 100644
--- a/src/C/H5Fed.c
+++ b/src/C/H5Fed.c
@@ -46,5 +46,6 @@ H5FedLinkMeshToStep (
 	h5_file_t* const f,
 	const h5_id_t mesh_id
 	) {
+#pragma unused mesh_id
 	return h5_error_not_implemented (f, __FILE__, __func__, __LINE__);
 }
diff --git a/src/C/H5Fed_adjacency.c b/src/C/H5Fed_adjacency.c
index 1500471..728f6ba 100644
--- a/src/C/H5Fed_adjacency.c
+++ b/src/C/H5Fed_adjacency.c
@@ -22,123 +22,14 @@
   \return	number of upward adjacent edges 
  */
 h5_err_t
-H5FedGetEdgesUpAdjacentToVertex (
+H5FedGetAdjacencies (
 	h5_file_t* const f,
-	const h5_id_t local_vid,
+	const h5_id_t entity_id,
+	const h5_int32_t dim,
 	h5_idlist_t** list
 	) {
 	SET_FNAME (f, __func__);
-	return h5t_get_edges_upadjacent_to_vertex (f, local_vid, list);
-}
-
-h5_err_t
-H5FedGetTrianglesUpAdjacentToVertex (
-	h5_file_t* const f,
-	const h5_id_t local_vid,
-	h5_idlist_t** list
-	) {
-	SET_FNAME( f, __func__);
-	return h5t_get_triangles_upadjacent_to_vertex (f, local_vid, list);
-}
-
-h5_err_t
-H5FedGetTetsUpAdjacentToVertex (
-	h5_file_t* const f,
-	const h5_id_t local_vid,
-	h5_idlist_t** list
-	) {
-	SET_FNAME (f, __func__);
-	return h5t_get_tets_upadjacent_to_vertex (f, local_vid, list);
-}
-
-h5_err_t
-H5FedGetTrianglesUpAdjacentToEdge (
-	h5_file_t* const f,
-	const h5_id_t local_kid,
-	h5_idlist_t** list
-	) {
-	SET_FNAME (f, __func__);
-	return h5t_get_triangles_upadjacent_to_edge (f, local_kid, list);
-}
-
-h5_err_t
-H5FedGetTetsUpAdjacentToEdge (
-	h5_file_t* const f,
-	const h5_id_t local_kid,
-	h5_idlist_t** list
-	) {
-	SET_FNAME (f, __func__);
-	return h5t_get_tets_upadjacent_to_edge (f, local_kid, list);
-}
-
-h5_err_t
-H5FedGetTetsUpAdjacentToTriangle (
-	h5_file_t* const f,
-	const h5_id_t local_did,
-	h5_idlist_t** list
-	) {
-	SET_FNAME (f, __func__);
-	return h5t_get_tets_upadjacent_to_triangle (f, local_did, list);
-}
-
-h5_err_t
-H5FedGetVerticesDownAdjacentToEdge (
-	h5_file_t* const f,
-	const h5_id_t local_kid,
-	h5_idlist_t** list
-	) {
-	SET_FNAME (f, __func__);
-	return h5t_get_vertices_downadjacent_to_edge (f, local_kid, list);
-}
-
-h5_err_t
-H5FedGetVerticesDownAdjacentToTriangle (
-	h5_file_t* const f,
-	const h5_id_t local_did,
-	h5_idlist_t** list
-	) {
-	SET_FNAME (f, __func__);
-	return h5t_get_vertices_downadjacent_to_triangle (f, local_did, list);
-}
-
-h5_err_t
-H5FedGetVerticesDownAdjacentToTet (
-	h5_file_t* const f,
-	const h5_id_t local_tid,
-	h5_idlist_t** list
-	) {
-	SET_FNAME (f, __func__);
-	return h5t_get_vertices_downadjacent_to_tet (f, local_tid, list);
-}
-
-h5_err_t
-H5FedGetEdgesDownAdjacentToTriangle (
-	h5_file_t* const f,
-	const h5_id_t local_did,
-	h5_idlist_t** list
-	) {
-	SET_FNAME (f, __func__);
-	return h5t_get_edges_downadjacent_to_triangle (f, local_did, list);
-}
-
-h5_err_t
-H5FedGetEdgesDownAdjacentToTet (
-	h5_file_t* const f,
-	const h5_id_t local_tid,
-	h5_idlist_t** list
-	) {
-	SET_FNAME (f, __func__);
-	return h5t_get_edges_downadjacent_to_tet (f, local_tid, list);
-}
-
-h5_err_t
-H5FedGetTrianglesDownAdjacentToTet (
-	h5_file_t* const f,
-	const h5_id_t local_tid,
-	h5_idlist_t** list
-	) {
-	SET_FNAME (f, __func__);
-	return h5t_get_triangles_downadjacent_to_tet (f, local_tid, list);
+	return h5t_get_adjacencies (f, entity_id, dim, list);
 }
 
 h5_err_t
diff --git a/src/C/H5Fed_retrieve.c b/src/C/H5Fed_retrieve.c
index 7e5bd8e..12f4402 100644
--- a/src/C/H5Fed_retrieve.c
+++ b/src/C/H5Fed_retrieve.c
@@ -101,7 +101,7 @@ H5FedGetVertexCoordsByIndex (
 }
 
 h5_err_t
-H5FedGetVertexCoordByID (
+H5FedGetVertexCoordsByID (
 	h5_file_t* const f,
 	h5_id_t vertex_id,
 	h5_float64_t P[3]
diff --git a/src/C/H5Fed_store.c b/src/C/H5Fed_store.c
index badf2f1..b001b50 100644
--- a/src/C/H5Fed_store.c
+++ b/src/C/H5Fed_store.c
@@ -157,7 +157,7 @@ H5FedRefineElement (
 	const h5_id_t local_eid		/*!< local element id		*/
 	) {
 	SET_FNAME (f, __func__);
-	return h5t_refine_elem (f, local_eid);
+	return h5t_mark_entity (f, local_eid);
 }
 
 h5_err_t