From 26e42eaaee98eb53151f6570fea5e4e125b38cae Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 7 Jan 2025 17:11:05 -0500 Subject: [PATCH 01/14] modified gefs.py --- workflow/applications/gefs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/applications/gefs.py b/workflow/applications/gefs.py index 33545eb2ec..4d953ba189 100644 --- a/workflow/applications/gefs.py +++ b/workflow/applications/gefs.py @@ -88,10 +88,10 @@ def get_task_names(self): tasks += ['wavepostsbs'] if options['do_wave_bnd']: tasks += ['wavepostbndpnt', 'wavepostbndpntbll'] - tasks += ['wavepostpnt'] + tasks += ['wavepostpnt', 'arch'] if options['do_extractvars']: - tasks += ['extractvars', 'arch'] + tasks += ['extractvars'] tasks += ['cleanup'] From 72af87ff3779d572c7be35740bc78fe7a2346c9d Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 7 Jan 2025 17:56:18 -0500 Subject: [PATCH 02/14] modified workflow\applications\gefs.py --- workflow/applications/gefs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/applications/gefs.py b/workflow/applications/gefs.py index 4d953ba189..882353d9ca 100644 --- a/workflow/applications/gefs.py +++ b/workflow/applications/gefs.py @@ -88,11 +88,11 @@ def get_task_names(self): tasks += ['wavepostsbs'] if options['do_wave_bnd']: tasks += ['wavepostbndpnt', 'wavepostbndpntbll'] - tasks += ['wavepostpnt', 'arch'] + tasks += ['wavepostpnt'] if options['do_extractvars']: tasks += ['extractvars'] - tasks += ['cleanup'] + tasks += ['arch', 'cleanup'] return {f"{self.run}": tasks} From 8a880e28126cb13285f26d132d8636b49db51f11 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 7 Jan 2025 18:14:29 -0500 Subject: [PATCH 03/14] updated workflow\rocoto\gefs_tasks.py --- workflow/rocoto/gefs_tasks.py | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/workflow/rocoto/gefs_tasks.py b/workflow/rocoto/gefs_tasks.py index ca29bcdf1e..3fa59041b3 100644 --- a/workflow/rocoto/gefs_tasks.py +++ b/workflow/rocoto/gefs_tasks.py @@ -566,32 +566,9 @@ def arch(self): def cleanup(self): deps = [] - if self.options['do_extractvars']: - dep_dict = {'type': 'task', 'name': 'arch'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - else: - dep_dict = {'type': 'metatask', 'name': 'gefs_atmos_prod'} - deps.append(rocoto.add_dependency(dep_dict)) - dep_dict = {'type': 'metatask', 'name': 'gefs_atmos_ensstat'} - deps.append(rocoto.add_dependency(dep_dict)) - if self.options['do_ice']: - dep_dict = {'type': 'metatask', 'name': 'gefs_ice_prod'} - deps.append(rocoto.add_dependency(dep_dict)) - if self.options['do_ocean']: - dep_dict = {'type': 'metatask', 'name': 'gefs_ocean_prod'} - deps.append(rocoto.add_dependency(dep_dict)) - if self.options['do_wave']: - dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_grid'} - deps.append(rocoto.add_dependency(dep_dict)) - dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_pnt'} - deps.append(rocoto.add_dependency(dep_dict)) - if self.options['do_wave_bnd']: - dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_bndpnt'} - deps.append(rocoto.add_dependency(dep_dict)) - dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_bndpnt_bull'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps, dep_condition='and') + dep_dict = {'type': 'task', 'name': 'arch'} + deps.append(rocoto.add_dependency(dep_dict)) + dependencies = rocoto.create_dependency(dep=deps) resources = self.get_resource('cleanup') task_name = 'gefs_cleanup' From 6f47e5c34a0782c2d21d4fd3e8a61987d7e34291 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 7 Jan 2025 19:14:57 -0500 Subject: [PATCH 04/14] updated workflow\rocoto\gefs_tasks.py --- workflow/rocoto/gefs_tasks.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/workflow/rocoto/gefs_tasks.py b/workflow/rocoto/gefs_tasks.py index 3fa59041b3..e1724745d8 100644 --- a/workflow/rocoto/gefs_tasks.py +++ b/workflow/rocoto/gefs_tasks.py @@ -548,7 +548,7 @@ def arch(self): dependencies = rocoto.create_dependency(dep=deps, dep_condition='and') resources = self.get_resource('arch') - task_name = 'arch' + task_name = 'gefs_arch' task_dict = {'task_name': task_name, 'resources': resources, 'envars': self.envars, @@ -569,7 +569,6 @@ def cleanup(self): dep_dict = {'type': 'task', 'name': 'arch'} deps.append(rocoto.add_dependency(dep_dict)) dependencies = rocoto.create_dependency(dep=deps) - resources = self.get_resource('cleanup') task_name = 'gefs_cleanup' task_dict = {'task_name': task_name, From c5d5afd91362426d4733c1ccb0772ccf12725aee Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 7 Jan 2025 19:15:47 -0500 Subject: [PATCH 05/14] modified workflow\applications\gefs.py --- workflow/applications/gefs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/applications/gefs.py b/workflow/applications/gefs.py index 882353d9ca..2e08ddc21d 100644 --- a/workflow/applications/gefs.py +++ b/workflow/applications/gefs.py @@ -88,7 +88,7 @@ def get_task_names(self): tasks += ['wavepostsbs'] if options['do_wave_bnd']: tasks += ['wavepostbndpnt', 'wavepostbndpntbll'] - tasks += ['wavepostpnt'] + tasks += ['wavepostpnt'] if options['do_extractvars']: tasks += ['extractvars'] From 37fd40824c79358b1daa4c407b31ed01c7ce2081 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 7 Jan 2025 19:18:26 -0500 Subject: [PATCH 06/14] updated workflow\rocoto\gefs_tasks.py --- workflow/rocoto/gefs_tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/rocoto/gefs_tasks.py b/workflow/rocoto/gefs_tasks.py index e1724745d8..ce97f8cc90 100644 --- a/workflow/rocoto/gefs_tasks.py +++ b/workflow/rocoto/gefs_tasks.py @@ -566,7 +566,7 @@ def arch(self): def cleanup(self): deps = [] - dep_dict = {'type': 'task', 'name': 'arch'} + dep_dict = {'type': 'task', 'name': 'gefs_arch'} deps.append(rocoto.add_dependency(dep_dict)) dependencies = rocoto.create_dependency(dep=deps) resources = self.get_resource('cleanup') From e5813e365188f129c4756b54532ace60006b7f8d Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 14 Jan 2025 11:09:14 -0500 Subject: [PATCH 07/14] modify parm\archive\master_gefs.yaml.j2 --- parm/archive/master_gefs.yaml.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/parm/archive/master_gefs.yaml.j2 b/parm/archive/master_gefs.yaml.j2 index e76d7c9f7a..c3f34edbe2 100644 --- a/parm/archive/master_gefs.yaml.j2 +++ b/parm/archive/master_gefs.yaml.j2 @@ -4,12 +4,14 @@ {% set cycle_YMDH = current_cycle | to_YMDH %} datasets: +{% if DO_EXTRACTVARS%} {% filter indent(width=4) %} {% include "gefs_extracted_atmos.yaml.j2" %} {% include "gefs_extracted_ocean.yaml.j2" %} {% include "gefs_extracted_ice.yaml.j2" %} {% include "gefs_extracted_wave.yaml.j2" %} {% endfilter %} +{% endif %} # Archive the EXPDIR if requested {% if archive_expdir %} From b2b1823c975cc1fbcb9086117f451fe6ec7e1a99 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 14 Jan 2025 11:10:16 -0500 Subject: [PATCH 08/14] modified DO_EXTRACTVARS --- parm/archive/master_gefs.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/archive/master_gefs.yaml.j2 b/parm/archive/master_gefs.yaml.j2 index c3f34edbe2..41b2235369 100644 --- a/parm/archive/master_gefs.yaml.j2 +++ b/parm/archive/master_gefs.yaml.j2 @@ -4,7 +4,7 @@ {% set cycle_YMDH = current_cycle | to_YMDH %} datasets: -{% if DO_EXTRACTVARS%} +{% if DO_EXTRACTVARS %} {% filter indent(width=4) %} {% include "gefs_extracted_atmos.yaml.j2" %} {% include "gefs_extracted_ocean.yaml.j2" %} From 24813e769aed87f44c453d4aa157c17c215d97bf Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 14 Jan 2025 12:37:52 -0500 Subject: [PATCH 09/14] edited parm\archive\master_gefs.yaml.j2 --- parm/archive/master_gefs.yaml.j2 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/parm/archive/master_gefs.yaml.j2 b/parm/archive/master_gefs.yaml.j2 index 41b2235369..8580018f11 100644 --- a/parm/archive/master_gefs.yaml.j2 +++ b/parm/archive/master_gefs.yaml.j2 @@ -4,14 +4,16 @@ {% set cycle_YMDH = current_cycle | to_YMDH %} datasets: -{% if DO_EXTRACTVARS %} {% filter indent(width=4) %} - {% include "gefs_extracted_atmos.yaml.j2" %} - {% include "gefs_extracted_ocean.yaml.j2" %} - {% include "gefs_extracted_ice.yaml.j2" %} - {% include "gefs_extracted_wave.yaml.j2" %} + {% if DO_EXTRACTVARS %} + {% include "gefs_extracted_atmos.yaml.j2" %} + {% include "gefs_extracted_ocean.yaml.j2" %} + {% include "gefs_extracted_ice.yaml.j2" %} + {% include "gefs_extracted_wave.yaml.j2" %} + {% else %} + {% include "gefs_arcdir.yaml.j2" %} + {% endif %} {% endfilter %} -{% endif %} # Archive the EXPDIR if requested {% if archive_expdir %} From 6bac5c51a30fd35508b928cabd9664d9061a9768 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Wed, 15 Jan 2025 11:26:15 -0500 Subject: [PATCH 10/14] updated scripts\exglobal_archive.py --- scripts/exglobal_archive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/exglobal_archive.py b/scripts/exglobal_archive.py index df49704e06..b146ab4d6f 100755 --- a/scripts/exglobal_archive.py +++ b/scripts/exglobal_archive.py @@ -35,7 +35,7 @@ def main(): 'ARCH_GAUSSIAN_FHMAX', 'ARCH_GAUSSIAN_FHINC', 'ARCH_GAUSSIAN_FHINC', 'DOIAU', 'OCNRES', 'ICERES', 'NUM_SND_COLLECTIVES', 'FHOUT_WAV', 'FHOUT_HF_WAV', 'FHMAX_WAV', 'FHMAX_HF_WAV', 'FHMAX_WAV_GFS', - 'restart_interval_gdas', 'restart_interval_gfs', + 'restart_interval_gdas', 'restart_interval_gfs', 'DO_EXTRACTVARS', 'DO_AERO_ANL', 'DO_AERO_FCST', 'DO_CA', 'DOIBP_WAV', 'DO_JEDIOCNVAR', 'DOHYBVAR_OCN', 'NMEM_ENS', 'DO_JEDIATMVAR', 'DO_VRFY_OCEANDA', 'FHMAX_FITS', 'waveGRD', 'IAUFHRS', 'DO_FIT2OBS', 'NET', 'FHOUT_HF_GFS', 'FHMAX_HF_GFS', 'REPLAY_ICS', From ac64db2c86ddfe928bfbc15cdd88d6d1a8f16feb Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Wed, 15 Jan 2025 16:53:37 -0500 Subject: [PATCH 11/14] modified parm\archive\master_gefs.yaml.j2 --- parm/archive/master_gefs.yaml.j2 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/parm/archive/master_gefs.yaml.j2 b/parm/archive/master_gefs.yaml.j2 index 8580018f11..d8e9368a12 100644 --- a/parm/archive/master_gefs.yaml.j2 +++ b/parm/archive/master_gefs.yaml.j2 @@ -5,14 +5,14 @@ datasets: {% filter indent(width=4) %} - {% if DO_EXTRACTVARS %} - {% include "gefs_extracted_atmos.yaml.j2" %} - {% include "gefs_extracted_ocean.yaml.j2" %} - {% include "gefs_extracted_ice.yaml.j2" %} - {% include "gefs_extracted_wave.yaml.j2" %} - {% else %} - {% include "gefs_arcdir.yaml.j2" %} - {% endif %} + {% if DO_EXTRACTVARS %} + {% include "gefs_extracted_atmos.yaml.j2" %} + {% include "gefs_extracted_ocean.yaml.j2" %} + {% include "gefs_extracted_ice.yaml.j2" %} + {% include "gefs_extracted_wave.yaml.j2" %} + {% else %} + {% include "gefs_arcdir.yaml.j2" %} + {% endif %} {% endfilter %} # Archive the EXPDIR if requested From 5bef72ac85442c9bf63270607da5da07cf3baaac Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Thu, 16 Jan 2025 10:13:09 -0500 Subject: [PATCH 12/14] modified parm\archive\master_gefs.yaml.j2 --- parm/archive/master_gefs.yaml.j2 | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/parm/archive/master_gefs.yaml.j2 b/parm/archive/master_gefs.yaml.j2 index d8e9368a12..e33215a23c 100644 --- a/parm/archive/master_gefs.yaml.j2 +++ b/parm/archive/master_gefs.yaml.j2 @@ -4,17 +4,6 @@ {% set cycle_YMDH = current_cycle | to_YMDH %} datasets: -{% filter indent(width=4) %} - {% if DO_EXTRACTVARS %} - {% include "gefs_extracted_atmos.yaml.j2" %} - {% include "gefs_extracted_ocean.yaml.j2" %} - {% include "gefs_extracted_ice.yaml.j2" %} - {% include "gefs_extracted_wave.yaml.j2" %} - {% else %} - {% include "gefs_arcdir.yaml.j2" %} - {% endif %} -{% endfilter %} - # Archive the EXPDIR if requested {% if archive_expdir %} {% filter indent(width=4) %} From c73dda0c9ff26a19623150108978d9e6b34cca58 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Thu, 16 Jan 2025 10:16:19 -0500 Subject: [PATCH 13/14] modified scripts\exglobal_archive.py --- scripts/exglobal_archive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/exglobal_archive.py b/scripts/exglobal_archive.py index b146ab4d6f..df49704e06 100755 --- a/scripts/exglobal_archive.py +++ b/scripts/exglobal_archive.py @@ -35,7 +35,7 @@ def main(): 'ARCH_GAUSSIAN_FHMAX', 'ARCH_GAUSSIAN_FHINC', 'ARCH_GAUSSIAN_FHINC', 'DOIAU', 'OCNRES', 'ICERES', 'NUM_SND_COLLECTIVES', 'FHOUT_WAV', 'FHOUT_HF_WAV', 'FHMAX_WAV', 'FHMAX_HF_WAV', 'FHMAX_WAV_GFS', - 'restart_interval_gdas', 'restart_interval_gfs', 'DO_EXTRACTVARS', + 'restart_interval_gdas', 'restart_interval_gfs', 'DO_AERO_ANL', 'DO_AERO_FCST', 'DO_CA', 'DOIBP_WAV', 'DO_JEDIOCNVAR', 'DOHYBVAR_OCN', 'NMEM_ENS', 'DO_JEDIATMVAR', 'DO_VRFY_OCEANDA', 'FHMAX_FITS', 'waveGRD', 'IAUFHRS', 'DO_FIT2OBS', 'NET', 'FHOUT_HF_GFS', 'FHMAX_HF_GFS', 'REPLAY_ICS', From c1b23a608a31696cd83d893a55b805593fc43e09 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Thu, 16 Jan 2025 10:32:16 -0500 Subject: [PATCH 14/14] deleted gefs_extracted_*vars*.yaml.j2 --- parm/archive/gefs_extracted_atmos.yaml.j2 | 86 ----------------------- parm/archive/gefs_extracted_ice.yaml.j2 | 33 --------- parm/archive/gefs_extracted_ocean.yaml.j2 | 40 ----------- parm/archive/gefs_extracted_wave.yaml.j2 | 51 -------------- 4 files changed, 210 deletions(-) delete mode 100644 parm/archive/gefs_extracted_atmos.yaml.j2 delete mode 100644 parm/archive/gefs_extracted_ice.yaml.j2 delete mode 100644 parm/archive/gefs_extracted_ocean.yaml.j2 delete mode 100644 parm/archive/gefs_extracted_wave.yaml.j2 diff --git a/parm/archive/gefs_extracted_atmos.yaml.j2 b/parm/archive/gefs_extracted_atmos.yaml.j2 deleted file mode 100644 index 7ceba551bf..0000000000 --- a/parm/archive/gefs_extracted_atmos.yaml.j2 +++ /dev/null @@ -1,86 +0,0 @@ -{% set cycle_HH = current_cycle | strftime("%H") %} -{% set cycle_YMD = current_cycle | to_YMD %} -{% set cycle_YMDH = current_cycle | to_YMDH %} -{% set head = RUN + ".t" + cycle_HH + "z." %} - -gefs_atmos: - name: "GEFS_ATMOS" - target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gefs_atmos.tar" - required: -#select mem%03d and ensstat files required -{% set members = ["ensstat"] %} -{% for mem_nm in range(0, NMEM_ENS + 1) %} - {% do members.append("mem" ~ '%03d' % mem_nm ) %} -{% endfor %} - -{% if REPLAY_ICS %} - {% set ofst_hr = OFFSET_START_HOUR %} -{% else %} - {% set ofst_hr = FHMIN_GFS %} -{% endif %} - -{% for mem in members %} - {% for res in ['0p25', '0p50', '1p00'] %} - {% set tmpl_dict = ({ '${ROTDIR}':ROTDIR, - '${RUN}':RUN, - '${YMD}':cycle_YMD, - '${HH}':cycle_HH, - '${GRID}':res, - '${MEMDIR}':mem }) %} - - {% set COMIN_ATMOS_GRIB = COM_ATMOS_GRIB_GRID_TMPL | replace_tmpl(tmpl_dict) %} - -# Select pgrb and grib files to copy to the atardir - {% if path_exists(COMIN_ATMOS_GRIB) %} - {% if FHMAX_HF_GFS == 0 %} - {% for fhr in range(ofst_hr, FHMAX_GFS + FHOUT_GFS, FHOUT_GFS) %} - {% if mem=="ensstat" %} - {% set file_name = head ~ "mean.pres_." ~ res ~ ".f" ~ '%03d'|format(fhr) ~ ".grib2" %} - {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %} - - "{{ file_path | relpath(ROTDIR)}}" - {% else %} - {% set file_name = head ~ "pgrb2." ~ res ~ ".f" ~ '%03d'|format(fhr) %} - {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %} - - "{{ file_path | relpath(ROTDIR)}}" - {% set file_name = head ~ "pgrb2b." ~ res ~ ".f" ~ '%03d'|format(fhr) %} - {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %} - - "{{ file_path | relpath(ROTDIR)}}" - {% endif %} - {% endfor %} - {% else %} - {% if res == "0p25" %} - {% for fhr in range(ofst_hr, FHMAX_HF_GFS + FHOUT_HF_GFS, FHOUT_HF_GFS) %} - {% if mem=="ensstat" %} - {% set file_name = head ~ "mean.pres_." ~ res ~ ".f" ~ '%03d'|format(fhr) ~ ".grib2" %} - {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %} - - "{{ file_path | relpath(ROTDIR)}}" - {% else %} - {% set file_name = head ~ "pgrb2." ~ res ~ ".f" ~ '%03d'|format(fhr) %} - {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %} - - "{{ file_path | relpath(ROTDIR)}}" - {% set file_name = head ~ "pgrb2b." ~ res ~ ".f" ~ '%03d'|format(fhr) %} - {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %} - - "{{ file_path | relpath(ROTDIR)}}" - {% endif %} - {% endfor %} - {% endif %} - {% if res == "0p50" %} - {% for fhr in range(FHMAX_HF_GFS + FHOUT_GFS, FHMAX_GFS + FHOUT_GFS, FHOUT_GFS) %} - {% if mem=="ensstat" %} - {% set file_name = head ~ "mean.pres_." ~ res ~ ".f" ~ '%03d'|format(fhr) ~ ".grib2" %} - {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %} - - "{{ file_path | relpath(ROTDIR)}}" - {% else %} - {% set file_name = head ~ "pgrb2." ~ res ~ ".f" ~ '%03d'|format(fhr) %} - {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %} - - "{{ file_path | relpath(ROTDIR)}}" - {% set file_name = head ~ "pgrb2b." ~ res ~ ".f" ~ '%03d'|format(fhr) %} - {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %} - - "{{ file_path | relpath(ROTDIR)}}" - {% endif %} - {% endfor %} - {% endif %} - {% endif %} - {% endif %} - {% endfor %} -{% endfor %} diff --git a/parm/archive/gefs_extracted_ice.yaml.j2 b/parm/archive/gefs_extracted_ice.yaml.j2 deleted file mode 100644 index 786d502f23..0000000000 --- a/parm/archive/gefs_extracted_ice.yaml.j2 +++ /dev/null @@ -1,33 +0,0 @@ -{% set cycle_HH = current_cycle | strftime("%H") %} -{% set cycle_YMD = current_cycle | to_YMD %} -{% set cycle_YMDH = current_cycle | to_YMDH %} -{% set head = RUN + ".ice.t" + cycle_HH + "z." %} - -gefs_ice: - name: "GEFS_ICE" - target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gefs_ice.tar" - required: -#select mem%03d and ensstat files required -{% set members = [] %} -{% for mem_nm in range(0, NMEM_ENS + 1) %} - {% do members.append("mem" ~ '%03d' % mem_nm ) %} -{% endfor %} - -{% for mem in members %} - {% set tmpl_dict = ({ '${ROTDIR}':ROTDIR, - '${RUN}':RUN, - '${YMD}':cycle_YMD, - '${HH}':cycle_HH, - '${MEMDIR}':mem }) %} - - {% set COMIN_ICE_HISTORY = COM_ICE_HISTORY_TMPL | replace_tmpl(tmpl_dict) %} - -# Select netcdf files to copy to the atardir - {% if path_exists(COMIN_ICE_HISTORY) %} - {% for fhr in range(FHMIN_GFS + FHOUT_ICE_GFS, FHMAX_GFS + FHOUT_ICE_GFS, FHOUT_ICE_GFS) %} - {% set file_name = head ~ FHOUT_ICE_GFS ~ "hr_avg" ~ ".f" ~ '%03d'|format(fhr) ~ ".nc" %} - {% set file_path = COMIN_ICE_HISTORY ~ "/" ~ file_name %} - - "{{ file_path | relpath(ROTDIR)}}" - {% endfor %} - {% endif %} -{% endfor %} diff --git a/parm/archive/gefs_extracted_ocean.yaml.j2 b/parm/archive/gefs_extracted_ocean.yaml.j2 deleted file mode 100644 index e5e3b36e3b..0000000000 --- a/parm/archive/gefs_extracted_ocean.yaml.j2 +++ /dev/null @@ -1,40 +0,0 @@ -{% set cycle_HH = current_cycle | strftime("%H") %} -{% set cycle_YMD = current_cycle | to_YMD %} -{% set cycle_YMDH = current_cycle | to_YMDH %} -{% set head = RUN + ".ocean.t" + cycle_HH + "z." %} - -gefs_ocean: - name: "GEFS_OCEAN" - target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gefs_ocean.tar" - required: -#select mem%03d and ensstat files required -{% set members = [] %} -{% for mem_nm in range(0, NMEM_ENS + 1) %} - {% do members.append("mem" ~ '%03d' % mem_nm ) %} -{% endfor %} - -{% if OCNRES == "025" %} - {% set res = "1p00" %} -{% else %} - {% set res = (OCNRES|string())[0] ~ "p" ~ (OCNRES|string())[-2:] %} -{% endif %} - -{% for mem in members %} - {% set tmpl_dict = ({ '${ROTDIR}':ROTDIR, - '${RUN}':RUN, - '${YMD}':cycle_YMD, - '${HH}':cycle_HH, - '${MEMDIR}':mem }) %} - - {% set COMIN_OCEAN_NETCDF = COM_OCEAN_NETCDF_TMPL | replace_tmpl(tmpl_dict) %} - - # Select netcdf files to copy to the atardir - {% set netcdf_grid_dir = COMIN_OCEAN_NETCDF ~ "/" ~ res %} - {% if path_exists(netcdf_grid_dir) %} - {% for fhr in range(FHMIN_GFS + FHOUT_OCN_GFS, FHMAX_GFS + FHOUT_OCN_GFS, FHOUT_OCN_GFS) %} - {% set file_name = head ~ res ~ ".f" ~ '%03d'|format(fhr) ~ ".nc" %} - {% set file_path = netcdf_grid_dir ~ "/" ~ file_name %} - - "{{ file_path | relpath(ROTDIR)}}" - {% endfor %} - {% endif %} -{% endfor %} diff --git a/parm/archive/gefs_extracted_wave.yaml.j2 b/parm/archive/gefs_extracted_wave.yaml.j2 deleted file mode 100644 index e0aa07c816..0000000000 --- a/parm/archive/gefs_extracted_wave.yaml.j2 +++ /dev/null @@ -1,51 +0,0 @@ -{% set cycle_HH = current_cycle | strftime("%H") %} -{% set cycle_YMD = current_cycle | to_YMD %} -{% set cycle_YMDH = current_cycle | to_YMDH %} -{% set head = RUN + "wave.t" + cycle_HH + "z." %} - -gefs_wave: - name: "GEFS_WAVE" - target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gefs_wave.tar" - required: -{% if REPLAY_ICS %} - {% set ofst_hr = OFFSET_START_HOUR %} -{% else %} - {% set ofst_hr = FHMIN_GFS %} -{% endif %} - -{% set res = (waveGRD[-3:])[0] ~ "p" ~ (waveGRD[-3:])[-2:] %} - -#select mem%03d and ensstat files required -{% set members = [] %} -{% for mem_nm in range(0, NMEM_ENS + 1) %} - {% do members.append("mem" ~ '%03d' % mem_nm ) %} -{% endfor %} - -{% for mem in members %} - {% set tmpl_dict = ({ '${ROTDIR}':ROTDIR, - '${RUN}':RUN, - '${YMD}':cycle_YMD, - '${HH}':cycle_HH, - '${MEMDIR}':mem }) %} - - {% set COMIN_WAVE_GRID = COM_WAVE_GRID_TMPL | replace_tmpl(tmpl_dict) %} - # Select grib2 files to copy to the atardir - {% if path_exists(COMIN_WAVE_GRID) %} - {% for fhr in range(ofst_hr, FHMAX_GFS + FHOUT_WAV, FHOUT_WAV) %} - {% set file_name = head ~ "global." ~ res ~ ".f" ~ '%03d'|format(fhr) ~ ".grib2" %} - {% set file_path = COMIN_WAVE_GRID ~ "/" ~ file_name %} - - "{{ file_path | relpath(ROTDIR)}}" - {% endfor %} - {% endif %} - - {% set COMIN_WAVE_STATION = COM_WAVE_STATION_TMPL | replace_tmpl(tmpl_dict) %} - # Select station files to copy to the atardir - {% if path_exists(COMIN_WAVE_STATION) %} - {% set file_path = COMIN_WAVE_STATION ~ "/" ~ RUN ~ "wave.t" ~ cycle_HH ~ "z.spec_tar.gz" %} - - "{{ file_path | relpath(ROTDIR)}}" - {% set file_path = COMIN_WAVE_STATION ~ "/" ~ RUN ~ "wave.t" ~ cycle_HH ~ "z.cbull_tar" %} - - "{{ file_path | relpath(ROTDIR)}}" - {% set file_path = COMIN_WAVE_STATION ~ "/" ~ RUN ~ "wave.t" ~ cycle_HH ~ "z.bull_tar" %} - - "{{ file_path | relpath(ROTDIR)}}" - {% endif %} -{% endfor %}