[cig-commits] r16688 - short/3D/PyLith/trunk/libsrc/friction

[brad at geodynamics.org]

Author: brad
Date: 2010-05-11 16:44:43 -0700 (Tue, 11 May 2010)
New Revision: 16688

Modified:
   short/3D/PyLith/trunk/libsrc/friction/RateStateAgeing.cc
   short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc
   short/3D/PyLith/trunk/libsrc/friction/StaticFriction.cc
Log:
Changed strict less than to less than or equal for normal traction.

Modified: short/3D/PyLith/trunk/libsrc/friction/RateStateAgeing.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/RateStateAgeing.cc	2010-05-11 21:48:45 UTC (rev 16687)
+++ short/3D/PyLith/trunk/libsrc/friction/RateStateAgeing.cc	2010-05-11 23:44:43 UTC (rev 16688)
@@ -286,7 +286,7 @@
 
   double friction = 0.0;
   double mu_f = 0.0;
-  if (normalTraction < 0.0) {
+  if (normalTraction <= 0.0) {
     // if fault is in compression
     // Using Regularized Rate and State equation
     const double f0 = properties[p_coef];

Modified: short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc	2010-05-11 21:48:45 UTC (rev 16687)
+++ short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc	2010-05-11 23:44:43 UTC (rev 16688)
@@ -266,7 +266,7 @@
 
   double friction = 0.0;
   double mu_f = 0.0;
-  if (normalTraction < 0.0) {
+  if (normalTraction <= 0.0) {
     // if fault is in compression
     if (stateVars[s_slipCum] < properties[p_d0]) {
 	// if/else linear slip-weakening form of mu_f 

Modified: short/3D/PyLith/trunk/libsrc/friction/StaticFriction.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/StaticFriction.cc	2010-05-11 21:48:45 UTC (rev 16687)
+++ short/3D/PyLith/trunk/libsrc/friction/StaticFriction.cc	2010-05-11 23:44:43 UTC (rev 16688)
@@ -150,7 +150,7 @@
   assert(_numPropsVertex == numProperties);
   assert(0 == numStateVars);
 
-  const double friction = (normalTraction < 0.0) ?
+  const double friction = (normalTraction <= 0.0) ?
     -properties[p_coef] * normalTraction + properties[p_cohesion]: 
     0.0;