[cig-commits] r19379 - mc/3D/CitcomCU/trunk/src

[becker at geodynamics.org]

Author: becker
Date: 2012-01-17 10:45:32 -0800 (Tue, 17 Jan 2012)
New Revision: 19379

Modified:
   mc/3D/CitcomCU/trunk/src/Convection.c
   mc/3D/CitcomCU/trunk/src/Process_velocity.c
   mc/3D/CitcomCU/trunk/src/global_defs.h
Log:
Suppressed output of first timestep upon restart to avoid overwriting
existing files if using same model. This should make behavior consistent
with CitcomS (and restart wasn't properly implemented outside gzdir IO anyway).



Modified: mc/3D/CitcomCU/trunk/src/Convection.c
===================================================================
--- mc/3D/CitcomCU/trunk/src/Convection.c	2012-01-17 17:40:39 UTC (rev 19378)
+++ mc/3D/CitcomCU/trunk/src/Convection.c	2012-01-17 18:45:32 UTC (rev 19379)
@@ -147,7 +147,14 @@
 
 	if(E->control.restart)
 	{
-		input_int("restart_timesteps", &(E->monitor.solution_cycles), "0", m);
+		input_int("restart_timesteps", &(E->control.restart_timesteps), "0", m); /* to
+											    save
+											    the
+											    initial
+											    restart
+											    step */
+		/* set the timestep counter to the restart timestep */
+		E->monitor.solution_cycles = E->control.restart_timesteps;
 
 		input_string("oldfile", tmp1_string, "initialize", m);
 		input_string("use_scratch", tmp_string, "local", m);

Modified: mc/3D/CitcomCU/trunk/src/Process_velocity.c
===================================================================
--- mc/3D/CitcomCU/trunk/src/Process_velocity.c	2012-01-17 17:40:39 UTC (rev 19378)
+++ mc/3D/CitcomCU/trunk/src/Process_velocity.c	2012-01-17 18:45:32 UTC (rev 19379)
@@ -59,14 +59,21 @@
 
       averages(E);
 
+      /* 
+	 suppress output of first restart timestep such that files do
+	 not get overwritten if using same directory
+      */
+      if((E->control.restart == 0) ||
+	 (E->monitor.solution_cycles !=  E->control.restart_timesteps)){
 #ifdef USE_GZDIR
-      if(E->control.gzdir)
-	output_velo_related_gzdir(E, ii);	/* also topo */
-      else
+	if(E->control.gzdir)
+	  output_velo_related_gzdir(E, ii);	/* also topo */
+	else
+	  output_velo_related(E, ii);	/* also topo */
+#else
 	output_velo_related(E, ii);	/* also topo */
-#else
-      output_velo_related(E, ii);	/* also topo */
 #endif
+      }
     }
 
   return;

Modified: mc/3D/CitcomCU/trunk/src/global_defs.h
===================================================================
--- mc/3D/CitcomCU/trunk/src/global_defs.h	2012-01-17 17:40:39 UTC (rev 19378)
+++ mc/3D/CitcomCU/trunk/src/global_defs.h	2012-01-17 18:45:32 UTC (rev 19379)
@@ -749,6 +749,7 @@
 	int DIRECT;
 	int restart;
 	int restart_frame;
+  int restart_timesteps;
 	int CONJ_GRAD;
 	int NMULTIGRID;
 	int EMULTIGRID;