[cig-commits] r15048 - short/3D/PyLith/trunk/libsrc/materials

[brad at geodynamics.org]

Author: brad
Date: 2009-05-25 16:01:21 -0700 (Mon, 25 May 2009)
New Revision: 15048

Modified:
   short/3D/PyLith/trunk/libsrc/materials/EffectiveStress.hh
   short/3D/PyLith/trunk/libsrc/materials/PowerLaw3D.cc
Log:
Fixed types for some args.

Modified: short/3D/PyLith/trunk/libsrc/materials/EffectiveStress.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/EffectiveStress.hh	2009-05-25 17:11:24 UTC (rev 15047)
+++ short/3D/PyLith/trunk/libsrc/materials/EffectiveStress.hh	2009-05-25 23:01:21 UTC (rev 15048)
@@ -94,10 +94,11 @@
    *
    * @returns Computed effective stress.
    */
+  static
   double getEffStress(const double effStressInitialGuess,
 		      EffStressStruct* effStressParams,
-		      effStressFunc_fn_type* effStressFunc,
-		      effStressFuncDFunc_fn_type* effStressFuncDFunc);
+		      effStressFunc_fn_type effStressFunc,
+		      effStressFuncDFunc_fn_type effStressFuncDFunc);
 
   // PRIVATE METHODS /////////////////////////////////////////////////////
 private :
@@ -113,7 +114,7 @@
   void _bracketEffStress(double* px1,
 			 double* px2,
 			 EffStressStruct& effStressParams,
-			 effStressFunc_fn_type* effStressFunc);
+			 effStressFunc_fn_type effStressFunc);
 
   /** Solve for effective stress using Newton's method with bisection.
    *

Modified: short/3D/PyLith/trunk/libsrc/materials/PowerLaw3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/PowerLaw3D.cc	2009-05-25 17:11:24 UTC (rev 15047)
+++ short/3D/PyLith/trunk/libsrc/materials/PowerLaw3D.cc	2009-05-25 23:01:21 UTC (rev 15048)
@@ -605,9 +605,9 @@
     double effStressTpdt =
       pylith::materials::EffectiveStress::getEffStress(
 			effStressInitialGuess,
-			_effStressParams,
-			&pylith::materials::PowerLaw3D::effStressFunc,
-			&pylith::materials::PowerLaw3D::effStressFuncDFunc);
+			&_effStressParams,
+			pylith::materials::PowerLaw3D::effStressFunc,
+			pylith::materials::PowerLaw3D::effStressFuncDFunc);
 
     // Compute stresses from effective stress.
     const double effStressTau = (1.0 - alpha) * effStressT +