Skip to content

Commit

Permalink
Update rocoto task names (#2981)
Browse files Browse the repository at this point in the history
# Description
Updates the GEFS task names to include the `$RUN` so they are consistent
with the task names in the GFS system. This is one step towards
abstracting out common elements.

Also adds an underscore between the RUN and task name for *all* tasks to
make them more readable.

# Type of change
- [x] Maintenance (code refactor, clean-up, new CI test, etc.)

# Change characteristics
- Is this a breaking change (a change in existing functionality)? NO
- Does this change require a documentation update? NO
- Does this change require an update to any of the following submodules?
NO

# How has this been tested?
- CI tests on Hera, Hercules, and WCOSS2

# Checklist
- [x] Any dependent changes have been merged and published
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [x] I have documented my code, including function, input, and output
descriptions
- [x] My changes generate no new warnings
- [x] New and existing tests pass with my changes
- [x] This change is covered by an existing CI test or a new one has
been added
- [x] I have made corresponding changes to the system documentation if
necessary
  • Loading branch information
WalterKolczynski-NOAA authored Oct 10, 2024
1 parent a42c833 commit a0771f8
Show file tree
Hide file tree
Showing 5 changed files with 351 additions and 352 deletions.
12 changes: 6 additions & 6 deletions parm/archive/enkf.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ enkf:
required:
# Logs
{% for mem in range(1, nmem_ens + 1) %}
- "logs/{{ cycle_YMDH }}/{{ RUN }}fcst_mem{{ '%03d' % mem }}.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_fcst_mem{{ '%03d' % mem }}.log"
{% endfor %}
{% for fhr in range(fhmin, fhmax + 1, fhout) %}
- "logs/{{ cycle_YMDH }}/{{ RUN }}epos{{ '%03d' % (fhr - fhmin) }}.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_epos{{ '%03d' % (fhr - fhmin) }}.log"
{% endfor %}
- "logs/{{ cycle_YMDH }}/{{ RUN }}echgres.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}esfc.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_echgres.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_esfc.log"
{% for grp in range(IAUFHRS | length) %}
- "logs/{{ cycle_YMDH }}/{{ RUN }}ecen{{ '%03d' % grp }}.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_ecen{{ '%03d' % grp }}.log"
{% endfor %}

{% if lobsdiag_forenkf %}
Expand All @@ -33,7 +33,7 @@ enkf:
{% endif %}

{% for step in steps %}
- "logs/{{ cycle_YMDH }}/{{ RUN }}{{ step }}.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_{{ step }}.log"
{% endfor %}

# Ensemble mean and spread
Expand Down
50 changes: 25 additions & 25 deletions parm/archive/gdas.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,33 @@ gdas:
required:
{% if MODE == "cycled" %}
# Cycled logs
- "logs/{{ cycle_YMDH }}/{{ RUN }}atmanlprod.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}prep.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_atmanlprod.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_prep.log"
{% if DO_JEDIATMVAR %}
- "logs/{{ cycle_YMDH }}/{{ RUN }}prepatmiodaobs.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}atmanlinit.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}atmanlprod.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}atmanlfinal.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}atmanlfv3inc.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}atmanlvar.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_prepatmiodaobs.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_atmanlinit.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_atmanlprod.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_atmanlfinal.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_atmanlfv3inc.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_atmanlvar.log"
{% else %}
- "logs/{{ cycle_YMDH }}/{{ RUN }}anal.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}analdiag.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_anal.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_analdiag.log"
{% endif %}
- "logs/{{ cycle_YMDH }}/{{ RUN }}atmanlupp.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_atmanlupp.log"
{% if DO_JEDIOCNVAR %}
- "logs/{{ cycle_YMDH }}/{{ RUN }}prepoceanobs.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}marineanlinit.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}marinebmat.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}marineanlvar.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}marineanlfinal.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}marineanlchkpt.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_prepoceanobs.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_marineanlinit.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_marinebmat.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_marineanlvar.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_marineanlfinal.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_marineanlchkpt.log"
{% if DOHYBVAR %}
- "logs/{{ cycle_YMDH }}/{{ RUN }}ocnanalecen.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_ocnanalecen.log"
{% endif %}
{% endif %}
{% if DO_VRFY_OCEANDA %}
- "logs/{{ cycle_YMDH }}/{{ RUN }}ocnanalvrfy.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_ocnanalvrfy.log"
{% endif %}

# Analysis GRIB2 (sub-sampled) data
Expand Down Expand Up @@ -85,7 +85,7 @@ gdas:
- "{{ COMIN_ATMOS_OZNMON | relpath(ROTDIR) }}/time/bad_pen.{{ cycle_YMDH }}"
- "{{ COMIN_ATMOS_OZNMON | relpath(ROTDIR) }}/time/stdout.time.tar.gz"
- "{{ COMIN_ATMOS_OZNMON | relpath(ROTDIR) }}/horiz/stdout.horiz.tar.gz"
- "logs/{{ cycle_YMDH }}/{{ RUN }}verfozn.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_verfozn.log"
{% endif %}

# Radiance verification
Expand All @@ -94,7 +94,7 @@ gdas:
- "{{ COMIN_ATMOS_RADMON | relpath(ROTDIR) }}/radmon_bcoef.tar.gz"
- "{{ COMIN_ATMOS_RADMON | relpath(ROTDIR) }}/radmon_bcor.tar.gz"
- "{{ COMIN_ATMOS_RADMON | relpath(ROTDIR) }}/radmon_time.tar.gz"
- "logs/{{ cycle_YMDH }}/{{ RUN }}verfrad.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_verfrad.log"
{% endif %}

# Minimization monitor
Expand All @@ -104,18 +104,18 @@ gdas:
- "{{ COMIN_ATMOS_MINMON | relpath(ROTDIR) }}/{{ cycle_YMDH }}.gnorms.ieee_d"
- "{{ COMIN_ATMOS_MINMON | relpath(ROTDIR) }}/{{ cycle_YMDH }}.reduction.ieee_d"
- "{{ COMIN_ATMOS_MINMON | relpath(ROTDIR) }}/gnorm_data.txt"
- "logs/{{ cycle_YMDH }}/{{ RUN }}vminmon.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_vminmon.log"
{% endif %}
{% endif %} # End of cycled data

# Forecast and post logs
- "logs/{{ cycle_YMDH }}/{{ RUN }}fcst_seg0.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_fcst_seg0.log"

{% for fhr in range(0, FHMAX + 1, 3) %}
{% set fhr3 = '%03d' % fhr %}
- "logs/{{ cycle_YMDH }}/{{ RUN }}atmos_prod_f{{ fhr3 }}.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_atmos_prod_f{{ fhr3 }}.log"
{% if not WRITE_DOPOST %}
- "logs/{{ cycle_YMDH }}/{{ RUN }}atmos_upp_f{{ fhr3 }}.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_atmos_upp_f{{ fhr3 }}.log"
{% endif %} ## not WRITE_DOPOST
# Forecast GRIB2 data
- "{{ COMIN_ATMOS_GRIB_0p25 | relpath(ROTDIR) }}/{{ head }}pgrb2.0p25.f{{ fhr3 }}"
Expand Down
2 changes: 1 addition & 1 deletion parm/archive/gfsa.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gfsa:
# Logs
# TODO explicitly name all logs to include
{% for log in glob("logs/" ~ cycle_YMDH ~ "/gfs*.log") %}
{% if not "gfsarch.log" in log %}
{% if not "gfs_arch.log" in log %}
- "{{ log }}"
{% endif %}
{% endfor %}
Expand Down
Loading

0 comments on commit a0771f8

Please sign in to comment.