[cig-commits] r4129 - in mc/3D/CitcomS/trunk: . bin lib

[luis at geodynamics.org]

Author: luis
Date: 2006-07-31 17:54:45 -0700 (Mon, 31 Jul 2006)
New Revision: 4129

Modified:
   mc/3D/CitcomS/trunk/bin/Makefile.am
   mc/3D/CitcomS/trunk/configure.ac
   mc/3D/CitcomS/trunk/lib/Makefile.am
Log:
Added --with-hdf5 options to configure.ac.
Also, modified Makefile.am so that Output_h5.o is compiled.


Modified: mc/3D/CitcomS/trunk/bin/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/bin/Makefile.am	2006-08-01 00:23:11 UTC (rev 4128)
+++ mc/3D/CitcomS/trunk/bin/Makefile.am	2006-08-01 00:54:45 UTC (rev 4129)
@@ -62,10 +62,10 @@
 # legacy drivers
 CitcomSFull_SOURCES = Citcom.c
 CitcomSFull_CPPFLAGS = -DCITCOMS_SOLVER_FULL
-CitcomSFull_LDADD = $(libCitcomS) $(MPILIBS) $(LIBM)
+CitcomSFull_LDADD = $(libCitcomS) $(MPILIBS) $(LIBHDF5) $(LIBM)
 CitcomSRegional_SOURCES = Citcom.c
 CitcomSRegional_CPPFLAGS =
-CitcomSRegional_LDADD = $(libCitcomS) $(MPILIBS) $(LIBM)
+CitcomSRegional_LDADD = $(libCitcomS) $(MPILIBS) $(LIBHDF5) $(LIBM)
 
 # citcoms (top-level Python script)
 citcoms: $(srcdir)/citcoms.in Makefile
@@ -94,6 +94,7 @@
 	$(top_builddir)/module/Exchanger/libExchangerLibmodule.a \
 	$(top_builddir)/module/libCitcomSLibmodule.a \
 	$(libCitcomS) \
+	$(LIBHDF5) \
 	$(LIBM)
 pycitcoms$(EXEEXT): $(pycitcoms_OBJECTS) $(pycitcoms_DEPENDENCIES) 
 	@rm -f pycitcoms$(EXEEXT)

Modified: mc/3D/CitcomS/trunk/configure.ac
===================================================================
--- mc/3D/CitcomS/trunk/configure.ac	2006-08-01 00:23:11 UTC (rev 4128)
+++ mc/3D/CitcomS/trunk/configure.ac	2006-08-01 00:54:45 UTC (rev 4129)
@@ -46,6 +46,12 @@
     [want_pyre="$withval"],
     [want_pyre=yes])
 AM_CONDITIONAL([COND_PYRE], [test "$want_pyre" = yes])
+AC_ARG_WITH([hdf5],
+    [AC_HELP_STRING([--with-hdf5],
+        [enable HDF5 output])],
+    [want_hdf5="$enableval"],
+    [want_hdf5=no])
+AM_CONDITIONAL([COND_HDF5], [test "$want_hdf5" = yes])
 AC_ARG_ENABLE([embedding],
     [AC_HELP_STRING([--enable-embedding],
         [embed Python with CitcomS in a single executable @<:@default=yes@:>@])],
@@ -141,6 +147,18 @@
 fi
 AC_SUBST(LIBM)
 
+AC_ARG_VAR(LIBHDF5, [HDF5 library])
+if test -z "$LIBHDF5"; then
+    AC_CHECK_FUNC(H5Fopen, , [
+        AC_CHECK_LIB(hdf5, H5Fopen, [
+            LIBHDF5="-lhdf5"
+        ], [
+            AC_MSG_ERROR([HDF5 library not found; try setting LIBHDF5])
+        ])
+    ])
+fi
+AC_SUBST(LIBHDF5)
+
 AC_CONFIG_FILES([Makefile
                  bin/Makefile
                  CitcomS/Makefile

Modified: mc/3D/CitcomS/trunk/lib/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/lib/Makefile.am	2006-08-01 00:23:11 UTC (rev 4128)
+++ mc/3D/CitcomS/trunk/lib/Makefile.am	2006-08-01 00:54:45 UTC (rev 4129)
@@ -40,7 +40,7 @@
 libCitcomS_a_SOURCES = $(sources)
 
 # shared library (libtool)
-libCitcomS_la_LIBADD = $(LIBM)
+libCitcomS_la_LIBADD = $(LIBM) $(LIBHDF5)
 libCitcomS_la_LDFLAGS = -release $(VERSION)
 libCitcomS_la_SOURCES = $(sources)
 
@@ -63,6 +63,7 @@
 	General_matrix_functions.c \
 	global_defs.h \
 	Global_operations.c \
+	hdf5_info.h \
 	Initial_temperature.c \
 	initial_temperature.h \
 	Instructions.c \
@@ -73,6 +74,8 @@
 	Nodal_mesh.c \
 	Output.c \
 	output.h \
+	Output_h5.c \
+	output_h5.h \
 	Pan_problem_misc_functions.c \
 	parallel_related.h \
 	Parallel_util.c \