From 75212f465bd323bf1c0968d6e6f98996f43b7ddc Mon Sep 17 00:00:00 2001 From: jeff beck Date: Sun, 20 Mar 2022 03:43:54 +0000 Subject: [PATCH 1/4] Change to netcdf4 when using the NA 3-km domain --- ush/generate_FV3LAM_wflow.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh index 7c840a955..888c038d6 100755 --- a/ush/generate_FV3LAM_wflow.sh +++ b/ush/generate_FV3LAM_wflow.sh @@ -862,6 +862,15 @@ done settings="$settings }" # +# Use netCDF4 when running the North American 3-km domain due to file size. +# +if [ "${PREDEF_GRID_NAME}" = "RRFS_NA_3km" ]; then +settings="$settings +'fms2_io_nml': { + 'netcdf_default_format': netcdf4, + }" +fi +# # Add the relevant SPP namelist variables to "settings" when running with # SPP turned on. Otherwise only include an empty "nam_sppperts" stanza. # From 46971e623902248e413a8db487481a59aff99962 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Sun, 20 Mar 2022 03:44:38 +0000 Subject: [PATCH 2/4] Update HPSS paths for NAM data --- ush/get_extrn_mdl_file_dir_info.sh | 6 +++--- ush/templates/data_locations.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ush/get_extrn_mdl_file_dir_info.sh b/ush/get_extrn_mdl_file_dir_info.sh index 30a6e2d88..a34c0c2bf 100755 --- a/ush/get_extrn_mdl_file_dir_info.sh +++ b/ush/get_extrn_mdl_file_dir_info.sh @@ -377,7 +377,7 @@ and analysis or forecast (anl_or_fcst): ;; "NAM") - fn_tmpl="nam.t${hh}z.bgrdsfFHR3" + fn_tmpl="nam.t${hh}z.bgrdsfFHR2.tm00" ;; *) @@ -601,9 +601,9 @@ bination of external model (extrn_mdl_name) and analysis or forecast "NAM") arcv_dir="/NCEPPROD/hpssprod/runhistory/rh${yyyy}/${yyyy}${mm}/${yyyymmdd}" arcv_fmt="tar" - arcv_fns="com_nam_prod_nam.${yyyy}${mm}${dd}${hh}.bgrid.${arcv_fmt}" + arcv_fns="com2_nam_prod_nam.${yyyy}${mm}${dd}${hh}.bgrid.${arcv_fmt}" arcv_fps="${arcv_dir}/${arcv_fns}" - arcvrel_dir="" + arcvrel_dir="." ;; *) diff --git a/ush/templates/data_locations.yml b/ush/templates/data_locations.yml index 23354e171..e8c87c7cf 100644 --- a/ush/templates/data_locations.yml +++ b/ush/templates/data_locations.yml @@ -184,7 +184,7 @@ NAM: archive_path: - /NCEPPROD/hpssprod/runhistory/rh{yyyy}/{yyyymm}/{yyyymmdd} archive_file_names: - - com_nam_prod_nam.{yyyymmddhh}.bgrid.tar + - com2_nam_prod_nam.{yyyymmddhh}.bgrid.tar file_names: anl: - nam.t{hh}z.bgrdsf{fcst_hr:03d}.tm00 From a687b06116cc3e002cbb320f8597311659883767 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Mon, 21 Mar 2022 23:39:43 +0000 Subject: [PATCH 3/4] Update NAM HPSS locations and dates for WE2E tests. --- ...g.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR.sh | 8 ++++---- ...RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta.sh | 8 ++++---- ush/get_extrn_mdl_file_dir_info.sh | 9 ++++++--- ush/templates/data_locations.yml | 6 +++--- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR.sh b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR.sh index a91c10151..10be9fed9 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR.sh +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR.sh @@ -17,9 +17,9 @@ EXTRN_MDL_NAME_ICS="NAM" EXTRN_MDL_NAME_LBCS="NAM" USE_USER_STAGED_EXTRN_FILES="TRUE" -DATE_FIRST_CYCL="20150602" -DATE_LAST_CYCL="20150602" -CYCL_HRS=( "12" ) +DATE_FIRST_CYCL="20210615" +DATE_LAST_CYCL="20210615" +CYCL_HRS=( "00" ) -FCST_LEN_HRS="24" +FCST_LEN_HRS="6" LBC_SPEC_INTVL_HRS="3" diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta.sh b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta.sh index a22466e5b..540e5a058 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta.sh +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta.sh @@ -17,9 +17,9 @@ EXTRN_MDL_NAME_ICS="NAM" EXTRN_MDL_NAME_LBCS="NAM" USE_USER_STAGED_EXTRN_FILES="TRUE" -DATE_FIRST_CYCL="20150602" -DATE_LAST_CYCL="20150602" -CYCL_HRS=( "12" ) +DATE_FIRST_CYCL="20210615" +DATE_LAST_CYCL="20210615" +CYCL_HRS=( "00" ) -FCST_LEN_HRS="24" +FCST_LEN_HRS="6" LBC_SPEC_INTVL_HRS="3" diff --git a/ush/get_extrn_mdl_file_dir_info.sh b/ush/get_extrn_mdl_file_dir_info.sh index a34c0c2bf..aab64c2dc 100755 --- a/ush/get_extrn_mdl_file_dir_info.sh +++ b/ush/get_extrn_mdl_file_dir_info.sh @@ -312,7 +312,7 @@ function get_extrn_mdl_file_dir_info() { "NAM") fns=( "" ) - fns_in_arcv=( "nam.t${hh}z.bgrdsf${fcst_hh}.tm00" ) + fns_in_arcv=( "nam.t${hh}z.awphys${fcst_hh}.tm00.grib2" ) ;; *) @@ -377,7 +377,7 @@ and analysis or forecast (anl_or_fcst): ;; "NAM") - fn_tmpl="nam.t${hh}z.bgrdsfFHR2.tm00" + fn_tmpl="nam.t${hh}z.awphysFHR2.tm00.grib2" ;; *) @@ -599,9 +599,12 @@ bination of external model (extrn_mdl_name) and analysis or forecast ;; "NAM") + # + # 12-km CONUS 218 grid. + # arcv_dir="/NCEPPROD/hpssprod/runhistory/rh${yyyy}/${yyyy}${mm}/${yyyymmdd}" arcv_fmt="tar" - arcv_fns="com2_nam_prod_nam.${yyyy}${mm}${dd}${hh}.bgrid.${arcv_fmt}" + arcv_fns="com_nam_prod_nam.${yyyy}${mm}${dd}${hh}.awphys.${arcv_fmt}" arcv_fps="${arcv_dir}/${arcv_fns}" arcvrel_dir="." ;; diff --git a/ush/templates/data_locations.yml b/ush/templates/data_locations.yml index e8c87c7cf..c3efd9a29 100644 --- a/ush/templates/data_locations.yml +++ b/ush/templates/data_locations.yml @@ -184,10 +184,10 @@ NAM: archive_path: - /NCEPPROD/hpssprod/runhistory/rh{yyyy}/{yyyymm}/{yyyymmdd} archive_file_names: - - com2_nam_prod_nam.{yyyymmddhh}.bgrid.tar + - com_nam_prod_nam.{yyyymmddhh}.awphys{fcst_hr:02d}.tar file_names: anl: - - nam.t{hh}z.bgrdsf{fcst_hr:03d}.tm00 + - nam.t{hh}z.awphys{fcst_hr:02d}.tm00.grib2 fcst: - - nam.t{hh}z.bgrdsf{fcst_hr:03d} + - nam.t{hh}z.awphys{fcst_hr:02d}.tm00.grib2 From 233b75bde661588d11879d8df7df85b5fa555e35 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Wed, 23 Mar 2022 21:21:10 +0000 Subject: [PATCH 4/4] Remove lines from merge. --- ush/generate_FV3LAM_wflow.sh | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh index 5ae12748e..d0f5d3bd4 100755 --- a/ush/generate_FV3LAM_wflow.sh +++ b/ush/generate_FV3LAM_wflow.sh @@ -790,22 +790,6 @@ settings="\ 'lndp_type': ${LNDP_TYPE}, 'lndp_each_step': ${LSM_SPP_EACH_STEP}, 'fhcyc': ${FHCYC_LSM_SPP_OR_NOT}, - } -'nam_stochy': { - 'shum': ${SHUM_MAG}, - 'shum_lscale': ${SHUM_LSCALE}, - 'shum_tau': ${SHUM_TSCALE}, - 'shumint': ${SHUM_INT}, - 'sppt': ${SPPT_MAG}, - 'sppt_lscale': ${SPPT_LSCALE}, - 'sppt_tau': ${SPPT_TSCALE}, - 'spptint': ${SPPT_INT}, - 'skeb': ${SKEB_MAG}, - 'skeb_lscale': ${SKEB_LSCALE}, - 'skeb_tau': ${SKEB_TSCALE}, - 'skebint': ${SKEB_INT}, - 'skeb_vdof': ${SKEB_VDOF}, - 'use_zmtnblck': ${USE_ZMTNBLCK}, }" # # Add to "settings" the values of those namelist variables that specify @@ -862,6 +846,15 @@ done settings="$settings }" # +# Use netCDF4 when running the North American 3-km domain due to file size. +# +if [ "${PREDEF_GRID_NAME}" = "RRFS_NA_3km" ]; then +settings="$settings +'fms2_io_nml': { + 'netcdf_default_format': netcdf4, + }" +fi +# # Add the relevant tendency-based stochastic physics namelist variables to # "settings" when running with SPPT, SHUM, or SKEB turned on. Otherwise # only include an empty "nam_stochy" stanza.