[cig-commits] r13126 - in long/3D/Gale/trunk: . src/Underworld/plugins/Output/VTKOutput

[walter at geodynamics.org]

Author: walter
Date: 2008-10-24 12:20:29 -0700 (Fri, 24 Oct 2008)
New Revision: 13126

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Underworld/plugins/Output/VTKOutput/VTKOutput.c
Log:
 r2362 at earth:  boo | 2008-10-24 12:16:31 -0700
 Change yielding to PostFailureStrain in VTKOutput



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

Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/VTKOutput/VTKOutput.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/VTKOutput/VTKOutput.c	2008-10-24 00:36:33 UTC (rev 13125)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/VTKOutput/VTKOutput.c	2008-10-24 19:20:29 UTC (rev 13126)
@@ -176,7 +176,7 @@
       /* Loop over all of the particles */
       for ( lParticle_I = 0 ; lParticle_I < num_particles ;
             lParticle_I+=stepping ){
-        double yielding, viscosity, density, alpha, diffusivity;
+        double postFailureStrain, viscosity, density, alpha, diffusivity;
         Material_Index material_index;
         SymmetricTensor stress;
         BuoyancyForceTerm_MaterialExt*   materialExt;
@@ -199,7 +199,7 @@
         rheologyCount = Rheology_Register_GetCount( rheology_register ); 
         
         coord = materialparticle->coord;
-        yielding=0;
+        postFailureStrain=0;
         viscosity=0;
         SymmetricTensor_Zero(stress);
         
@@ -221,11 +221,12 @@
             for( rheology_I = 0; rheology_I < rheologyCount ; rheology_I++ ) { 
               rheology = (YieldRheology*)Rheology_Register_GetByIndex( rheology_register, rheology_I ); 
                 
-              /* Get yielding information */
+              /* Get postFailureStrain information */
               if(Stg_Class_IsInstance(rheology,YieldRheology_Type))
                 {
-                  yielding=StrainWeakening_CalcRatio(rheology->strainWeakening,
-                                                     materialparticle);
+                  postFailureStrain=
+                    StrainWeakening_GetPostFailureWeakening
+                    (rheology->strainWeakening,materialparticle);
                 }
               /* Get viscosity */
               if(Stg_Class_IsInstance(rheology,StoreVisc_Type))
@@ -260,7 +261,7 @@
                 fprintf(fp,"%lf ",viscosity);
                 break;
               case 2:
-                fprintf(fp,"%lf ",yielding);
+                fprintf(fp,"%lf ",postFailureStrain);
                 break;
               case 3:
                 if(dim==2)
@@ -307,9 +308,9 @@
           break;
         case 1:
           fprintf(fp,"\n        </DataArray>\n");
-          fprintf(fp,"        <DataArray type=\"Float64\" Name=\"Yielding_fraction\" format=\"ascii\">\n");
+          fprintf(fp,"        <DataArray type=\"Float64\" Name=\"PostFailureStrain\" format=\"ascii\">\n");
           if(myRank==0)
-            fprintf(pfp,"        <PDataArray type=\"Float64\" Name=\"Yielding_fraction\" format=\"ascii\"/>\n");
+            fprintf(pfp,"        <PDataArray type=\"Float64\" Name=\"PostFailureStrain\" format=\"ascii\"/>\n");
           break;
         case 2:
           fprintf(fp,"\n        </DataArray>\n");