[cig-commits] r16259 - in short/3D/PyLith/trunk/libsrc: . friction

[surendra at geodynamics.org]

Author: surendra
Date: 2010-02-12 12:30:07 -0800 (Fri, 12 Feb 2010)
New Revision: 16259

Modified:
   short/3D/PyLith/trunk/libsrc/Makefile.am
   short/3D/PyLith/trunk/libsrc/friction/Makefile.am
   short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc
   short/3D/PyLith/trunk/libsrc/friction/frictionfwd.hh
Log:
Finished implemented RateStateAgeing Object

Modified: short/3D/PyLith/trunk/libsrc/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/Makefile.am	2010-02-12 20:17:28 UTC (rev 16258)
+++ short/3D/PyLith/trunk/libsrc/Makefile.am	2010-02-12 20:30:07 UTC (rev 16259)
@@ -81,6 +81,7 @@
 	friction/FrictionModel.cc \
 	friction/StaticFriction.cc \
 	friction/SlipWeakening.cc \
+	friction/RateStateAgeing.cc \
 	materials/Metadata.cc \
 	materials/Material.cc \
 	materials/ElasticMaterial.cc \

Modified: short/3D/PyLith/trunk/libsrc/friction/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/Makefile.am	2010-02-12 20:17:28 UTC (rev 16258)
+++ short/3D/PyLith/trunk/libsrc/friction/Makefile.am	2010-02-12 20:30:07 UTC (rev 16259)
@@ -18,6 +18,7 @@
 	FrictionModel.icc \
 	StaticFriction.hh \
 	SlipWeakening.hh \
+	RateStateAgeing.hh \
 	frictionfwd.hh
 
 

Modified: short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc	2010-02-12 20:17:28 UTC (rev 16258)
+++ short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc	2010-02-12 20:30:07 UTC (rev 16259)
@@ -252,8 +252,6 @@
   assert(0 != numStateVars);
   assert(_numVarsVertex == numStateVars);
 
-
-  // DO SOMETHING LIKE THIS:
   double friction = 0.0;
   double mu_f = 0.0;
   if (normalTraction < 0.0) {

Modified: short/3D/PyLith/trunk/libsrc/friction/frictionfwd.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/frictionfwd.hh	2010-02-12 20:17:28 UTC (rev 16258)
+++ short/3D/PyLith/trunk/libsrc/friction/frictionfwd.hh	2010-02-12 20:30:07 UTC (rev 16259)
@@ -29,6 +29,8 @@
     class StaticFriction;
 
     class SlipWeakening;
+    
+    class RateStateAgeing;
 
   } // friction
 } // pylith