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

[walter at geodynamics.org]

Author: walter
Date: 2006-08-17 17:18:30 -0700 (Thu, 17 Aug 2006)
New Revision: 4366

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/Rheology/src/DruckerPrager.c
Log:
 r497 at earth:  boo | 2006-08-17 17:15:30 -0700
  r471 at earth (orig r302):  VincentLemiale | 2006-08-08 22:32:14 -0700
  reverting a local change accidentally commited by Pat.
  
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:496
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:301
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:497
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:302

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/DruckerPrager.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/DruckerPrager.c	2006-08-18 00:18:30 UTC (rev 4365)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/DruckerPrager.c	2006-08-18 00:18:30 UTC (rev 4366)
@@ -302,7 +302,7 @@
 	dpFrictionCoefficient = 6.0 * sinphi * oneOverDenominator;
 	dpCohesion = 6.0 * effectiveCohesion * cos(phi) * oneOverDenominator;
 		
-	frictionalStrength = dpFrictionCoefficient * fabs(pressure) + dpCohesion ;
+	frictionalStrength = dpFrictionCoefficient * pressure + dpCohesion ;
 							 
 	if ( frictionalStrength < minimumYieldStress) 
 		frictionalStrength = minimumYieldStress;