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

[leif at geodynamics.org]

Author: leif
Date: 2009-02-12 19:46:04 -0800 (Thu, 12 Feb 2009)
New Revision: 14046

Modified:
   mc/3D/CitcomS/trunk/lib/Checkpoints.c
Log:
Fixed minor bug exposed by C-to-C++ translation (r14045).


Modified: mc/3D/CitcomS/trunk/lib/Checkpoints.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Checkpoints.c	2009-02-13 03:39:35 UTC (rev 14045)
+++ mc/3D/CitcomS/trunk/lib/Checkpoints.c	2009-02-13 03:46:04 UTC (rev 14046)
@@ -48,7 +48,7 @@
 static void read_energy_checkpoint(struct All_variables *E, FILE *fp);
 static void read_momentum_checkpoint(struct All_variables *E, FILE *fp);
 
-void myerror(char *,struct All_variables *);
+void myerror(struct All_variables *, char *);
 
 void output_checkpoint(struct All_variables *E)
 {
@@ -233,7 +233,7 @@
     tmp[0]+= fread(&(E->advection.timestep), sizeof(float), 1, fp);
     tmp[0]+= fread(&(E->control.start_age), sizeof(float), 1, fp);
     if(tmp[0] != 4)
-      myerror("read_general_checkpoint: header error",E);
+      myerror(E,"read_general_checkpoint: header error");
 
     E->advection.timesteps = E->monitor.solution_cycles;
 
@@ -432,9 +432,9 @@
      * and won't be used when read it. */
     for(m=1; m<=E->sphere.caps_per_proc; m++) {
       if(fread(E->T[m], sizeof(double), E->lmesh.nno+1, fp)!= E->lmesh.nno+1)
-	myerror("read_energy_checkpoint: error at T",E);
+	myerror(E,"read_energy_checkpoint: error at T");
       if(fread(E->Tdot[m], sizeof(double), E->lmesh.nno+1, fp)!=E->lmesh.nno+1)
-	myerror("read_energy_checkpoint: error at Tdot",E);
+	myerror(E,"read_energy_checkpoint: error at Tdot");
     }
 
     return;
@@ -480,15 +480,15 @@
 
     /* for backward compatibility */
     if(fread(junk, sizeof(float), 2, fp)!=2)
-      myerror("read_momentum_checkpoint: error at vdotv",E);
+      myerror(E,"read_momentum_checkpoint: error at vdotv");
 
     for(m=1; m<=E->sphere.caps_per_proc; m++) {
         /* Pressure at equation points */
       if(fread(E->P[m], sizeof(double), E->lmesh.npno+1, fp) !=  E->lmesh.npno+1)
-	myerror("read_momentum_checkpoint: error at P",E);
+	myerror(E,"read_momentum_checkpoint: error at P");
         /* velocity at equation points */
       if(fread(E->U[m], sizeof(double), E->lmesh.neq, fp) != E->lmesh.neq)
-	myerror("read_momentum_checkpoint: error at U",E);
+	myerror(E,"read_momentum_checkpoint: error at U");
     }
 
     E->monitor.vdotv = global_v_norm2(E, E->U);