[cig-commits] r14647 - in mc/3D/CitcomS/trunk: bin lib

[becker at geodynamics.org]

Author: becker
Date: 2009-04-09 13:37:59 -0700 (Thu, 09 Apr 2009)
New Revision: 14647

Modified:
   mc/3D/CitcomS/trunk/bin/Citcom.c
   mc/3D/CitcomS/trunk/lib/Instructions.c
   mc/3D/CitcomS/trunk/lib/Output.c
Log:
Fixed file output issue which caused vtk log file I/O to bomb during Citcom finalize.



Modified: mc/3D/CitcomS/trunk/bin/Citcom.c
===================================================================
--- mc/3D/CitcomS/trunk/bin/Citcom.c	2009-04-09 15:59:17 UTC (rev 14646)
+++ mc/3D/CitcomS/trunk/bin/Citcom.c	2009-04-09 20:37:59 UTC (rev 14647)
@@ -165,12 +165,9 @@
 
   /* stop the computation if only computes stokes' problem */
   if (E->control.stokes)  {
-
     if(E->control.tracer==1)
       tracer_advection(E);
-
     (E->problem_output)(E, E->monitor.solution_cycles);
-
     citcom_finalize(E, 0);
   }
 
@@ -223,17 +220,15 @@
 
     if(E->control.tracer==1)
       tracer_advection(E);
-
     general_stokes_solver(E);
+
     if(E->output.write_q_files)
       if ((E->monitor.solution_cycles % E->output.write_q_files)==0)
 	heat_flux(E);
-
     if ((E->monitor.solution_cycles % E->control.record_every)==0) {
 	(E->problem_output)(E, E->monitor.solution_cycles);
     }
 
-
     /* information about simulation time and wall clock time */
     output_time(E, E->monitor.solution_cycles);
 
@@ -277,7 +272,6 @@
   }
 
 
-
   /* this section prints time accounting;
    * no counterpart in pyre */
   if (E->parallel.me == 0)  {
@@ -289,9 +283,7 @@
     fprintf(E->fp,"Average cpu time taken for velocity step = %f\n",
 	    cpu_time_on_vp_it/((float)(E->monitor.solution_cycles-E->control.restart)));
   }
-
   citcom_finalize(E, 0);
-
   return(0);
 
 }

Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2009-04-09 15:59:17 UTC (rev 14646)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2009-04-09 20:37:59 UTC (rev 14647)
@@ -1705,22 +1705,17 @@
   char message[255],files[255];
   if (E->fp)
     fclose(E->fp);
-
   if (E->fptime)
     fclose(E->fptime);
-
   if (E->fp_out)
     fclose(E->fp_out);
-
   if (E->trace.fpt)
     fclose(E->trace.fpt);
-
   if(E->output.fpqt)
     fclose(E->output.fpqt);
   if(E->output.fpqb)
     fclose(E->output.fpqb);
 
-
 #ifdef USE_GZDIR
   /*
      remove VTK geo file in case we used that for IO
@@ -1733,7 +1728,8 @@
       remove(files);
       if(E->parallel.me == 0){
 	/* close the log */
-	fclose(E->output.gzdir.vtk_fp);
+	if(E->output.gzdir.vtk_fp)
+	  fclose(E->output.gzdir.vtk_fp);
       }
     }
   }

Modified: mc/3D/CitcomS/trunk/lib/Output.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Output.c	2009-04-09 15:59:17 UTC (rev 14646)
+++ mc/3D/CitcomS/trunk/lib/Output.c	2009-04-09 20:37:59 UTC (rev 14647)
@@ -108,7 +108,7 @@
 
   output_surf_botm(E, cycles);
 
-
+  if(E->parallel.me == 0)fprintf(stderr,"hello\n");
   /* optional output below */
 
   /* compute and output geoid (in spherical harmonics coeff) */
@@ -140,7 +140,7 @@
 
   if(E->output.heating && E->control.disptn_number != 0)
       output_heating(E, cycles);
-
+  if(E->parallel.me == 0)fprintf(stderr,"good bye\n");
   return;
 }