diff --git a/da/platform/jet.py b/da/platform/jet.py index 8a75b9f7847e97d266c40ba0a23aa40dcdd8813f..7cca95369e2c9a65c5ee4fac0bf9fd9bb1695aee 100755 --- a/da/platform/jet.py +++ b/da/platform/jet.py @@ -16,6 +16,8 @@ import subprocess from da.baseclasses.platform import PlatForm +std_joboptions={'jobname':'test','jobaccount':'co2','jobnodes':'nserial 1','jobshell':'/bin/sh','depends':'','jobtime':'00:30:00'} + class JetPlatForm(PlatForm): def __init__(self): self.Identifier = 'NOAA jet' # the identifier gives the platform name @@ -35,13 +37,21 @@ class JetPlatForm(PlatForm): """#$ -S jobshell \n"""+ \ """#$ -cwd \n"""+ \ """#$ -r y \n"""+ \ - """#$ -j y \n"""+ \ - """\n""" + """#$ -j y \n""" + + if 'depends' in joboptions: + template += """#$ -hold_jid depends \n""" + # First replace from passed dictionary for k,v in joboptions.iteritems(): while k in template: template = template.replace(k,v) + # Fill remaining values with std_options + for k,v in std_joboptions.iteritems(): + while k in template: + template = template.replace(k,v) + return template def SubmitJob(self,jobfile):