[cig-commits] r20279 - short/3D/PyLith/branches/v1.7-trunk/templates/friction

[brad at geodynamics.org]

Author: brad
Date: 2012-06-01 14:39:29 -0700 (Fri, 01 Jun 2012)
New Revision: 20279

Modified:
   short/3D/PyLith/branches/v1.7-trunk/templates/friction/Makefile.am
   short/3D/PyLith/branches/v1.7-trunk/templates/friction/ViscousFriction.cc
   short/3D/PyLith/branches/v1.7-trunk/templates/friction/configure.ac
Log:
Fix build problems (updated).

Modified: short/3D/PyLith/branches/v1.7-trunk/templates/friction/Makefile.am
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/templates/friction/Makefile.am	2012-06-01 21:18:37 UTC (rev 20278)
+++ short/3D/PyLith/branches/v1.7-trunk/templates/friction/Makefile.am	2012-06-01 21:39:29 UTC (rev 20279)
@@ -45,6 +45,7 @@
 AM_CPPFLAGS = $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) 
 
 INCLUDES = 
+INCLUDES += $(PETSC_CC_INCLUDES)
 
 # MODULE ---------------------------------------------------------------
 

Modified: short/3D/PyLith/branches/v1.7-trunk/templates/friction/ViscousFriction.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/templates/friction/ViscousFriction.cc	2012-06-01 21:18:37 UTC (rev 20278)
+++ short/3D/PyLith/branches/v1.7-trunk/templates/friction/ViscousFriction.cc	2012-06-01 21:39:29 UTC (rev 20279)
@@ -268,8 +268,8 @@
 					       const int nvalues) const
 { // _dimStateVars
   // Check consistency of arguments.
-  assert(0 != _normalizer);
-  assert(0 != values);
+  assert(_normalizer);
+  assert(values);
   assert(nvalues == _ViscousFriction::numStateVars);
 
   // Get scales needed to dimensional parameters from the
@@ -296,10 +296,10 @@
 						const int numStateVars)
 { // _calcFriction
   // Check consistency of arguments.
-  assert(0 != properties);
-  assert(_numPropsVertex == numProperties);
-  assert(0 != numStateVars);
-  assert(_numVarsVertex == numStateVars);
+  assert(properties);
+  assert(_ViscousFriction::numProperties == numProperties);
+  assert(numStateVars);
+  assert(_ViscousFriction::numStateVars == numStateVars);
 
   // Compute friction traction.
   double friction = 0.0;
@@ -325,8 +325,10 @@
 						  const int numProperties)
 { // _updateStateVars
   // Check consistency of arguments.
-  assert(0 != numStateVars);
-  assert(0 != numProperties);
+  assert(properties);
+  assert(_ViscousFriction::numProperties == numProperties);
+  assert(numStateVars);
+  assert(_ViscousFriction::numStateVars == numStateVars);
 
   // Store state variables.
   stateVars[s_slipRate] = stateVars[s_slipRate]; 

Modified: short/3D/PyLith/branches/v1.7-trunk/templates/friction/configure.ac
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/templates/friction/configure.ac	2012-06-01 21:18:37 UTC (rev 20278)
+++ short/3D/PyLith/branches/v1.7-trunk/templates/friction/configure.ac	2012-06-01 21:39:29 UTC (rev 20279)
@@ -48,7 +48,17 @@
 CIT_NUMPY_INCDIR
 AC_PROG_SWIG(1.3.33)
 
+# PETSC (dictates precision)
+AC_LANG(C++)
+CIT_PATH_PETSC([3.2.0])
+CIT_HEADER_PETSC
+
+
+
 # PYLITH
+pylith_save_CPPFLAGS=$CPPFLAGS
+pylith_save_LIBS=$LIBS
+CPPFLAGS="$PETSC_CC_INCLUDES $CPPFLAGS"
 AC_LANG(C++)
 AC_CHECK_HEADER([pylith/friction/FrictionModel.hh], [], [
   AC_MSG_ERROR([PyLith FrictionModel header not found; try CPPFLAGS="-I<PyLith include dir>"])
@@ -70,8 +80,8 @@
   AC_CHECK_FILE([friction/FrictionModel.i], [], [
     AC_MSG_ERROR([PyLith FrictionModel.i SWIG interface file not found; Try setting PYLITH_SWIG_DIR=<directory containing friction/FrictionModel.i>])])
 fi
+CPPFLAGS=$pylith_save_CPPFLAGS
 
-
 # ENDIANNESS
 AC_C_BIGENDIAN