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

[walter at geodynamics.org]

Author: walter
Date: 2008-10-24 13:40:51 -0700 (Fri, 24 Oct 2008)
New Revision: 13127

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Underworld/plugins/Output/VTKOutput/VTKOutput.c
Log:
 r2364 at earth:  boo | 2008-10-24 13:36:55 -0700
 Add Currently_Yielding to VTKOutput



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

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 19:20:29 UTC (rev 13126)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/VTKOutput/VTKOutput.c	2008-10-24 20:40:51 UTC (rev 13127)
@@ -171,12 +171,13 @@
   
   /* We need many iterations, because the values are written
      separately from the coordinates. */
-  for(iteration=0; iteration<8; ++iteration)
+  for(iteration=0; iteration<9; ++iteration)
     {
       /* Loop over all of the particles */
       for ( lParticle_I = 0 ; lParticle_I < num_particles ;
             lParticle_I+=stepping ){
         double postFailureStrain, viscosity, density, alpha, diffusivity;
+        int currently_yielding;
         Material_Index material_index;
         SymmetricTensor stress;
         BuoyancyForceTerm_MaterialExt*   materialExt;
@@ -201,6 +202,7 @@
         coord = materialparticle->coord;
         postFailureStrain=0;
         viscosity=0;
+        currently_yielding=0;
         SymmetricTensor_Zero(stress);
         
         /* First print out only the coordinates. */
@@ -221,12 +223,14 @@
             for( rheology_I = 0; rheology_I < rheologyCount ; rheology_I++ ) { 
               rheology = (YieldRheology*)Rheology_Register_GetByIndex( rheology_register, rheology_I ); 
                 
-              /* Get postFailureStrain information */
+              /* Get postFailureStrain and current_yielding information */
               if(Stg_Class_IsInstance(rheology,YieldRheology_Type))
                 {
                   postFailureStrain=
                     StrainWeakening_GetPostFailureWeakening
                     (rheology->strainWeakening,materialparticle);
+                  currently_yielding=YieldRheology_GetParticleFlag
+                    (rheology,materialSwarm,materialparticle);
                 }
               /* Get viscosity */
               if(Stg_Class_IsInstance(rheology,StoreVisc_Type))
@@ -290,6 +294,9 @@
               case 7:
                 fprintf(fp,"%lf ",diffusivity);
                 break;
+              case 8:
+                fprintf(fp,"%d ",currently_yielding);
+                break;
               }
           }
       }
@@ -308,9 +315,9 @@
           break;
         case 1:
           fprintf(fp,"\n        </DataArray>\n");
-          fprintf(fp,"        <DataArray type=\"Float64\" Name=\"PostFailureStrain\" format=\"ascii\">\n");
+          fprintf(fp,"        <DataArray type=\"Float64\" Name=\"Post_Failure_Strain\" format=\"ascii\">\n");
           if(myRank==0)
-            fprintf(pfp,"        <PDataArray type=\"Float64\" Name=\"PostFailureStrain\" format=\"ascii\"/>\n");
+            fprintf(pfp,"        <PDataArray type=\"Float64\" Name=\"Post_Failure_Strain\" format=\"ascii\"/>\n");
           break;
         case 2:
           fprintf(fp,"\n        </DataArray>\n");
@@ -344,6 +351,12 @@
           break;
         case 7:
           fprintf(fp,"\n        </DataArray>\n");
+          fprintf(fp,"        <DataArray type=\"Int32\" Name=\"Currently_Yielding\" format=\"ascii\">\n");
+          if(myRank==0)
+            fprintf(pfp,"        <PDataArray type=\"Int32\" Name=\"Currently_Yielding\" format=\"ascii\"/>\n");
+          break;
+        case 8:
+          fprintf(fp,"\n        </DataArray>\n");
           fprintf(fp,"      </PointData>\n");
           fprintf(fp,"      <CellData>\n");
           fprintf(fp,"      </CellData>\n");