[cig-commits] r6733 - mc/3D/CitcomS/branches/compressible/lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-04-30 16:22:15 -0700 (Mon, 30 Apr 2007)
New Revision: 6733

Modified:
   mc/3D/CitcomS/branches/compressible/lib/Instructions.c
Log:
Expand datadir_old when post_processing=on or tic_method=-1

Modified: mc/3D/CitcomS/branches/compressible/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/branches/compressible/lib/Instructions.c	2007-04-30 23:19:08 UTC (rev 6732)
+++ mc/3D/CitcomS/branches/compressible/lib/Instructions.c	2007-04-30 23:22:15 UTC (rev 6733)
@@ -1102,7 +1102,8 @@
       parallel_process_termination();
   }
 
-  if (E->control.restart) {
+  if (E->control.restart || E->control.post_p ||
+      E->convection.tic_method == -1) {
       found = strchr(E->control.data_prefix_old, '/');
       if (found) {
 	  fprintf(stderr, "error in input parameter: datafile_old='%s' contains '/'\n", E->control.data_file);
@@ -1204,7 +1205,8 @@
     snprintf(E->control.data_file, 200, "%s/%s", E->control.data_dir,
 	     E->control.data_prefix);
 
-    if (E->control.restart) {
+    if (E->control.restart || E->control.post_p ||
+        E->convection.tic_method == -1) {
 	expand_datadir(E, E->control.data_dir_old);
 	snprintf(E->control.old_P_file, 200, "%s/%s", E->control.data_dir_old,
 		 E->control.data_prefix_old);