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

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-03-12 15:06:37 -0700 (Mon, 12 Mar 2007)
New Revision: 6231

Modified:
   mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
   mc/3D/CitcomS/trunk/lib/Output.c
   mc/3D/CitcomS/trunk/lib/tracer_defs.h
Log:
Output the total composition information to the log file, get rid of extra file handles in trace struct

Modified: mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2007-03-12 22:05:31 UTC (rev 6230)
+++ mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2007-03-12 22:06:37 UTC (rev 6231)
@@ -368,7 +368,7 @@
     static int been_here=0;
 
     //TODO: fix this function
-    //if (E->composition.ichemical_buoyancy==1) get_bulk_composition(E);
+    if (E->composition.ichemical_buoyancy==1) get_bulk_composition(E);
 
 
     fprintf(E->trace.fpt,"Number of times for all element search  %d\n",E->trace.istat1);
@@ -398,26 +398,12 @@
     //TODO: move
     if (E->parallel.me==0)
         {
-            if (been_here==0)
-                {
-                    if (E->composition.ichemical_buoyancy==1)
-                        {
-                            sprintf(output_file,"%s.error_fraction.data",E->control.data_file);
-                            E->trace.fp_error_fraction=fopen(output_file,"w");
-
-                            sprintf(output_file,"%s.composition.data",E->control.data_file);
-                            E->trace.fp_composition=fopen(output_file,"w");
-                        }
-                }
-
             if (E->composition.ichemical_buoyancy==1)
                 {
                     //TODO: to be init'd
-                    fprintf(E->trace.fp_error_fraction,"%e %e\n",E->monitor.elapsed_time,E->trace.error_fraction);
-                    fprintf(E->trace.fp_composition,"%e %e\n",E->monitor.elapsed_time,E->trace.bulk_composition);
+                    fprintf(E->fp,"composition: %e %e\n",E->monitor.elapsed_time,E->composition.bulk_composition);
+                    fprintf(E->fp,"composition_error_fraction: %e %e\n",E->monitor.elapsed_time,E->composition.error_fraction);
 
-                    fflush(E->trace.fp_error_fraction);
-                    fflush(E->trace.fp_composition);
                 }
 
         }

Modified: mc/3D/CitcomS/trunk/lib/Output.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Output.c	2007-03-12 22:05:31 UTC (rev 6230)
+++ mc/3D/CitcomS/trunk/lib/Output.c	2007-03-12 22:06:37 UTC (rev 6231)
@@ -460,8 +460,8 @@
         fprintf(fp1,"%d %d %.5e %.5e %.5e\n",
                 cycles, E->lmesh.nno,
                 E->monitor.elapsed_time,
-                E->trace.initial_bulk_composition,
-                E->trace.bulk_composition);
+                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);
@@ -495,8 +495,8 @@
         fprintf(fp1,"%d %d %.5e %.5e %.5e\n",
                 cycles, E->lmesh.nel,
                 E->monitor.elapsed_time,
-                E->trace.initial_bulk_composition,
-                E->trace.bulk_composition);
+                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);

Modified: mc/3D/CitcomS/trunk/lib/tracer_defs.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/tracer_defs.h	2007-03-12 22:05:31 UTC (rev 6230)
+++ mc/3D/CitcomS/trunk/lib/tracer_defs.h	2007-03-12 22:06:37 UTC (rev 6231)
@@ -52,9 +52,6 @@
 
     FILE *fpt;
 
-    FILE *fp_error_fraction;
-    FILE *fp_composition;
-
     char tracer_file[200];
 
     int itracer_warnings;
@@ -129,8 +126,4 @@
     double sin_theta_f;
     double *shape_coefs[13][3][10];
 
-    double initial_bulk_composition;
-    double bulk_composition;
-    double error_fraction;
-
 };