[cig-commits] r6362 - mc/3D/CitcomS/trunk/lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-03-22 22:21:38 -0700 (Thu, 22 Mar 2007)
New Revision: 6362

Modified:
   mc/3D/CitcomS/trunk/lib/Composition_related.c
   mc/3D/CitcomS/trunk/lib/Output.c
Log:
Changed the header format of comp_* output to be consistent with other data files

Modified: mc/3D/CitcomS/trunk/lib/Composition_related.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Composition_related.c	2007-03-23 05:17:30 UTC (rev 6361)
+++ mc/3D/CitcomS/trunk/lib/Composition_related.c	2007-03-23 05:21:38 UTC (rev 6362)
@@ -371,8 +371,7 @@
     double rdum3;
 
     int ival=0;
-    int idum1;
-    int istep;
+    int idum0, idum1;
 
 
     FILE *fp;
@@ -396,7 +395,7 @@
         fp=fopen(output_file,"r");
         fgets(input_s,200,fp);
         sscanf(input_s,"%d %d %lf %lf %lf",
-               &istep,&idum1,&rdum1,&rdum2,&rdum3);
+               &idum0,&idum1,&rdum1,&rdum2,&rdum3);
 
         E->composition.initial_bulk_composition = rdum2;
         fclose(fp);

Modified: mc/3D/CitcomS/trunk/lib/Output.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Output.c	2007-03-23 05:17:30 UTC (rev 6361)
+++ mc/3D/CitcomS/trunk/lib/Output.c	2007-03-23 05:21:38 UTC (rev 6362)
@@ -438,14 +438,13 @@
             E->parallel.me, cycles);
     fp1 = output_open(output_file);
 
-    fprintf(fp1,"%d %d %.5e %.5e %.5e\n",
-            cycles, E->lmesh.nno,
-            E->monitor.elapsed_time,
-            E->composition.initial_bulk_composition,
-            E->composition.bulk_composition);
-
     for(j=1;j<=E->sphere.caps_per_proc;j++) {
-        fprintf(fp1,"%3d %7d\n", j, E->lmesh.nno);
+        fprintf(fp1,"%3d %7d %.5e %.5e %.5e\n",
+                j, E->lmesh.nel,
+                E->monitor.elapsed_time,
+                E->composition.initial_bulk_composition,
+                E->composition.bulk_composition);
+
         for(i=1;i<=E->lmesh.nno;i++) {
             fprintf(fp1,"%.6e\n",E->composition.comp_node[j][i]);
         }
@@ -467,14 +466,13 @@
             E->parallel.me, cycles);
     fp1 = output_open(output_file);
 
-    fprintf(fp1,"%d %d %.5e %.5e %.5e\n",
-            cycles, E->lmesh.nel,
-            E->monitor.elapsed_time,
-            E->composition.initial_bulk_composition,
-            E->composition.bulk_composition);
-
     for(j=1;j<=E->sphere.caps_per_proc;j++) {
-        fprintf(fp1,"%3d %7d\n", j, E->lmesh.nel);
+        fprintf(fp1,"%3d %7d %.5e %.5e %.5e\n",
+                j, E->lmesh.nel,
+                E->monitor.elapsed_time,
+                E->composition.initial_bulk_composition,
+                E->composition.bulk_composition);
+
         for(i=1;i<=E->lmesh.nel;i++) {
             fprintf(fp1,"%.6e\n",E->composition.comp_el[j][i]);
         }