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

Enable parallel metp jobs and fix race condition with the gfscleanup job #2907

Merged
merged 10 commits into from
Sep 27, 2024
Merged

Enable parallel metp jobs and fix race condition with the gfscleanup job #2907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0e83dfe
Enable parallel metp jobs
DavidHuber-NOAA Sep 12, 2024
c65d170
Fix syntax error for eomg log files
DavidHuber-NOAA Sep 12, 2024
5d2dc1c
Add metp dependency for gfscleanup #2899
DavidHuber-NOAA Sep 13, 2024
91c0ffe
Merge remote-tracking branch 'origin/develop' into feature/parallel_metp
DavidHuber-NOAA Sep 16, 2024
8b376f5
Update workflow/rocoto/gfs_tasks.py
DavidHuber-NOAA Sep 17, 2024
9f46aca
Merge branch 'develop' into feature/parallel_metp
DavidHuber-NOAA Sep 17, 2024
dc31639
Reduce indentation
DavidHuber-NOAA Sep 17, 2024
99db592
Merge branch 'develop' into feature/parallel_metp
DavidHuber-NOAA Sep 18, 2024
a397791
Merge branch 'develop' into feature/parallel_metp
DavidHuber-NOAA Sep 20, 2024
fde2acb
Merge branch 'develop' into feature/parallel_metp
DavidHuber-NOAA Sep 23, 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 parm/archive/enkf.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ enkf:
{% else %}
{% set steps = ["eobs", "eupd"] %}
{% for mem in range(1, nmem_ens + 1) %}
{% do steps.append("eomg_mem{{ '%03d' % mem }}") %}
{% do steps.append("eomg_mem" ~ '%03d' % mem) %}
{% endfor %}
{% endif %}
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions parm/config/gfs/config.resources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,8 +987,8 @@ case ${step} in
threads_per_task=1
walltime_gdas="03:00:00"
walltime_gfs="06:00:00"
ntasks=1
tasks_per_node=1
ntasks=4
tasks_per_node=4
export memory="80G"
;;

Expand Down
2 changes: 1 addition & 1 deletion sorc/verif-global.fd
Open in desktop
Submodule verif-global.fd updated 1 files
+1 −1 ush/create_METplus_job_scripts.py
8 changes: 6 additions & 2 deletions workflow/rocoto/gfs_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,8 +855,8 @@ def fcst(self):
try:
task = fcst_map[self.app_config.mode]()
except KeyError:
raise NotImplementedError(f'{self.app_config.mode} is not a valid type.\n' +
'Currently supported forecast types are:\n' +
raise NotImplementedError(f'{self.app_config.mode} is not a valid type.\n'
f'Currently supported forecast types are:\n'
f'{" | ".join(fcst_map.keys())}')

return task
Expand Down Expand Up @@ -2330,6 +2330,10 @@ def cleanup(self):
dep_dict = {'type': 'task', 'name': f'{self.run}npoess_pgrb2_0p5deg'}
deps.append(rocoto.add_dependency(dep_dict))

if self.app_config.do_metp and self.run in ['gfs']:
dep_dict = {'type': 'metatask', 'name': f'{self.run}metp'}
deps.append(rocoto.add_dependency(dep_dict))

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

resources = self.get_resource('cleanup')
Expand Down
Loading