Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor rocoto task XML creation #2189

Merged
merged 11 commits into from
Jan 8, 2024
Merged

Refactor rocoto task XML creation #2189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b009106
Refactor rocot task XML creation
WalterKolczynski-NOAA Dec 22, 2023
685de59
Add missing loop variables to task names
WalterKolczynski-NOAA Dec 23, 2023
3be6c2f
Fix envars in new task definitions
WalterKolczynski-NOAA Dec 23, 2023
8b8594b
Fix typo in gempak meta jjob header call
WalterKolczynski-NOAA Dec 23, 2023
5cb3cf3
Fix a couple minor errors in new task dicts
WalterKolczynski-NOAA Dec 23, 2023
f16502c
Remove global-specific variable from rocoto.py
WalterKolczynski-NOAA Jan 5, 2024
3225bce
Merge branch 'develop' into feature/ens_atmos_prod
WalterKolczynski-NOAA Jan 5, 2024
d95c718
Define rotdir as Task field
WalterKolczynski-NOAA Jan 5, 2024
c2189a8
Remove missed entity
WalterKolczynski-NOAA Jan 6, 2024
80a6545
Fix GEFS dependencies
WalterKolczynski-NOAA Jan 6, 2024
2c44986
Fix missing # for ecen task
WalterKolczynski-NOAA Jan 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jobs/JGFS_ATMOS_GEMPAK_META
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# GFS GEMPAK META PRODUCT GENERATION
############################################
source "${HOMEgfs}/ush/preamble.sh"
source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak_meta" -e "base"
source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak_meta" -c "base"


###############################################
Expand Down
71 changes: 61 additions & 10 deletions workflow/rocoto/gefs_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from applications.applications import AppConfig
from rocoto.tasks import Tasks, create_wf_task
from rocoto.tasks import Tasks
import rocoto.rocoto as rocoto


Expand Down Expand Up @@ -57,41 +57,74 @@ def stage_ic(self):
dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)

resources = self.get_resource('stage_ic')
task = create_wf_task('stage_ic', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies)
task_name = f'stage_ic'
task_dict = {'task_name': task_name,
'resources': resources,
'dependency': dependencies,
'envars': self.envars,
'cycledef': 'gefs',
'command': f'{self.HOMEgfs}/jobs/rocoto/stage_ic.sh',
'job_name': f'{self.pslot}_{task_name}_@H',
'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
'maxtries': '&MAXTRIES;'
}
task = rocoto.create_task(task_dict)

return task

def waveinit(self):

resources = self.get_resource('waveinit')
task = create_wf_task('waveinit', resources, cdump=self.cdump, envar=self.envars, dependency=None)
task_name = f'waveinit'
task_dict = {'task_name': task_name,
'resources': resources,
'envars': self.envars,
'cycledef': 'gefs',
'command': f'{self.HOMEgfs}/jobs/rocoto/waveinit.sh',
'job_name': f'{self.pslot}_{task_name}_@H',
'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
'maxtries': '&MAXTRIES;'
}
task = rocoto.create_task(task_dict)

return task

def fcst(self):

# TODO: Add real dependencies
dependencies = []
dep_dict = {'type': 'task', 'name': f'{self.cdump}stage_ic'}
dep_dict = {'type': 'task', 'name': f'stage_ic'}
dependencies.append(rocoto.add_dependency(dep_dict))

if self.app_config.do_wave:
dep_dict = {'type': 'task', 'name': f'{self.cdump}waveinit'}
dep_dict = {'type': 'task', 'name': f'waveinit'}
dependencies.append(rocoto.add_dependency(dep_dict))

dependencies = rocoto.create_dependency(dep_condition='and', dep=dependencies)

resources = self.get_resource('fcst')
task = create_wf_task('fcst', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies)
task_name = f'fcst'
task_dict = {'task_name': task_name,
'resources': resources,
'dependency': dependencies,
'envars': self.envars,
'cycledef': 'gefs',
'command': f'{self.HOMEgfs}/jobs/rocoto/fcst.sh',
'job_name': f'{self.pslot}_{task_name}_@H',
'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
'maxtries': '&MAXTRIES;'
}
task = rocoto.create_task(task_dict)

return task

def efcs(self):
dependencies = []
dep_dict = {'type': 'task', 'name': f'{self.cdump}stage_ic'}
dep_dict = {'type': 'task', 'name': f'stage_ic'}
dependencies.append(rocoto.add_dependency(dep_dict))

if self.app_config.do_wave:
dep_dict = {'type': 'task', 'name': f'{self.cdump}waveinit'}
dep_dict = {'type': 'task', 'name': f'waveinit'}
dependencies.append(rocoto.add_dependency(dep_dict))

dependencies = rocoto.create_dependency(dep_condition='and', dep=dependencies)
Expand All @@ -100,9 +133,27 @@ def efcs(self):
efcsenvars.append(rocoto.create_envar(name='ENSGRP', value='#grp#'))

groups = self._get_hybgroups(self._base['NMEM_ENS'], self._configs['efcs']['NMEM_EFCSGRP'])
var_dict = {'grp': groups}

resources = self.get_resource('efcs')
task = create_wf_task('efcs', resources, cdump=self.cdump, envar=efcsenvars, dependency=dependencies,
metatask='efmn', varname='grp', varval=groups, cycledef='gefs')

task_name = f'efcs#grp#'
task_dict = {'task_name': task_name,
'resources': resources,
'dependency': dependencies,
'envars': efcsenvars,
'cycledef': 'gefs',
'command': f'{self.HOMEgfs}/jobs/rocoto/efcs.sh',
'job_name': f'{self.pslot}_{task_name}_@H',
'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
'maxtries': '&MAXTRIES;'
}

metatask_dict = {'task_name': 'efmn',
'var_dict': var_dict,
'task_dict': task_dict
}

task = rocoto.create_task(metatask_dict)

return task
Loading