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

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:20:49 -0700 (Wed, 11 Oct 2006)
New Revision: 4790

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c
Log:
 r710 at earth:  boo | 2006-10-11 12:11:17 -0700
 Fix DumpSwarm to actually print out how much strain weakening the material has gone through



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

Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c	2006-10-11 20:01:04 UTC (rev 4789)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c	2006-10-11 20:20:49 UTC (rev 4790)
@@ -105,7 +105,7 @@
 
         Rheology_Index      rheology_I; 
         Rheology_Index      rheologyCount;
-        FaultingMoresiMuhlhaus2006*           rheology; 
+        YieldRheology*           rheology; 
 
         double *coord;
 
@@ -134,7 +134,7 @@
           /* Loop over all of the rheologies for a particle. */
 
           for( rheology_I = 0; rheology_I < rheologyCount ; rheology_I++ ) { 
-            rheology = (FaultingMoresiMuhlhaus2006*)Rheology_Register_GetByIndex( rheology_register, rheology_I ); 
+            rheology = (YieldRheology*)Rheology_Register_GetByIndex( rheology_register, rheology_I ); 
 
             /* We are only interested in whether a particle has
                yielded, so we only look at yielding rheologies */
@@ -145,7 +145,7 @@
                 coord = materialparticle->coord;
                 
                 if (context->dim == 2) {
-                  Journal_Printf(stream,"%lf %lf ",(double)coord[0],(double)coord[1]);
+                  Journal_Printf(stream,"%lf %lf 0.0 ",(double)coord[0],(double)coord[1]);
                 } else {
                   Journal_Printf(stream,"%lf %lf %lf ",(double)coord[0],(double)coord[1],
                                  (double)coord[2]);
@@ -156,9 +156,10 @@
                   }
                 else
                   {
-                    Journal_Printf(stream,"%d\n",(*(Particle_Bool*)ExtensionManager_Get( (materialSwarm)->particleExtensionMgr,
-                                                                                           (materialparticle),
-                                                                                           (rheology)->hasYieldedParticleExtHandle )));
+                    Journal_Printf
+                      (stream,"%lf\n",
+                       StrainWeakening_CalcRatio(rheology->strainWeakening,
+                                                 materialparticle));
                   }
               }
           }