Moved the DECLARE_CCTK_PARAMETERS macro after a call to IOUtil_FixRecoveryParameters() so that the new parameter settings are taken.

This should fix PR CactusIO/1068.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOUtil/trunk@165 b32723a9-ab3a-4a60-88e2-2e5d99d7c17a

1 files changed, 5 insertions, 1 deletions

diff --git a/src/CheckpointRecovery.c b/src/CheckpointRecovery.c
index b343dfa..31fd0b1 100644
--- a/src/CheckpointRecovery.c
+++ b/src/CheckpointRecovery.c
@@ -515,7 +515,6 @@ int IOUtil_RecoverParameters (int (*recoverFn) (cGH *GH,
   struct dirent *file;
   filelist_t *filelist, *tmp;
 #endif
-  DECLARE_CCTK_PARAMETERS
   static int first_time_called = 1;
 
 
@@ -526,6 +525,10 @@ int IOUtil_RecoverParameters (int (*recoverFn) (cGH *GH,
     IOUtil_FixRecoveryParameters ();
     first_time_called = 0;
   }
+{
+  /* need to move this after IOUtil_FixRecoveryParameters() so that the new
+     parameter settings are taken */
+  DECLARE_CCTK_PARAMETERS
 
   if (CCTK_Equals (recover, "auto") || CCTK_Equals (recover, "autoprobe"))
   {
@@ -677,6 +680,7 @@ int IOUtil_RecoverParameters (int (*recoverFn) (cGH *GH,
     extern int IOUtil_FixParameters (void);
     IOUtil_FixParameters ();
   }
+}
 
   return (retval);
 }