Skip to content

Commit

Permalink
[develop] Change the configuration variable NET to NET_default. (#868)
Browse files Browse the repository at this point in the history
The renaming of the configuration variable NET to NET_default by PR #828 broke the WE2E test MET_ensemble_verification_only_vx_time_lag (see Issue #851). This PR fixes the bug and adds that WE2E test to the list of coverage tests on Hera (currently that test is only in the comprehensive tests list).
  • Loading branch information
gsketefian committed Jul 25, 2023
1 parent f28b8b1 commit 25eb2fa
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
1 change: 1 addition & 0 deletions tests/WE2E/machine_suites/coverage.hera.gnu.com
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0
GST_release_public_v1
MET_verification_only_vx
MET_ensemble_verification_only_vx_time_lag
nco_grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ rocoto:
task_get_obs_ndas:

nco:
NET: 'RRFSE_CONUS'
NET_default: 'RRFSE_CONUS'

global:
DO_ENSEMBLE: true
Expand All @@ -40,4 +40,4 @@ verification:
VX_FCST_MODEL_NAME: FV3_GFS_v15p2_CONUS_25km
VX_FCST_INPUT_BASEDIR: '{{ platform.get("TEST_VX_FCST_INPUT_BASEDIR") }}'
VX_NDIGITS_ENSMEM_NAMES: 1
FCST_FN_TEMPLATE: '${NET}.t{init?fmt=%H?shift=-${time_lag}}z{% if user.RUN_ENVIR == "nco" and global.DO_ENSEMBLE %}.${ensmem_name}{% endif %}.bgdawpf{lead?fmt=%HHH?shift=${time_lag}}.tm00.grib2'
FCST_FN_TEMPLATE: '${NET_default}.t{init?fmt=%H?shift=-${time_lag}}z{% if user.RUN_ENVIR == "nco" and global.DO_ENSEMBLE %}.${ensmem_name}{% endif %}.bgdawpf{lead?fmt=%HHH?shift=${time_lag}}.tm00.grib2'
22 changes: 11 additions & 11 deletions ush/config_defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1017,23 +1017,23 @@ nco:
#
# Definitions:
#
# envir, NET, model_ver, RUN:
# envir_default, NET_default, model_ver_default, RUN_default:
# Standard environment variables defined in the NCEP Central Operations WCOSS
# Implementation Standards document as follows:
#
# envir:
# envir_default:
# Set to "test" during the initial testing phase, "para" when running
# in parallel (on a schedule), and "prod" in production.
#
# NET:
# NET_default:
# Model name (first level of com directory structure)
#
# model_ver:
# model_ver_default:
# Version number of package in three digits (second level of com directory)
#
# RUN:
# RUN_default:
# Name of model run (third level of com directory structure).
# In general, same as $NET
# In general, same as ${NET_default}.
#
# OPSROOT:
# The operations root directory in NCO mode.
Expand Down Expand Up @@ -2066,7 +2066,7 @@ task_run_post:
# task or by activating the inline post feature (WRITE_DOPOST set to true)].
# The post output files are named as follows:
#
# $NET.tHHz.[var_name].f###.${POST_OUTPUT_DOMAIN_NAME}.grib2
# ${NET_default}.tHHz.[var_name].f###.${POST_OUTPUT_DOMAIN_NAME}.grib2
#
# If using a custom grid, POST_OUTPUT_DOMAIN_NAME must be specified by
# the user. If using a predefined grid, POST_OUTPUT_DOMAIN_NAME defaults
Expand Down Expand Up @@ -2461,7 +2461,7 @@ verification:
# VX_ASNOW_ACCUMS_HRS must contain at least one element. If not,
# VX_ASNOW_ACCUMS_HRS will be ignored.
#
VX_FCST_MODEL_NAME: '{{ nco.NET }}.{{ task_run_post.POST_OUTPUT_DOMAIN_NAME }}'
VX_FCST_MODEL_NAME: '{{ nco.NET_default }}.{{ task_run_post.POST_OUTPUT_DOMAIN_NAME }}'
VX_FIELDS: [ "APCP", "REFC", "RETOP", "SFC", "UPA" ]
VX_APCP_ACCUMS_HRS: [ 1, 3, 6, 24 ]
VX_ASNOW_ACCUMS_HRS: [ 6, 24 ]
Expand All @@ -2486,9 +2486,9 @@ verification:
#
# File name and path templates used in the verification tasks.
#
FCST_SUBDIR_TEMPLATE: '{% if user.RUN_ENVIR == "nco" %}${NET}.{init?fmt=%Y%m%d?shift=-${time_lag}}/{init?fmt=%H?shift=-${time_lag}}{% else %}{init?fmt=%Y%m%d%H?shift=-${time_lag}}{% if global.DO_ENSEMBLE %}/${ensmem_name}{% endif %}/postprd{% endif %}'
FCST_FN_TEMPLATE: '${NET}.t{init?fmt=%H?shift=-${time_lag}}z{% if user.RUN_ENVIR == "nco" and global.DO_ENSEMBLE %}.${ensmem_name}{% endif %}.prslev.f{lead?fmt=%HHH?shift=${time_lag}}.${POST_OUTPUT_DOMAIN_NAME}.grib2'
FCST_FN_METPROC_TEMPLATE: '${NET}.t{init?fmt=%H}z{% if user.RUN_ENVIR == "nco" and global.DO_ENSEMBLE %}.${ensmem_name}{% endif %}.prslev.f{lead?fmt=%HHH}.${POST_OUTPUT_DOMAIN_NAME}_${VAR}_a${ACCUM_HH}h.nc'
FCST_SUBDIR_TEMPLATE: '{% if user.RUN_ENVIR == "nco" %}${NET_default}.{init?fmt=%Y%m%d?shift=-${time_lag}}/{init?fmt=%H?shift=-${time_lag}}{% else %}{init?fmt=%Y%m%d%H?shift=-${time_lag}}{% if global.DO_ENSEMBLE %}/${ensmem_name}{% endif %}/postprd{% endif %}'
FCST_FN_TEMPLATE: '${NET_default}.t{init?fmt=%H?shift=-${time_lag}}z{% if user.RUN_ENVIR == "nco" and global.DO_ENSEMBLE %}.${ensmem_name}{% endif %}.prslev.f{lead?fmt=%HHH?shift=${time_lag}}.${POST_OUTPUT_DOMAIN_NAME}.grib2'
FCST_FN_METPROC_TEMPLATE: '${NET_default}.t{init?fmt=%H}z{% if user.RUN_ENVIR == "nco" and global.DO_ENSEMBLE %}.${ensmem_name}{% endif %}.prslev.f{lead?fmt=%HHH}.${POST_OUTPUT_DOMAIN_NAME}_${VAR}_a${ACCUM_HH}h.nc'
#
# For verification tasks that need observational data, this specifies
# the maximum number of observation files that may be missing. If more
Expand Down

0 comments on commit 25eb2fa

Please sign in to comment.