Update schedule so that the termination parameters can be steered

git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/TerminationTrigger/trunk@9 ec5ace1c-6809-4267-9cad-ed2f0ecfe59c

1 files changed, 28 insertions, 30 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 88f3c60..6355fbf 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,38 +1,36 @@
 # Schedule definitions for thorn TerminationTrigger
 
-if (on_remaining_walltime > 0)
+STORAGE: watchminutes
+
+
+
+SCHEDULE TerminationTrigger_StartTimer AT wragh
 {
-  STORAGE: watchminutes
-  
-  SCHEDULE TerminationTrigger_StartTimer AT wragh
-  {
-    LANG: C
-  } "Start timer"
-  
-  SCHEDULE TerminationTrigger_ResetMinutes AT post_recover_variables
-  {
-    LANG: C
-    OPTIONS: global
-  } "Reset Watchtime"
-  
-  SCHEDULE TerminationTrigger_CheckWalltime AT analysis
-  {
-    LANG: C
-  } "Check elapsed job walltime"
-}
+  LANG: C
+} "Start timer"
 
-if (termination_from_file)
+SCHEDULE TerminationTrigger_ResetMinutes AT post_recover_variables
 {
-  if (create_termination_file)
-  {
-    SCHEDULE TerminationTrigger_CreateFile AT wragh
-    {
-      LANG: C
-    } "Create termination file"
-  }
-  
-  SCHEDULE TerminationTrigger_CheckFile AT analysis
+  LANG: C
+  OPTIONS: global
+} "Reset Watchtime"
+
+SCHEDULE TerminationTrigger_CheckWalltime AT analysis
+{
+  LANG: C
+} "Check elapsed job walltime"
+
+
+
+if (create_termination_file)
+{
+  SCHEDULE TerminationTrigger_CreateFile AT wragh
   {
     LANG: C
-  } "Check termination file"
+  } "Create termination file"
 }
+
+SCHEDULE TerminationTrigger_CheckFile AT analysis
+{
+  LANG: C
+} "Check termination file"