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

[walter at geodynamics.org]

Author: walter
Date: 2006-10-12 11:10:11 -0700 (Thu, 12 Oct 2006)
New Revision: 4958

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c
Log:
 r887 at earth:  boo | 2006-10-12 11:10:01 -0700
 Make MohrCoulomb work in 3D



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

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c	2006-10-12 14:48:43 UTC (rev 4957)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c	2006-10-12 18:10:11 UTC (rev 4958)
@@ -393,6 +393,7 @@
 	SymmetricTensor                      strainRate;
 	Dimension_Index                      dim                = constitutiveMatrix->dim;
         Eigenvector                          evectors[3];
+        double e0, e1, e2;
 	
 	FeVariable_InterpolateWithinElement( self->pressureField, lElement_I, xi, &self->currentPressure );	
 	FeVariable_InterpolateWithinElement( self->velocityGradientsField, lElement_I, xi, self->currentVelocityGradient );
@@ -407,4 +408,12 @@
           {
             self->strainRateSecondInvariant=0.5*fabs(evectors[0].eigenvalue-evectors[1].eigenvalue);
           }
+        else
+          {
+            e0=evectors[0].eigenvalue;
+            e1=evectors[1].eigenvalue;
+            e2=evectors[2].eigenvalue;
+            self->strainRateSecondInvariant=
+              sqrt(((e0-e1)*(e0-e1) + (e1-e2)*(e1-e2) + (e2-e0)*(e2-e0))/6.0);
+          }
 }