[cig-commits] r19577 - short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction

[brad at geodynamics.org]

Author: brad
Date: 2012-02-02 10:23:23 -0800 (Thu, 02 Feb 2012)
New Revision: 19577

Modified:
   short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakening.cc
   short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakeningTime.cc
Log:
Fixed small bug in slip-weakening friction. Add cohesion even if in tension.

Modified: short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakening.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakening.cc	2012-02-02 18:23:14 UTC (rev 19576)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakening.cc	2012-02-02 18:23:23 UTC (rev 19577)
@@ -295,7 +295,9 @@
 	mu_f = properties[p_coefD];
       } // if/else
     friction = - mu_f * normalTraction + properties[p_cohesion];
-  } // if
+  } else { // else
+    friction = properties[p_cohesion];
+  } // if/else
 
   PetscLogFlops(6);
 

Modified: short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakeningTime.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakeningTime.cc	2012-02-02 18:23:14 UTC (rev 19576)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakeningTime.cc	2012-02-02 18:23:23 UTC (rev 19577)
@@ -304,7 +304,9 @@
 	mu_f = properties[p_coefD];
       } // if/else
     friction = - mu_f * normalTraction + properties[p_cohesion];
-  } // if
+  } else { // else
+    friction = properties[p_cohesion];
+  } // if/else
 
   PetscLogFlops(6);