From 98a88404549e60f6b469620f62981c0833482ccc Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Mon, 24 Mar 2025 10:21:23 -0400 Subject: [PATCH 1/2] fix 3244 garbled change --- workflow/rocoto/gfs_tasks.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py index bb404566489..9c8971211e9 100644 --- a/workflow/rocoto/gfs_tasks.py +++ b/workflow/rocoto/gfs_tasks.py @@ -3217,6 +3217,8 @@ def earc_tars(self): if 'enkfgdas' in self.run: dep_dict = {'type': 'metatask', 'name': f'{self.run}_epmn'} deps.append(rocoto.add_dependency(dep_dict)) + dep_dict = {'type': 'task', 'name': f'{self.run}_echgres'} + deps.append(rocoto.add_dependency(dep_dict)) if not self.options['do_jediatmvar']: dep_dict = {'type': 'task', 'name': f'{self.run}_echgres'} deps.append(rocoto.add_dependency(dep_dict)) From 4cc66337ff9c20216cccbac327e3da91bf4cf2be Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Mon, 24 Mar 2025 11:14:37 -0400 Subject: [PATCH 2/2] use reviewer suggestion --- workflow/rocoto/gfs_tasks.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py index a3930f30eb5..a2480ed3a3a 100644 --- a/workflow/rocoto/gfs_tasks.py +++ b/workflow/rocoto/gfs_tasks.py @@ -3183,11 +3183,12 @@ def earc_vrfy(self): deps = [] if 'enkfgdas' in self.run: dep_dict = {'type': 'metatask', 'name': f'{self.run}_epmn'} + deps.append(rocoto.add_dependency(dep_dict)) + if not self.options['do_jediatmvar']: + dep_dict = {'type': 'task', 'name': f'{self.run}_echgres'} + deps.append(rocoto.add_dependency(dep_dict)) else: dep_dict = {'type': 'task', 'name': f'{self.run}_esfc'} - deps.append(rocoto.add_dependency(dep_dict)) - if not self.options['do_jediatmvar']: - dep_dict = {'type': 'task', 'name': f'{self.run}_echgres'} deps.append(rocoto.add_dependency(dep_dict)) dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) @@ -3218,8 +3219,6 @@ def earc_tars(self): if 'enkfgdas' in self.run: dep_dict = {'type': 'metatask', 'name': f'{self.run}_epmn'} deps.append(rocoto.add_dependency(dep_dict)) - dep_dict = {'type': 'task', 'name': f'{self.run}_echgres'} - deps.append(rocoto.add_dependency(dep_dict)) if not self.options['do_jediatmvar']: dep_dict = {'type': 'task', 'name': f'{self.run}_echgres'} deps.append(rocoto.add_dependency(dep_dict))