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

[tan2 at geodynamics.org]

Author: tan2
Date: 2006-08-01 17:17:49 -0700 (Tue, 01 Aug 2006)
New Revision: 4201

Modified:
   mc/3D/CitcomS/trunk/lib/Instructions.c
   mc/3D/CitcomS/trunk/lib/Output_h5.c
Log:
Open and close HDF5 output properly


Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2006-08-01 23:25:05 UTC (rev 4200)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2006-08-02 00:17:49 UTC (rev 4201)
@@ -986,11 +986,15 @@
 
 void output_finalize(struct  All_variables *E)
 {
+  void h5output_close(struct  All_variables *E);
+
   fclose(E->fp);
 
   if (E->fptime)
     fclose(E->fptime);
 
   // close HDF5 output
+  if (strcmp(E->control.output_format, "hdf5") == 0)
+    h5output_close(E);
 
 }

Modified: mc/3D/CitcomS/trunk/lib/Output_h5.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Output_h5.c	2006-08-01 23:25:05 UTC (rev 4200)
+++ mc/3D/CitcomS/trunk/lib/Output_h5.c	2006-08-02 00:17:49 UTC (rev 4201)
@@ -132,8 +132,11 @@
 
 void h5output(struct All_variables *E, int cycles)
 {
+    void h5output_open(struct  All_variables *E);
+    
     printf("h5output()\n");
     if (cycles == 0) {
+        h5output_open(E);
         h5output_coord(E);
         h5output_material(E);
     }