From a1d62018ff1fc6d66d5437d2ed951ec47ccdfce8 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 25 Sep 2008 15:49:08 +0000
Subject: [PATCH]

---
 test/H5Block/Makefile.am   |  2 +-
 test/H5Fed/Makefile.am     |  6 ++++--
 test/H5Fed/write_tetmesh.c | 12 ++++++++----
 test/H5Part/Makefile.am    |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/test/H5Block/Makefile.am b/test/H5Block/Makefile.am
index b8b1e7e..e278d2e 100644
--- a/test/H5Block/Makefile.am
+++ b/test/H5Block/Makefile.am
@@ -18,7 +18,7 @@ FFLAGS = @FFLAGS@ @MPIINC@
 SZLIB = @SZLIB@
 HDFLIB = -L$(HDF5ROOT)/lib -lhdf5 -lz $(SZLIB) @LDFLAGS@
 MPILIB = @MPILIB@
-H5LIB = -L@H5P_LIB_LOC@ -L@H5P_LIB_LOC@/h5 -lH5Part -lH5
+H5LIB = -L@H5P_LIB_LOC@ -L@H5P_LIB_LOC@/h5_core -lH5_core -lH5
 
 LIBS = ${H5LIB} $(HDFLIB) $(MPILIB) -lm @STDCXX@
 
diff --git a/test/H5Fed/Makefile.am b/test/H5Fed/Makefile.am
index b090be6..45c130b 100644
--- a/test/H5Fed/Makefile.am
+++ b/test/H5Fed/Makefile.am
@@ -20,7 +20,7 @@ FFLAGS = @FFLAGS@ @MPIINC@
 SZLIB = @SZLIB@
 HDFLIB = -L$(HDF5ROOT)/lib -lhdf5 -lz $(SZLIB) @LDFLAGS@
 MPILIB = @MPILIB@
-H5LIB = -L@H5P_LIB_LOC@ -L@H5P_LIB_LOC@/h5 -lH5Part -lH5
+H5LIB = -L@H5P_LIB_LOC@ -L@H5P_LIB_LOC@/h5_core -lH5_core -lH5
 
 LIBS = ${H5LIB} $(HDFLIB) $(MPILIB) -lm @STDCXX@
 
@@ -30,13 +30,14 @@ LIBS = ${H5LIB} $(HDFLIB) $(MPILIB) -lm @STDCXX@
 # INCLUDES
 HDFINC = -I$(HDF5ROOT)/include
 MPIINC = @MPIINC@
-H5INC = -I@H5P_LIB_LOC@ -I@H5P_LIB_LOC@/h5
+H5INC = -I@H5P_LIB_LOC@ -I@H5P_LIB_LOC@/h5_core
 
 INC = $(HDFINC) $(MPIINC) $(H5INC)
 
 
 # What to build... make install will place these files in the $(prefix)/bin directory.
 bin_PROGRAMS = \
+		write_boundary \
 		write_tetmesh \
 		read_tetmesh \
 		write_trianglemesh \
@@ -52,6 +53,7 @@ EXTRA_PROGRAMS =
 
 # Extra files that I wish to include in the dist tar ball.
 EXTRA_DIST = 	\
+		write_boundary.c \
 		write_tetmesh.c \
 		read_tetmesh.c \
 		write_trianglemesh.c \
diff --git a/test/H5Fed/write_tetmesh.c b/test/H5Fed/write_tetmesh.c
index c52cff7..d2bf826 100644
--- a/test/H5Fed/write_tetmesh.c
+++ b/test/H5Fed/write_tetmesh.c
@@ -37,16 +37,20 @@ vertex_t V1[1] = {
 	{ 5, {0.0,  0.0,  0.0 } }
 };
 
+// sorted vertices: 0, 4, 5, 3, 2, 1
+
 tet_t T0[2] = {
-	{ 1, -1, { 0, 1, 2, 3 } },
-	{ 0, -1, { 0, 1, 3, 4 } }
+	{ 1, -1, { 0, 1, 2, 3 } },	// 0, 3, 2, 1
+	{ 0, -1, { 0, 1, 3, 4 } }	// 0, 4, 3, 1
 };
 
 tet_t T1[2] = {
-	{ 2, 0, { 0, 3, 4, 5 } },   // 0, 4, 5, 3
-	{ 3, 0, { 1, 3, 4, 5 } }
+	{ 2, 0, { 0, 3, 4, 5 } },	// 0, 4, 5, 3
+	{ 3, 0, { 1, 3, 4, 5 } }	// 4, 5, 3, 1
 };
 
+// sorted 0th vertex tets: 2, 1, 0, 3
+
 h5_err_t
 add_level (
 	h5_file *f,
diff --git a/test/H5Part/Makefile.am b/test/H5Part/Makefile.am
index 2f8c387..712747f 100644
--- a/test/H5Part/Makefile.am
+++ b/test/H5Part/Makefile.am
@@ -18,7 +18,7 @@ FFLAGS = @FFLAGS@ @MPIINC@
 SZLIB = @SZLIB@
 HDFLIB = -L$(HDF5ROOT)/lib -lhdf5 -lz $(SZLIB) @LDFLAGS@
 MPILIB = @MPILIB@
-H5LIB = -L@H5P_LIB_LOC@ -L@H5P_LIB_LOC@/h5 -lH5Part -lH5
+H5LIB = -L@H5P_LIB_LOC@ -L@H5P_LIB_LOC@/h5_core -lH5_core -lH5
 
 LIBS = ${H5LIB} $(HDFLIB) $(MPILIB) -lm @STDCXX@