New schedule stuff.

IMPORTANT:  if you don't have a src/schedule directory, please
do an "update -d"  or your code won't compile!

You can now create schedule groups and schedule items  (other groups
or functions) IN a group.  You may then schedule a group AT a
particular CCTK entry point, or inside another group.

There is a new keyword WHILE in the schedule specification.  The
argument(s) to this are the full names of integer scalars, and the
item which is scheduled WHILE will be executed while this integer, or
these integers, are non-zero.  Note that currently there is little
checking of the type of these scalars, 'though this will be coming
soon.

BEFORE, AFTER, or WHILE can take a list of arguments of the form
(a,b,c) to stop you having to do something like

BEFORE a BEFORE b BEFORE c

So the full format of a schedule statement is

SCHEDULE [GROUP] <name> <AT entrypoint | IN group> [BEFORE|AFTER <item | (item...)>] [WHILE <integer gridscalar>]
{
[LANG: <language>]
[COMM: <group(s)>]
[STORAGE: <groups(s)]
[TRIGGERS: <groups(s)]
} "<description>"

Note that even for a group you need to provide
{
} "<description>"

'though that may be relaxed soon.

Also TRIGGERS are now on a group basis, not on a variable basis.

So, for example, to test this I had

--------------------------------------

SCHEDULE TEST1_InitialData AT INITIAL
{
  LANG: Fortran
} "Initialise"

SCHEDULE TEST1_InitialData AT EVOL
{
  LANG: Fortran
} "Initialise"

SCHEDULE TEST1_Evolve IN testit
{
  LANG: Fortran
} "Evolution routine"

SCHEDULE GROUP testit WHILE test1::foo_int_scalar AT EVOL AFTER TEST1_InitialData
{
} "Test a group within a group. "

---------------------------------------

where the initialisation routine set test1::foo_int_scalar to 4 and
the evolution routine decremented it.  The group "testit" is redundant here
as only one thing is scheduled in it, the WHILE and AFTER could have gone
directly onto the scheduling of TEST1_Evolve.


Apart from the checking of the while stuff, the perl does a fair amount of
checking that groups exist.  It doesn't yet check that a group you
are scheduling at or in exists, and neither does the C, so please check the
screen output of the final schedule tree.  Checks for this an for
unreachable groups will go in, but perhaps not in the next week.

There's also some tidying up which needs to go in, but this stuff
passes all the tests that the unmodified code does.

I have also tried to make the output of the CST a bit more useful, 'though
now it's a wee bit long-winded.

Please send me comments if you want more output of various things, or would
like the current output, or how the WHILE stuff works, changed.


Tom


IMPORTANT:  if you don't have a src/schedule directory, please
do an "update -d"  or your code won't compile!


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

1 files changed, 92 insertions, 0 deletions

diff --git a/lib/sbin/CSTUtils.pl b/lib/sbin/CSTUtils.pl
index 743186ad..e56a85e0 100644
--- a/lib/sbin/CSTUtils.pl
+++ b/lib/sbin/CSTUtils.pl
@@ -43,5 +43,97 @@ sub CST_error
 }
 
 
+
+#/*@@
+#  @routine    read_file
+#  @date       Wed Sep 16 11:54:38 1998
+#  @author     Tom Goodale
+#  @desc 
+#  Reads a file deleting comments and blank lines. 
+#  @enddesc 
+#  @calls     
+#  @calledby   
+#  @history 
+#  @hdate Fri Sep 10 10:25:47 1999 @hauthor Tom Goodale
+#  @hdesc Allows a \ to escape the end of a line. 
+#  @endhistory 
+#@@*/
+
+sub read_file
+{
+  local($file) = @_;
+  local(@indata);
+  local($line);
+
+  open(IN, "<$file") || die("Can't open $file\n");
+  
+  $line = "";
+
+  while(<IN>)
+  {
+    $_ =~ s/\#.*//;
+    
+    next if(m/^\s+$/);
+ 
+    &chompme($_);
+
+    # Add to the currently processed line.
+    $line .= $_;
+
+    # Check the line for line-continuation
+    if(m:[^\\]\\$:)
+    {
+      $line =~ s:\\$::;
+    }
+    else
+    {
+      push(@indata, $line);
+      $line = "";
+    }
+  }
+  
+  # Make sure to dump out the last line, even if it ends in a \
+  if($line ne "")
+  {
+    push(@indata, $line);
+  }
+  close IN;
+  
+  return @indata;
+}
+
+
+#/*@@
+#  @routine    chompme
+#  @date       Mon 26th April 1999
+#  @author     Gabrielle Allen
+#  @desc 
+#  Implements a version of the perl5 chomp function,
+#  returning the string passed in with the last character
+#  removed unless it is a newline
+#  @enddesc 
+#  @calls     
+#  @calledby   
+#  @history 
+# 
+#  @endhistory 
+#@@*/
+
+sub chompme
+{
+    local($in) = @_;
+
+    $lastchar = chop($in);
+    if ($lastchar == "\n")
+    {
+	return $_;
+    }
+    else
+    {
+	return $in;
+    }
+}
+
+
 1;