From 69f7370cde0ded0c3713a4181bdc1106c413c960 Mon Sep 17 00:00:00 2001 From: tradke Date: Mon, 10 Feb 2003 15:03:55 +0000 Subject: Only schedule filereader routine if both filereader_ID_files and filereader_ID_vars are set to a non-empty string. This closes PR Cactus/1394. git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOUtil/trunk@185 b32723a9-ab3a-4a60-88e2-2e5d99d7c17a --- param.ccl | 6 ++++-- schedule.ccl | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/param.ccl b/param.ccl index a22931d..4febced 100644 --- a/param.ccl +++ b/param.ccl @@ -1,4 +1,4 @@ -# Parameter definitions for thorn IOUtil +# Parameter definitione for thorn IOUtil # $Header$ ############################################################################# @@ -154,7 +154,9 @@ STRING filereader_ID_files "List of files to read in as initial data" STEERABLE } "" STRING filereader_ID_vars "List of variables to read in from the given initial data files" STEERABLE = RECOVER { - ".+" :: "Space-separated list of fully qualified variable/group names" + "all" :: "Read all variables contained in the initial data files" + ".+" :: "Space-separated list of fully qualified variable/group names" + "^$" :: "An empty string for not recovering initial data" } "all" BOOLEAN recover_and_remove "Remove checkpoint file after successful recovery ?" STEERABLE = RECOVER { diff --git a/schedule.ccl b/schedule.ccl index 9c4e95b..2093c25 100644 --- a/schedule.ccl +++ b/schedule.ccl @@ -14,7 +14,7 @@ if (! CCTK_Equals (recover, "no")) } "Checkpoint recovery routine" } -if (*filereader_ID_files) +if (*filereader_ID_files && *filereader_ID_vars) { schedule IOUtil_RecoverIDFromDatafiles at CCTK_RECOVER_VARIABLES after IOUtil_RecoverGH { -- cgit v1.2.3