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

[becker at geodynamics.org]

Author: becker
Date: 2007-09-18 17:28:00 -0700 (Tue, 18 Sep 2007)
New Revision: 7988

Modified:
   mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
   mc/3D/CitcomS/trunk/lib/Output_gzdir.c
Log:
Minor bug fix in Output_gzidir, output_heating function didn't work.



Modified: mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Advection_diffusion.c	2007-09-18 23:08:06 UTC (rev 7987)
+++ mc/3D/CitcomS/trunk/lib/Advection_diffusion.c	2007-09-19 00:28:00 UTC (rev 7988)
@@ -439,9 +439,9 @@
 
     for (m=1;m<=E->sphere.caps_per_proc;m++)
       for(i=1;i<=E->lmesh.nno;i++) {
-        if(!(E->node[m][i] & (TBX | TBY | TBZ)))
+        if(!(E->node[m][i] & (TBX | TBY | TBZ))){
 	  DTdot[m][i] *= E->TMass[m][i];         /* lumped mass matrix */
-	else
+	}	else
 	  DTdot[m][i] = 0.0;         /* lumped mass matrix */
       }
 

Modified: mc/3D/CitcomS/trunk/lib/Output_gzdir.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Output_gzdir.c	2007-09-18 23:08:06 UTC (rev 7987)
+++ mc/3D/CitcomS/trunk/lib/Output_gzdir.c	2007-09-19 00:28:00 UTC (rev 7988)
@@ -1088,22 +1088,22 @@
 }
 
 
-void output_heating(struct All_variables *E, int cycles)
+void gzdir_output_heating(struct All_variables *E, int cycles)
 {
     int j, e;
     char output_file[255];
-    FILE *fp1;
+    gzFile *fp1;
 
     snprintf(output_file,255,"%s/%d/heating.%d.%d.gz", E->control.data_dir,
 	    cycles,E->parallel.me, cycles);
     fp1 = gzdir_output_open(output_file,"w");
 
-    gzfprintf(fp1,"%.5e\n",E->monitor.elapsed_time);
+    gzprintf(fp1,"%.5e\n",E->monitor.elapsed_time);
 
     for(j=1;j<=E->sphere.caps_per_proc;j++) {
-        gzfprintf(fp1,"%3d %7d\n", j, E->lmesh.nel);
+        gzprintf(fp1,"%3d %7d\n", j, E->lmesh.nel);
         for(e=1; e<=E->lmesh.nel; e++)
-            gzfprintf(fp1, "%.4e %.4e %.4e\n", E->heating_adi[j][e],
+            gzprintf(fp1, "%.4e %.4e %.4e\n", E->heating_adi[j][e],
                       E->heating_visc[j][e], E->heating_latent[j][e]);
     }
     gzclose(fp1);