summaryrefslogtreecommitdiff
path: root/lib/sbin/ScheduleParser.pl
diff options
context:
space:
mode:
authorallen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac>2002-12-30 18:58:38 +0000
committerallen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac>2002-12-30 18:58:38 +0000
commitf35221be95a43bfcc5b46e901b5cc4907eaa655b (patch)
treed0cb8047e4e22ec31bb07ac03fb06488a9ab9b75 /lib/sbin/ScheduleParser.pl
parent1e7cc07cbe0d7a1d9d97fe50cc1e53807491a2c8 (diff)
Improve error messages
Fixed Cactus/1353 git-svn-id: http://svn.cactuscode.org/flesh/trunk@3057 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/sbin/ScheduleParser.pl')
-rw-r--r--lib/sbin/ScheduleParser.pl9
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.