diff options
Diffstat (limited to 'lib/sbin/ScheduleParser.pl')
-rw-r--r-- | lib/sbin/ScheduleParser.pl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/sbin/ScheduleParser.pl b/lib/sbin/ScheduleParser.pl index 07caac6e..652736e4 100644 --- a/lib/sbin/ScheduleParser.pl +++ b/lib/sbin/ScheduleParser.pl @@ -232,7 +232,7 @@ sub ParseScheduleBlock if ($where !~ m:CCTK_(STARTUP|PARAMCHECK|BASEGRID|INITIAL|POSTINITIAL|RECOVER_VARIABLES|POST_RECOVER_VARIABLES|RECOVER_PARAMETERS|CHECKPOINT|CPINITIAL|PRESTEP|EVOL|POSTSTEP|ANALYSIS|TERMINATE|SHUTDOWN):) { &CST_error(0,"Schedule bin \'$where\' not recognised in schedule.ccl " . - "file of thorn $thorn","",__LINE__,__FILE__); + "file of thorn $arrangement/$thorn","",__LINE__,__FILE__); } $field+=2; } @@ -426,7 +426,8 @@ sub ParseScheduleBlock } else { - &CST_error(0,"Error parsing schedule block line '$data[$line_number]'\nUnrecognised statement","",__LINE__,__FILE__); + $data[$line_number] =~ /^(.*)\n+/; + &CST_error(0,"Unrecognised statement in schedule block ($name) in schedule.ccl for thorn $thorn/$arrangement\n\"$1\"","",__LINE__,__FILE__); } } } @@ -436,8 +437,8 @@ sub ParseScheduleBlock } else { - &CST_error(0,"Error: Missing description at end of schedule block", - "",__LINE__,__FILE__); + $message = "Missing desciption at end of schedule block ($name) in schedule.ccl for thorn $thorn/$arrangement"; + &CST_error(0,$message,"",__LINE__,__FILE__); } # Turn the arrays into strings. |