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

[luis at geodynamics.org]

Author: luis
Date: 2006-08-06 23:10:18 -0700 (Sun, 06 Aug 2006)
New Revision: 4241

Modified:
   mc/3D/CitcomS/trunk/bin/Makefile.am
   mc/3D/CitcomS/trunk/configure.ac
   mc/3D/CitcomS/trunk/lib/Citcom_init.c
   mc/3D/CitcomS/trunk/lib/Makefile.am
   mc/3D/CitcomS/trunk/lib/hdf5_related.h
   mc/3D/CitcomS/trunk/module/Makefile.am
Log:
Changed configure script to compile everything with -DUSE_HDF5
when HDF5 support is enabled (--with-hdf5)


Modified: mc/3D/CitcomS/trunk/bin/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/bin/Makefile.am	2006-08-07 04:56:58 UTC (rev 4240)
+++ mc/3D/CitcomS/trunk/bin/Makefile.am	2006-08-07 06:10:18 UTC (rev 4241)
@@ -67,6 +67,11 @@
 CitcomSRegional_CPPFLAGS =
 CitcomSRegional_LDADD = $(libCitcomS) $(MPILIBS) $(LIBHDF5) $(LIBM)
 
+if COND_HDF5
+    CitcomSFull_CPPFLAGS += -DUSE_HDF5
+    CitcomSRegional_CPPFLAGS += -DUSE_HDF5
+endif
+
 # citcoms (top-level Python script)
 citcoms: $(srcdir)/citcoms.in Makefile
 	here=`pwd`; \

Modified: mc/3D/CitcomS/trunk/configure.ac
===================================================================
--- mc/3D/CitcomS/trunk/configure.ac	2006-08-07 04:56:58 UTC (rev 4240)
+++ mc/3D/CitcomS/trunk/configure.ac	2006-08-07 06:10:18 UTC (rev 4241)
@@ -48,9 +48,9 @@
 AM_CONDITIONAL([COND_PYRE], [test "$want_pyre" = yes])
 AC_ARG_WITH([hdf5],
     [AC_HELP_STRING([--with-hdf5],
-        [enable HDF5 output @<:@default=no@:>@])],
+        [enable HDF5 output @<:@default=yes@:>@])],
     [want_hdf5="$withval"],
-    [want_hdf5=no])
+    [want_hdf5=yes])
 AM_CONDITIONAL([COND_HDF5], [test "$want_hdf5" = yes])
 AC_ARG_ENABLE([embedding],
     [AC_HELP_STRING([--enable-embedding],

Modified: mc/3D/CitcomS/trunk/lib/Citcom_init.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Citcom_init.c	2006-08-07 04:56:58 UTC (rev 4240)
+++ mc/3D/CitcomS/trunk/lib/Citcom_init.c	2006-08-07 06:10:18 UTC (rev 4241)
@@ -51,5 +51,11 @@
   E->control.total_iteration_cycles=0;
   E->control.total_v_solver_calls=0;
 
+#ifdef USE_HDF5
+  strcpy(E->control.output_format, "hdf5");
+#else
+  strcpy(E->control.output_format, "ascii");
+#endif
+
   return(E);
 }

Modified: mc/3D/CitcomS/trunk/lib/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/lib/Makefile.am	2006-08-07 04:56:58 UTC (rev 4240)
+++ mc/3D/CitcomS/trunk/lib/Makefile.am	2006-08-07 06:10:18 UTC (rev 4241)
@@ -44,6 +44,10 @@
 libCitcomS_la_LDFLAGS = -release $(VERSION)
 libCitcomS_la_SOURCES = $(sources)
 
+if COND_HDF5
+    libCitcomS_a_CFLAGS += -DUSE_HDF5
+endif
+
 CC = $(MPICC)
 INCLUDES = -I$(top_srcdir)/lib/Common $(MPIINCLUDES)
 sources = \

Modified: mc/3D/CitcomS/trunk/lib/hdf5_related.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/hdf5_related.h	2006-08-07 04:56:58 UTC (rev 4240)
+++ mc/3D/CitcomS/trunk/lib/hdf5_related.h	2006-08-07 06:10:18 UTC (rev 4241)
@@ -76,4 +76,4 @@
     double *scalar2d;               /* shape (nx,ny) */
     double *scalar1d;               /* shape (nz,) */
 
-} hdf5;
+};

Modified: mc/3D/CitcomS/trunk/module/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/module/Makefile.am	2006-08-07 04:56:58 UTC (rev 4240)
+++ mc/3D/CitcomS/trunk/module/Makefile.am	2006-08-07 06:10:18 UTC (rev 4241)
@@ -44,6 +44,10 @@
 libPyxMPImodule_a_CFLAGS = $(AM_CXXFLAGS) # hack for automake
 libPyxMPImodule_a_SOURCES = PyxMPI/PyxMPI.c
 
+if COND_HDF5
+    libCitcomSLibmodule_a_CXXFLAGS += -DUSE_HDF5
+endif
+
 # extension modules (libtool)
 
 CitcomSLibmodule_la_LDFLAGS = -module -release $(VERSION)