Allows scheduling in the analysis bin without any triggers. This

executes the scheduled item always.


git-svn-id: http://svn.cactuscode.org/flesh/trunk@3552 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 2 insertions, 14 deletions

diff --git a/src/main/ScheduleInterface.c b/src/main/ScheduleInterface.c
index 64dfd821..1e5d4432 100644
--- a/src/main/ScheduleInterface.c
+++ b/src/main/ScheduleInterface.c
@@ -84,7 +84,6 @@ typedef struct
   cTimerData *total_time;
   int print_headers;
   int synchronised;
-  int trigger_level;
 
   /* Stuff passed in in user calls */
 
@@ -1143,7 +1142,6 @@ static int ScheduleTraverse(const char *where,
   data.CallFunction = CallFunction ? CallFunction : CCTK_CallFunction;
   data.schedpoint = CCTK_Equals(where, "CCTK_ANALYSIS") ?
                     schedpoint_analysis : schedpoint_misc;
-  data.trigger_level = 0;
   calling_function = CCTKi_ScheduleCallFunction;
 
   CCTKi_DoScheduleTraverse(where,
@@ -2096,22 +2094,17 @@ static int CCTKi_ScheduleCallEntry(t_attribute *attribute,
 
   if(attribute)
   {
-    go = 0;
-
     if(data->schedpoint == schedpoint_analysis)
     {
       /* In analysis, so check triggers */
-      if(data->trigger_level && attribute->FunctionData.n_TriggerGroups == 0)
+      if(attribute->FunctionData.n_TriggerGroups == 0)
       {
-        /* Has already been triggered by a higher level group
-         * and there are no triggers on this group.
-         */
-        data->trigger_level++;
         go = 1;
       }
       else
       {
         /* Check if it is now being triggered */
+        go = 0;
         for (i = 0; i < attribute->FunctionData.n_TriggerGroups ; i++)
         {
           indx = CCTK_FirstVarIndexI(attribute->FunctionData.TriggerGroups[i]);
@@ -2121,10 +2114,6 @@ static int CCTKi_ScheduleCallEntry(t_attribute *attribute,
             go = go || CCTKi_TriggerSaysGo(data->GH, indx);
           }
         }
-        if(go)
-        {
-          data->trigger_level = 1;
-        }
       }
     }
     else
@@ -2227,7 +2216,6 @@ static int CCTKi_ScheduleCallExit(t_attribute *attribute,
           CCTKi_TriggerAction(data->GH, vindex);
         }
       }
-      data->trigger_level--;
     }
 
     /* Switch off communication if it was done in entry. */