Fixed a thing from my previous commit when printing the schedule tree.

Also put in Erik's patch to print group names in a schedule.
This closes PR Cactus/771.


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

1 files changed, 18 insertions, 7 deletions

diff --git a/src/main/ScheduleInterface.c b/src/main/ScheduleInterface.c
index 8e5d7218..2143d417 100644
--- a/src/main/ScheduleInterface.c
+++ b/src/main/ScheduleInterface.c
@@ -1779,11 +1779,16 @@ static int CCTKi_SchedulePrintEntry(t_attribute *attribute,
                                     t_sched_data *data)
 {
   /* prevent compiler warnings about unused parameters */
-  attribute = attribute;
   data = data;
 
   indent_level += 2;
 
+  if (attribute && attribute->type == sched_group)
+  {
+    printf("%*s %s\n", indent_level + 11, "begin group",
+           attribute->FunctionData.routine);
+  }
+
   return 1;
 }
 
@@ -1816,10 +1821,15 @@ static int CCTKi_SchedulePrintExit(t_attribute *attribute,
                                    t_sched_data *data)
 {
   /* prevent compiler warnings about unused parameters */
-  attribute = attribute;
   data = data;
 
-  indent_level -=2;
+  if (attribute && attribute->type == sched_group)
+  {
+    printf("%*s %s\n", indent_level + 2 + 9, "end group",
+           attribute->FunctionData.routine);
+  }
+
+  indent_level -= 2;
 
   return 1;
 }
@@ -1885,16 +1895,17 @@ static int CCTKi_SchedulePrintWhile(int n_whiles,
     {
       if(i > 0)
       {
-        puts(" && ");
+        printf(" && ");
       }
 
-      puts(whiles[i]);
+      printf(whiles[i]);
     }
-
-    puts(")\n");
+    printf(")\n");
+    indent_level += 2;
   }
   else
   {
+    indent_level -= 2;
     printf("%*s\n", indent_level + 9, "end while");
   }