[cig-commits] r11292 - in long/3D/Gale/trunk: . src/Underworld/Rheology/src

[walter at geodynamics.org]

Author: walter
Date: 2008-02-28 16:05:25 -0800 (Thu, 28 Feb 2008)
New Revision: 11292

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c
Log:
 r2018 at earth:  boo | 2008-02-28 16:04:13 -0800
 Revert the change that set the yield strength to a minimum in MohrCoulomb, since you can get the same effect by setting the minimumYieldStress



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2016
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2018

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c	2008-02-28 23:57:34 UTC (rev 11291)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c	2008-02-29 00:05:25 UTC (rev 11292)
@@ -306,11 +306,7 @@
 	effectiveCohesion            = _MohrCoulomb_EffectiveCohesion( self, materialPoint );
 	sigma_nn                     = _MohrCoulomb_Sigma_nn( self, materialPoint, constitutiveMatrix->dim );
 
-        frictionalStrength =effectiveCohesion;
-        /* Only add the frictional strength if it increases the strength. */
-        if(sigma_nn>0)
-          frictionalStrength += effectiveFrictionCoefficient * sigma_nn;
-          
+        frictionalStrength = effectiveFrictionCoefficient * sigma_nn + effectiveCohesion;
 
 	/* Make sure frictionalStrength is above the minimum */
 	minimumYieldStress = self->minimumYieldStress;