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

[walter at geodynamics.org]

Author: walter
Date: 2006-12-11 03:00:36 -0800 (Mon, 11 Dec 2006)
New Revision: 5581

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c
Log:
 r1216 at earth:  boo | 2006-12-11 01:51:20 -0800
 Implement csv format



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

Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c	2006-12-10 23:21:44 UTC (rev 5580)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c	2006-12-11 11:00:36 UTC (rev 5581)
@@ -83,6 +83,7 @@
 	UnderworldContext*	context = (UnderworldContext*)_context;
 	FeVariable*		currFeVar;
 	Name			currFeVarName;
+	Dictionary*             dictionary         = context->dictionary;
 	Dictionary_Entry_Value*	feVarList=NULL;
 	Dictionary_Entry_Value*	currFvParam=NULL;
 	Index			feVar_I=0;
@@ -108,14 +109,21 @@
         YieldRheology*           rheology; 
 
         double *coord;
+        char *format;
+        char separator[2];
+        separator[0]='\0';
 
         /* Only dump if at the right time step. */
         if(context->timeStep % context->dumpEvery != 0)
           return;
 	
+        format=Dictionary_GetString_WithDefault(dictionary,"outputFormat","txt");
+        if(!strcmp(format,"csv"))
+          strcpy(separator,",");
+
         stream = Journal_Register( MPIStream_Type, Swarm_Type );
-        Stg_asprintf( &filename, "%s/%s.%05d.txt", context->outputPath,
-                      "yielding", context->timeStep );
+        Stg_asprintf( &filename, "%s/yielding.%05d.%s", context->outputPath,
+                      context->timeStep, format );
         Stream_RedirectFile( stream, filename );
         
         /* Loop over all of the particles */
@@ -140,15 +148,18 @@
                yielded, so we only look at yielding rheologies */
             if(!strcmp(rheology->name,"yielding"))
               {
-                Journal_Printf(stream,"%d ",rheology_I);
+                Journal_Printf(stream,"%d%s ",rheology_I,separator);
             
                 coord = materialparticle->coord;
                 
                 if (context->dim == 2) {
-                  Journal_Printf(stream,"%lf %lf 0.0 ",(double)coord[0],(double)coord[1]);
+                  Journal_Printf(stream,"%lf%s %lf%s 0.0%s ",(double)coord[0],
+                                 separator,(double)coord[1],separator,separator);
                 } else {
-                  Journal_Printf(stream,"%lf %lf %lf ",(double)coord[0],(double)coord[1],
-                                 (double)coord[2]);
+                  Journal_Printf(stream,"%lf%s %lf%s %lf%s ",
+                                 (double)coord[0],separator,
+                                 (double)coord[1],separator,
+                                 (double)coord[2],separator);
                 }
                 if ( (rheology)->hasYieldedParticleExtHandle == (ExtensionInfo_Index) -1 )
                   {