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

[walter at geodynamics.org]

Author: walter
Date: 2009-03-08 00:22:35 -0800 (Sun, 08 Mar 2009)
New Revision: 14254

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c
Log:
 r2542 at dante:  boo | 2009-03-08 00:22:12 -0800
 Add the trace of the stress to pressure, rather than setting the pressure to the trace



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

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c	2009-03-08 07:38:30 UTC (rev 14253)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c	2009-03-08 08:22:35 UTC (rev 14254)
@@ -345,12 +345,12 @@
 
   if(dim==2)
     {
-      pressure=(eigenvectorList[0].eigenvalue+eigenvectorList[1].eigenvalue)/2;
+      pressure+=(eigenvectorList[0].eigenvalue+eigenvectorList[1].eigenvalue)/2;
     }
   else
     {
-      pressure=(eigenvectorList[0].eigenvalue+eigenvectorList[1].eigenvalue
-                +eigenvectorList[2].eigenvalue)/2;
+      pressure+=(eigenvectorList[0].eigenvalue+eigenvectorList[1].eigenvalue
+                 +eigenvectorList[2].eigenvalue)/2;
     }
 
   /* Calculate frictional strength.  We modify the friction and