[cig-commits] r5170 - in short/3D/PyLith/branches/pylith-0.8: . pylith3d/libpylith3d pylith3d/module

[brad at geodynamics.org]

Author: brad
Date: 2006-11-02 09:06:44 -0800 (Thu, 02 Nov 2006)
New Revision: 5170

Modified:
   short/3D/PyLith/branches/pylith-0.8/configure.ac
   short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/Makefile.am
   short/3D/PyLith/branches/pylith-0.8/pylith3d/module/Makefile.am
Log:
Added use of SIEVE_FLAGS and PETSC_LIB in module Makefile. Temporarily hardwired setting SIEVE_FLAGS in configure.ac (real solution is to get value from petscconf in m4/cit_petsc.m4, which Leif will add when he has time).

Modified: short/3D/PyLith/branches/pylith-0.8/configure.ac
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/configure.ac	2006-11-01 20:47:53 UTC (rev 5169)
+++ short/3D/PyLith/branches/pylith-0.8/configure.ac	2006-11-02 17:06:44 UTC (rev 5170)
@@ -61,7 +61,18 @@
 # Checks for libraries.
 CIT_CHECK_LIB_MPI
 CIT_CHECK_LIB_PETSC
+#CIT_PETSC_SIEVE --Out of date---
+# :TODO: Update CIT_PETSC_SIEVE as follows:
+# Replace
+# ALE::Sieve *topology;
+# with
+# const int dim = 3;
+# ALE::Mesh mesh(PETSC_COMM_WORLD, dim);
+# :TODO: Line below needs to be integrated into CIT_PETSC_SIEVE with 
+# value of SIEVE_FLAGS extracted from petsconf
+AC_SUBST([SIEVE_FLAGS], ["-DALE_USE_DEBUGGING -DALE_HAVE_CXX_ABI -DALE_USE_LOGGING -DALE_LOGGING_USE_EVENTS -DALE_LOGGING_LOG_MEM -DALE_LOGGING_VERBOSE"])
 
+
 # Checks for header files.
 CIT_HEADER_MPI
 CIT_HEADER_PETSC

Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/Makefile.am	2006-11-01 20:47:53 UTC (rev 5169)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/Makefile.am	2006-11-02 17:06:44 UTC (rev 5170)
@@ -19,8 +19,7 @@
 # shared library (libtool)
 libpylith3d_la_SOURCES = $(sources)
 libpylith3d_la_LDFLAGS =
-libpylith3d_la_LIBADD = \
-	$(PETSC_LIB)
+libpylith3d_la_LIBADD = $(PETSC_LIB)
 
 F77 = $(FC)
 AM_FFLAGS = \

Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/module/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/module/Makefile.am	2006-11-01 20:47:53 UTC (rev 5169)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/module/Makefile.am	2006-11-02 17:06:44 UTC (rev 5170)
@@ -21,16 +21,14 @@
 pylith3dmodule_la_LDFLAGS = -module
 pylith3dmodule_la_LIBADD = \
 	$(top_builddir)/pylith3d/libpylith3d/libpylith3d.la \
-	-L$(PETSC_LIB_DIR) \
-	$(PETSC_FORTRAN_LIB_BASIC) \
-	$(PETSC_LIB_BASIC) \
-	$(PETSC_EXTERNAL_LIB_BASIC) \
+	$(PETSC_LIB) \
 	$(FCLIBS) \
 	-ljournal
 
 CXX = $(MPICXX)
 CXXLD = @CXX@
-INCLUDES = $(PETSC_INCLUDE) -I$(PETSC_DIR)/src/dm/mesh/sieve -I$(PYTHON_INCDIR) $(MPIINCLUDES)
+INCLUDES = $(PETSC_INCLUDE) -I$(PYTHON_INCDIR) $(MPIINCLUDES)
+CPPFLAGS += $(SIEVE_FLAGS)
 sources = \
 	array.cc \
 	array.h \