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

[walter at geodynamics.org]

Author: walter
Date: 2006-08-09 12:26:00 -0700 (Wed, 09 Aug 2006)
New Revision: 4251

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c
Log:
 r581 at earth:  boo | 2006-08-09 12:24:28 -0700
 Fix DumpSwarm to compile with MSVC



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

Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c	2006-08-09 09:48:19 UTC (rev 4250)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c	2006-08-09 19:26:00 UTC (rev 4251)
@@ -100,14 +100,22 @@
 
         Rheology_Register*      rheology_register;
 
+        Name filename;
+        Stream*           stream;
+
+        Rheology_Index      rheology_I; 
+        Rheology_Index      rheologyCount;
+        MohrCoulomb*           rheology; 
+
+        double *coord;
+
         /* Only dump if at the right time step. */
         if(context->timeStep % context->dumpEvery != 0)
           return;
 	
-        Name filename;
-        Stream*           stream              = Journal_Register( MPIStream_Type, Swarm_Type );
+        stream = Journal_Register( MPIStream_Type, Swarm_Type );
         Stg_asprintf( &filename, "%s/%s.%05d.txt", context->outputPath,
-                      picswarm->name, context->timeStep );
+                      "yielding", context->timeStep );
         Stream_RedirectFile( stream, filename );
         
         /* Loop over all of the particles */
@@ -121,9 +129,7 @@
 
           rheology_register=(Rheology_Register*)material->rheology_Register;
 
-          Rheology_Index      rheology_I; 
-          Rheology_Index      rheologyCount = Rheology_Register_GetCount( rheology_register ); 
-          MohrCoulomb*           rheology; 
+          rheologyCount = Rheology_Register_GetCount( rheology_register ); 
 	
           /* Loop over all of the rheologies for a particle. */
 
@@ -136,7 +142,7 @@
               {
                 Journal_Printf(stream,"%d ",rheology_I);
             
-                double *coord = materialparticle->coord;
+                coord = materialparticle->coord;
                 
                 if (context->dim == 2) {
                   Journal_Printf(stream,"%lf %lf ",(double)coord[0],(double)coord[1]);