This commit is contained in:
2008-09-25 15:49:08 +00:00
parent cd7ffd24e4
commit a1d62018ff
4 changed files with 14 additions and 8 deletions
+1 -1
View File
@@ -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@
+4 -2
View File
@@ -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 \
+8 -4
View File
@@ -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,
+1 -1
View File
@@ -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@