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

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-09-27 12:33:57 -0700 (Thu, 27 Sep 2007)
New Revision: 8038

Modified:
   mc/3D/CitcomS/trunk/bin/Citcom.c
   mc/3D/CitcomS/trunk/lib/Output_gzdir.c
Log:
Added function prototype and fixed a few errors

Modified: mc/3D/CitcomS/trunk/bin/Citcom.c
===================================================================
--- mc/3D/CitcomS/trunk/bin/Citcom.c	2007-09-27 19:07:57 UTC (rev 8037)
+++ mc/3D/CitcomS/trunk/bin/Citcom.c	2007-09-27 19:33:57 UTC (rev 8038)
@@ -63,6 +63,7 @@
   void output_finalize();
   void PG_timestep_init();
   void tracer_advection();
+  void heat_flux();
 
   float dot();
   float cpu_time_on_vp_it;
@@ -170,7 +171,7 @@
 
     general_stokes_solver(E);
     if(E->output.write_q_files)
-      if ((E->monitor.solution_cycles % E->output.write_q_files)==0) 
+      if ((E->monitor.solution_cycles % E->output.write_q_files)==0)
 	heat_flux(E);
 
     if ((E->monitor.solution_cycles % E->control.record_every)==0) {

Modified: mc/3D/CitcomS/trunk/lib/Output_gzdir.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Output_gzdir.c	2007-09-27 19:07:57 UTC (rev 8037)
+++ mc/3D/CitcomS/trunk/lib/Output_gzdir.c	2007-09-27 19:33:57 UTC (rev 8038)
@@ -65,6 +65,7 @@
 #include "element_definitions.h"
 #include "global_defs.h"
 #include "parsing.h"
+#include "parallel_related.h"
 #include "output.h"
 /* Big endian crap */
 #include <string.h>
@@ -72,6 +73,7 @@
 #include <malloc.h>
 #endif
 
+
 void be_flipit(void *, void *, size_t );
 void be_flip_byte_order(void *, size_t );
 int be_is_little_endian(void);
@@ -115,7 +117,9 @@
 void gzip_file(char *);
 
 
-extern void parallel_process_termination();
+extern void temperatures_conform_bcs(struct All_variables *);
+extern void myerror(struct All_variables *,char *);
+extern void mkdatadir(const char *);
 extern void heat_flux(struct All_variables *);
 extern void get_STD_topo(struct All_variables *, float**, float**,
                          float**, float**, int);
@@ -1165,7 +1169,7 @@
       if(fscanf(fp,"%i %i",&ll,&mm) != 2)
 	myerror(E,"restart vtkl read error 1");
       for(i=1;i<=E->lmesh.nno;i++)
-	if(fscanf(fp,"%f",&(E->T[m][i]))!=1)
+	if(fscanf(fp,"%lf",&(E->T[m][i]))!=1)
 	  myerror(E,"restart vtkl read error 2");
     }
     break;
@@ -1223,7 +1227,7 @@
       /* open unzipped file for read */
       *in = fopen(name,"r");
       if(*in == NULL)
-	myerror("open_file_zipped: unzipping error",E);
+          myerror(E,"open_file_zipped: unzipping error");
       return 1;
     }else{
       /*