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

[walter at geodynamics.org]

Author: walter
Date: 2008-05-22 11:16:17 -0700 (Thu, 22 May 2008)
New Revision: 11997

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c
Log:
 r2167 at earth:  boo | 2008-05-22 11:10:56 -0700
 Cleanup



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

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c	2008-05-22 18:16:14 UTC (rev 11996)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c	2008-05-22 18:16:17 UTC (rev 11997)
@@ -335,10 +335,6 @@
    (and thus the viscosity), while the yieldIndicator depends linearly
    on the deviatoric stresses. */
 
-typedef struct  {
-  double effVisc;
-} StoreVisc_ParticleExt;
-
 void _MohrCoulomb_HasYielded( 
 		void*                                              rheology,
 		ConstitutiveMatrix*                                constitutiveMatrix,
@@ -352,32 +348,6 @@
 
   double beta=1.0-yieldCriterion/(yieldIndicator);
 
-/*     { */
-/*       StoreVisc_ParticleExt*            particleExt; */
-      
-/*       /\* Get Parameters From Material Extension *\/ */
-/*       particleExt          = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, 2 ); */
-      
-/* /\*       if((particleExt->effVisc>viscosity*(1-beta) && particleExt->effVisc/viscosity*(1-beta)<1.0e3) *\/ */
-/* /\*          || (particleExt->effVisc<viscosity*(1-beta) && particleExt->effVisc/viscosity*(1-beta)>1.0e-3)) *\/ */
-/* /\*       if(particleExt->effVisc!=viscosity) *\/ */
-/* /\*         { *\/ */
-/* /\*           double new_viscosity; *\/ */
-/* /\*           new_viscosity=sqrt(particleExt->effVisc*viscosity*(1-beta)); *\/ */
-/* /\* /\\*           new_viscosity=(particleExt->effVisc+(viscosity*(1-beta)))/2; *\\/ *\/ */
-/* /\* /\\*           new_viscosity=pow(pow(particleExt->effVisc,1.0)*viscosity*(1-beta),1/2.0); *\\/ *\/ */
-/* /\*           beta=1.0-new_viscosity/viscosity; *\/ */
-/* /\*         } *\/ */
-
-/* /\*       if(lElement_I==340) *\/ */
-/* /\*         printf("has yielded %d %g %g %g\n",lElement_I,particleExt->effVisc,viscosity,viscosity*(1-beta)); *\/ */
-
-
-/*       if(lElement_I>680 && lElement_I<710) */
-/*         printf("has yielded %d %g %g %g %g\n",lElement_I,yieldCriterion, */
-/*                yieldIndicator,particleExt->effVisc,viscosity*(1-beta)); */
-/*     } */
-
   ConstitutiveMatrix_IsotropicCorrection( constitutiveMatrix, -viscosity * beta );
 }