diff --git a/parm/archive/enkf.yaml.j2 b/parm/archive/enkf.yaml.j2 index a95046d4d6..89fd44500b 100644 --- a/parm/archive/enkf.yaml.j2 +++ b/parm/archive/enkf.yaml.j2 @@ -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 %} diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources index afc5939fcd..5a848674a8 100644 --- a/parm/config/gfs/config.resources +++ b/parm/config/gfs/config.resources @@ -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" ;; diff --git a/sorc/verif-global.fd b/sorc/verif-global.fd index 92904d2c43..e7e6bc4358 160000 --- a/sorc/verif-global.fd +++ b/sorc/verif-global.fd @@ -1 +1 @@ -Subproject commit 92904d2c431969345968f74e676717057ec0042a +Subproject commit e7e6bc43584e0b8911819b8f875cc8ee747db76d diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py index 89da933d00..ed15297acf 100644 --- a/workflow/rocoto/gfs_tasks.py +++ b/workflow/rocoto/gfs_tasks.py @@ -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 @@ -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')