Skip to content

Commit

Permalink
Issue #94 - fix dependencies with in the path
Browse files Browse the repository at this point in the history
  • Loading branch information
@KateFriedman-NOAA
KateFriedman-NOAA committed Jul 10, 2020
1 parent 866c4c4 commit 663542e
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
34 changes: 17 additions & 17 deletions ush/rocoto/setup_workflow.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):

# analcalc
deps = []
data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loginc.txt' % (cdump, cdump)
data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loginc.txt' % (cdump, cdump)
dep_dict = {'type': 'data', 'data': data}
deps.append(rocoto.add_dependency(dep_dict))
dep_dict = {'type': 'task', 'name': '%sanal' % cdump}
Expand All @@ -486,7 +486,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
# analdiag
if cdump in ['gdas']:
deps = []
data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loginc.txt' % (cdump, cdump)
data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loginc.txt' % (cdump, cdump)
dep_dict = {'type': 'data', 'data': data}
deps.append(rocoto.add_dependency(dep_dict))
dep_dict = {'type': 'task', 'name': '%sanal' % cdump}
Expand All @@ -499,7 +499,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
# gldas
if cdump in ['gdas'] and do_gldas in ['Y', 'YES']:
deps = []
data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loginc.txt' % (cdump, cdump)
data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loginc.txt' % (cdump, cdump)
dep_dict = {'type': 'data', 'data': data}
deps.append(rocoto.add_dependency(dep_dict))
dep_dict = {'type': 'task', 'name': '%sanal' % cdump}
Expand All @@ -511,7 +511,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):

# fcst
deps = []
#data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loginc.txt' % (cdump, cdump)
#data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loginc.txt' % (cdump, cdump)
#dep_dict = {'type': 'data', 'data': data}
# #deps.append(rocoto.add_dependency(dep_dict))
if do_wave in ['Y', 'YES'] and cdump in cdumps:
Expand All @@ -537,7 +537,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):

# post
deps = []
data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.log#dep#.txt' % (cdump, cdump)
data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.log#dep#.txt' % (cdump, cdump)
dep_dict = {'type': 'data', 'data': data}
deps.append(rocoto.add_dependency(dep_dict))
dep_dict = {'type': 'task', 'name': '%sfcst' % cdump}
Expand All @@ -558,13 +558,13 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
# wavepostsbs
if do_wave in ['Y', 'YES'] and cdump in cdumps:
deps = []
data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.gnh_10m.@Y@m@d.@H0000' % (cdump,cdump)
data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.gnh_10m.@Y@m@d.@H0000' % (cdump,cdump)
dep_dict = {'type': 'data', 'data': data}
deps.append(rocoto.add_dependency(dep_dict))
data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.aoc_9km.@Y@m@d.@H0000' % (cdump,cdump)
data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.aoc_9km.@Y@m@d.@H0000' % (cdump,cdump)
dep_dict = {'type': 'data', 'data': data}
deps.append(rocoto.add_dependency(dep_dict))
data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.gsh_15m.@Y@m@d.@H0000' % (cdump,cdump)
data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.gsh_15m.@Y@m@d.@H0000' % (cdump,cdump)
dep_dict = {'type': 'data', 'data': data}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
Expand All @@ -574,13 +574,13 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
# wavegempaksbs
#if do_wave in ['Y', 'YES'] and do_gempak in ['Y', 'YES'] and cdump in ['gfs']:
# deps = []
# data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.gnh_10m.f000.grib2' % (cdump,cdump)
# data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.gnh_10m.f000.grib2' % (cdump,cdump)
# dep_dict = {'type': 'data', 'data': data}
# deps.append(rocoto.add_dependency(dep_dict))
# data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.aoc_9km.f000.grib2' % (cdump,cdump)
# data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.aoc_9km.f000.grib2' % (cdump,cdump)
# dep_dict = {'type': 'data', 'data': data}
# deps.append(rocoto.add_dependency(dep_dict))
# data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.gsh_15m.f000.grib2' % (cdump,cdump)
# data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.gsh_15m.f000.grib2' % (cdump,cdump)
# dep_dict = {'type': 'data', 'data': data}
# deps.append(rocoto.add_dependency(dep_dict))
# dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
Expand All @@ -590,13 +590,13 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
# waveawipssbs
#if do_wave in ['Y', 'YES'] and do_awips in ['Y', 'YES'] and cdump in ['gfs']:
# deps = []
# data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.gnh_10m.f000.grib2' % (cdump,cdump)
# data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.gnh_10m.f000.grib2' % (cdump,cdump)
# dep_dict = {'type': 'data', 'data': data}
# deps.append(rocoto.add_dependency(dep_dict))
# data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.aoc_9km.f000.grib2' % (cdump,cdump)
# data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.aoc_9km.f000.grib2' % (cdump,cdump)
# dep_dict = {'type': 'data', 'data': data}
# deps.append(rocoto.add_dependency(dep_dict))
# data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.gsh_15m.f000.grib2' % (cdump,cdump)
# data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.gsh_15m.f000.grib2' % (cdump,cdump)
# dep_dict = {'type': 'data', 'data': data}
# deps.append(rocoto.add_dependency(dep_dict))
# dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
Expand Down Expand Up @@ -670,7 +670,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
# awips
if cdump in ['gfs'] and do_awips in ['Y', 'YES']:
deps = []
data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.sfluxgrb#dep#.grib2.idx' % (cdump, cdump)
data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.sfluxgrb#dep#.grib2.idx' % (cdump, cdump)
dep_dict = {'type': 'data', 'data': data}
deps.append(rocoto.add_dependency(dep_dict))
dep_dict = {'type': 'metatask', 'name': '%spost' % cdump}
Expand Down Expand Up @@ -818,7 +818,7 @@ def get_hyb_tasks(dict_configs, cycledef='enkf'):

# ecmn, ecen
deps1 = []
data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loganl.txt' % (cdump, cdump)
data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loganl.txt' % (cdump, cdump)
dep_dict = {'type': 'data', 'data': data}
deps1.append(rocoto.add_dependency(dep_dict))
dep_dict = {'type': 'task', 'name': '%sanalcalc' % cdump}
Expand All @@ -844,7 +844,7 @@ def get_hyb_tasks(dict_configs, cycledef='enkf'):

# esfc
deps1 = []
data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loganl.txt' % (cdump, cdump)
data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loganl.txt' % (cdump, cdump)
dep_dict = {'type': 'data', 'data': data}
deps1.append(rocoto.add_dependency(dep_dict))
dep_dict = {'type': 'task', 'name': '%sanalcalc' % cdump}
Expand Down
20 changes: 10 additions & 10 deletions ush/rocoto/setup_workflow_fcstonly.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ def get_workflow(dict_configs, cdump='gdas'):

# post
deps = []
data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.log#dep#.txt' % (cdump, cdump)
data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.log#dep#.txt' % (cdump, cdump)
dep_dict = {'type': 'data', 'data': data}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep=deps)
Expand All @@ -346,13 +346,13 @@ def get_workflow(dict_configs, cdump='gdas'):
# wavepostsbs
if do_wave in ['Y', 'YES']:
deps = []
data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.gnh_10m.@Y@m@d.@H0000' % (cdump,cdump)
data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.gnh_10m.@Y@m@d.@H0000' % (cdump,cdump)
dep_dict = {'type': 'data', 'data': data}
deps.append(rocoto.add_dependency(dep_dict))
data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.aoc_9km.@Y@m@d.@H0000' % (cdump,cdump)
data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.aoc_9km.@Y@m@d.@H0000' % (cdump,cdump)
dep_dict = {'type': 'data', 'data': data}
deps.append(rocoto.add_dependency(dep_dict))
data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.gsh_15m.@Y@m@d.@H0000' % (cdump,cdump)
data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.gsh_15m.@Y@m@d.@H0000' % (cdump,cdump)
dep_dict = {'type': 'data', 'data': data}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep=deps)
Expand Down Expand Up @@ -395,13 +395,13 @@ def get_workflow(dict_configs, cdump='gdas'):
# wavegempaksbs
#if do_wave in ['Y', 'YES'] and do_gempak in ['Y', 'YES']:
# deps = []
# data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.gnh_10m.f000.grib2'
# data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.gnh_10m.f000.grib2'
# dep_dict = {'type': 'data', 'data': data}
# deps.append(rocoto.add_dependency(dep_dict))
# data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.aoc_9km.f000.grib2'
# data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.aoc_9km.f000.grib2'
# dep_dict = {'type': 'data', 'data': data}
# deps.append(rocoto.add_dependency(dep_dict))
# data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.gsh_15m.f000.grib2'
# data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.gsh_15m.f000.grib2'
# dep_dict = {'type': 'data', 'data': data}
# deps.append(rocoto.add_dependency(dep_dict))
# dependencies = rocoto.create_dependency(dep=deps)
Expand All @@ -412,13 +412,13 @@ def get_workflow(dict_configs, cdump='gdas'):
# waveawipssbs
#if do_wave in ['Y', 'YES'] and do_awips in ['Y', 'YES']:
# deps = []
# data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.gnh_10m.f000.grib2'
# data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.gnh_10m.f000.grib2'
# dep_dict = {'type': 'data', 'data': data}
# deps.append(rocoto.add_dependency(dep_dict))
# data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.aoc_9km.f000.grib2'
# data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.aoc_9km.f000.grib2'
# dep_dict = {'type': 'data', 'data': data}
# deps.append(rocoto.add_dependency(dep_dict))
# data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.gsh_15m.f000.grib2'
# data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.gsh_15m.f000.grib2'
# dep_dict = {'type': 'data', 'data': data}
# deps.append(rocoto.add_dependency(dep_dict))
# dependencies = rocoto.create_dependency(dep=deps)
Expand Down

0 comments on commit 663542e

Please sign in to comment.