From 7bc40c035759082cfa0135f1d6e52ac624a75913 Mon Sep 17 00:00:00 2001 From: gsketefian <31046882+gsketefian@users.noreply.github.com> Date: Fri, 21 Aug 2020 12:30:48 -0600 Subject: [PATCH] Update GSD_HRRR3km grid parameters and enable its use in NCO mode (#273) ## Description of changes: * Update grid parameters of GSD_HRRR3km grid of type JPgrid (including its task layout and blocksize) and enable running with it in NCO mode. The new grid parameters are set to values specified by Christina Holt of GSL. * Update the write-component grid parameters associated with this grid such that the former is within the latter. * Add two WE2E tests in NCO mode to run on this grid -- one using FV3GFS for ICs and LBCs (nco_GSD_HRRR3km_FV3GFS_FV3GFS) and another using HRRRX for ICs and RAPX for LBCs (nco_GSD_HRRR3km_HRRRX_RAPX). First test works but the second doesn't due to a yet-unknown problem in chgres_cube, but the test may work with an older executable that GSL will use. * Bug fix: Add the FV3GFS_2017_gfdlmp_regional physics suite to the if-statements in exregional_make_ics.sh and exregional_make_lbcs.sh that set numsoil_out. * Improvement: Add "else" clauses to the if-statements in exregional_make_ics.sh and exregional_make_lbcs.sh that check for the physics suite to set various parameters. These "else" clauses print out an error message whenever the specified physics suite is not covered by the if-statement. ## Tests conducted: ### On hera: Ran all the WE2E tests including the two new ones (nco_GSD_HRRR3km_FV3GFS_FV3GFS and nco_GSD_HRRR3km_HRRRX_RAPX). All tests except regional_010 pass (regional_010 test was already broken in the original develop branch). ### On jet: Ran the two new WE2E tests nco_GSD_HRRR3km_FV3GFS_FV3GFS and nco_GSD_HRRR3km_HRRRX_RAPX as well as regional_002 and regional_003. All passed, although some tasks (make_lbcs and run_fcst) for the nco_GSD_HRRR3km_FV3GFS_FV3GFS and nco_GSD_HRRR3km_HRRRX_RAPX tests took more than 1 try to succeed. Also tested versions of nco_GSD_HRRR3km_FV3GFS_FV3GFS and nco_GSD_HRRR3km_HRRRX_RAPX in which the external files are staged. Again, both succeeded but some tasks take more than 1 try to succeed. --- scripts/exregional_make_ics.sh | 22 +++ scripts/exregional_make_lbcs.sh | 15 ++ .../config.nco_GSD_HRRR3km_FV3GFS_FV3GFS.sh | 139 +++++++++++++++++ .../config.nco_GSD_HRRR3km_HRRRX_RAPX.sh | 141 ++++++++++++++++++ tests/baselines_list.txt | 2 + ush/set_predef_grid_params.sh | 10 +- ush/setup.sh | 32 +--- ush/valid_param_vals.sh | 2 +- 8 files changed, 328 insertions(+), 35 deletions(-) create mode 100644 tests/baseline_configs/config.nco_GSD_HRRR3km_FV3GFS_FV3GFS.sh create mode 100644 tests/baseline_configs/config.nco_GSD_HRRR3km_HRRRX_RAPX.sh diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh index f02fd03ea..114428fb8 100755 --- a/scripts/exregional_make_ics.sh +++ b/scripts/exregional_make_ics.sh @@ -311,6 +311,14 @@ case "${EXTRN_MDL_NAME_ICS}" in # For GSD physics, add three additional tracers (the ice, rain and water # number concentrations) that are required for Thompson microphysics. tracers="[\"sphum\",\"liq_wat\",\"o3mr\",\"ice_wat\",\"rainwat\",\"snowwat\",\"graupel\",\"ice_nc\",\"rain_nc\",\"water_nc\"]" + else + print_err_msg_exit "\ +The parameter \"tracers\" has not been defined for this combination of +external model (EXTRN_MDL_NAME_ICS), physics suite (CCPP_PHYS_SUITE), and +FV3GFS file type (FV3GFS_FILE_FMT_ICS): + EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\" + CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\" + FV3GFS_FILE_FMT_ICS = \"${FV3GFS_FILE_FMT_ICS}\"" fi # # If CCPP is not being used, the only physics suite that can be used is @@ -361,6 +369,7 @@ HRRRX grib2 files created after about \"${cdate_min_HRRRX}\"..." if [ "${USE_CCPP}" = "TRUE" ]; then if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ] || \ + [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \ @@ -370,6 +379,12 @@ HRRRX grib2 files created after about \"${cdate_min_HRRRX}\"..." elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then numsoil_out="9" + else + print_err_msg_exit "\ +The parameter \"numsoil_out\" has not been defined for this combination +of external model (EXTRN_MDL_NAME_ICS) and physics suite (CCPP_PHYS_SUITE): + EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\" + CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\"" fi fi # @@ -400,6 +415,7 @@ HRRRX grib2 files created after about \"${cdate_min_HRRRX}\"..." if [ "${USE_CCPP}" = "TRUE" ]; then if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ] || \ + [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \ @@ -409,6 +425,12 @@ HRRRX grib2 files created after about \"${cdate_min_HRRRX}\"..." elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then numsoil_out="9" + else + print_err_msg_exit "\ +The parameter \"numsoil_out\" has not been defined for this combination +of external model (EXTRN_MDL_NAME_ICS) and physics suite (CCPP_PHYS_SUITE): + EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\" + CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\"" fi fi # diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh index c598d2d0a..1dc89ae59 100755 --- a/scripts/exregional_make_lbcs.sh +++ b/scripts/exregional_make_lbcs.sh @@ -294,6 +294,14 @@ case "${EXTRN_MDL_NAME_LBCS}" in # For GSD physics, add three additional tracers (the ice, rain and water # number concentrations) that are required for Thompson microphysics. tracers="[\"sphum\",\"liq_wat\",\"o3mr\",\"ice_wat\",\"rainwat\",\"snowwat\",\"graupel\",\"ice_nc\",\"rain_nc\",\"water_nc\"]" + else + print_err_msg_exit "\ +The parameter \"tracers\" has not been defined for this combination of +external model (EXTRN_MDL_NAME_LBCS), physics suite (CCPP_PHYS_SUITE), +and FV3GFS file type (FV3GFS_FILE_FMT_LBCS): + EXTRN_MDL_NAME_LBCS = \"${EXTRN_MDL_NAME_LBCS}\" + CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\" + FV3GFS_FILE_FMT_LBCS = \"${FV3GFS_FILE_FMT_LBCS}\"" fi # # If CCPP is not being used, the only physics suite that can be used is @@ -329,6 +337,7 @@ case "${EXTRN_MDL_NAME_LBCS}" in if [ "${USE_CCPP}" = "TRUE" ]; then if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ] || \ + [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \ @@ -338,6 +347,12 @@ case "${EXTRN_MDL_NAME_LBCS}" in elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then numsoil_out="9" + else + print_err_msg_exit "\ +The parameter \"numsoil_out\" has not been defined for this combination +of external model (EXTRN_MDL_NAME_LBCS) and physics suite (CCPP_PHYS_SUITE): + EXTRN_MDL_NAME_LBCS = \"${EXTRN_MDL_NAME_LBCS}\" + CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\"" fi fi diff --git a/tests/baseline_configs/config.nco_GSD_HRRR3km_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.nco_GSD_HRRR3km_FV3GFS_FV3GFS.sh new file mode 100644 index 000000000..069531a53 --- /dev/null +++ b/tests/baseline_configs/config.nco_GSD_HRRR3km_FV3GFS_FV3GFS.sh @@ -0,0 +1,139 @@ +# +# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required +# inputs to the script that launces the WE2E test experiments. That script +# will use those inputs to fill in the values of these variables below. +# +MACHINE="" +ACCOUNT="" +EXPT_SUBDIR="" +# +# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS +# are optional inputs to the script that launces the WE2E test experiments. +# If one or both of these values are specified, then that script will +# replace the default values of these variables below with those values. +# Otherwise, it will keep the default values. +# +USE_CRON_TO_RELAUNCH="TRUE" +CRON_RELAUNCH_INTVL_MNTS="02" + + +QUEUE_DEFAULT="batch" +QUEUE_HPSS="service" +QUEUE_FCST="batch" + +VERBOSE="TRUE" + +RUN_ENVIR="nco" +PREEXISTING_DIR_METHOD="rename" + +EMC_GRID_NAME="GSD_HRRR3km" +GRID_GEN_METHOD="ESGgrid" + +QUILTING="TRUE" +USE_CCPP="TRUE" +CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp_regional" +FCST_LEN_HRS="06" +LBC_SPEC_INTVL_HRS="3" + +DATE_FIRST_CYCL="20190901" +DATE_LAST_CYCL="20190901" +CYCL_HRS=( "18" ) + +EXTRN_MDL_NAME_ICS="FV3GFS" +EXTRN_MDL_NAME_LBCS="FV3GFS" + +# +# In NCO mode, the following don't need to be explicitly set to "FALSE" +# in this configuration file because the experiment generation script +# will do this (along with printing out an informational message). +# +#RUN_TASK_MAKE_GRID="FALSE" +#RUN_TASK_MAKE_OROG="FALSE" +#RUN_TASK_MAKE_SFC_CLIMO="FALSE" + +# +# In order to prevent simultaneous WE2E (Workflow End-to-End) tests that +# are running in NCO mode and which run the same cycles from interfering +# with each other, for each cycle, each such test must have a distinct +# path to the following two directories: +# +# 1) The directory in which the cycle-dependent model input files, symlinks +# to cycle-independent input files, and raw (i.e. before post-processing) +# forecast output files for a given cycle are stored. The path to this +# directory is +# +# $STMP/tmpnwprd/$RUN/$cdate +# +# where cdate is the starting year (yyyy), month (mm), day (dd) and +# hour of the cycle in the form yyyymmddhh. +# +# 2) The directory in which the output files from the post-processor (UPP) +# for a given cycle are stored. The path to this directory is +# +# $PTMP/com/$NET/$envir/$RUN.$yyyymmdd/$hh +# +# Here, we make the first directory listed above unique to a WE2E test +# by setting RUN to the name of the current test. This will also make +# the second directory unique because it also conains the variable RUN +# in its full path, but if this directory -- or set of directories since +# it involves a set of cycles and forecast hours -- already exists from +# a previous run of the same test, then it is much less confusing to the +# user to first move or delete this set of directories during the workflow +# generation step and then start the experiment (whether we move or delete +# depends on the setting of PREEXISTING_DIR_METHOD). For this purpose, +# it is most convenient to put this set of directories under an umbrella +# directory that has the same name as the experiment. This can be done +# by setting the variable envir to the name of the current test. Since +# as mentiond above we will store this name in RUN, below we simply set +# envir to RUN. Then, for this test, the UPP output will be located in +# the directory +# +# $PTMP/com/$NET/$RUN/$RUN.$yyyymmdd/$hh +# +# Note that by the time this file is sourced by the experiment generation +# script, the script that launces the WE2E test experiments will have +# filled in the value of the variable EXPT_SUBDIR above (which contains +# the name of the experiment). Thus, below, we can assume that EXPT_SUBDIR +# has a valid value and use it to set RUN and envir. +# +RUN="${EXPT_SUBDIR}" +envir="${EXPT_SUBDIR}" + +#On Hera: +#COMINgfs="/scratch1/NCEPDEV/hwrf/noscrub/hafs-input/COMGFS" +#STMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp" +#PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" + +#On Jet: +COMINgfs="/lfs1/HFIP/hwrf-data/hafs-input/COMGFS" +STMP="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp" +PTMP="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" + +# +# In NCO mode, the user must manually (e.g. after doing the build step) +# create the symlink "${FIXrrfs}/fix_sar" that points to EMC's FIXsar +# directory on the machine. For example, on hera, the symlink's target +# needs to be +# +# /scratch2/NCEPDEV/fv3-cam/emc.campara/fix_fv3cam/fix_sar +# +# The experiment generation script will then set FIXsar to +# +# FIXsar="${FIXrrfs}/fix_sar/${EMC_GRID_NAME}" +# +# where EMC_GRID_NAME has the value set above. +# + +# If want to use user-staged external model files: + +#On Hera: +#EXTRN_MDL_SOURCE_DIR_ICS="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/FV3GFS" +#EXTRN_MDL_FILES_ICS=( "gfs.atmanl.nemsio" "gfs.sfcanl.nemsio" ) +#EXTRN_MDL_SOURCE_DIR_LBCS="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/FV3GFS" +#EXTRN_MDL_FILES_LBCS=( "gfs.atmf003.nemsio" "gfs.atmf006.nemsio" ) + +#On Jet: +#EXTRN_MDL_SOURCE_DIR_ICS="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/FV3GFS" +#EXTRN_MDL_FILES_ICS=( "gfs.atmanl.nemsio" "gfs.sfcanl.nemsio" ) +#EXTRN_MDL_SOURCE_DIR_LBCS="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/FV3GFS" +#EXTRN_MDL_FILES_LBCS=( "gfs.atmf003.nemsio" "gfs.atmf006.nemsio" ) diff --git a/tests/baseline_configs/config.nco_GSD_HRRR3km_HRRRX_RAPX.sh b/tests/baseline_configs/config.nco_GSD_HRRR3km_HRRRX_RAPX.sh new file mode 100644 index 000000000..011b302fa --- /dev/null +++ b/tests/baseline_configs/config.nco_GSD_HRRR3km_HRRRX_RAPX.sh @@ -0,0 +1,141 @@ +# +# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required +# inputs to the script that launces the WE2E test experiments. That script +# will use those inputs to fill in the values of these variables below. +# +MACHINE="" +ACCOUNT="" +EXPT_SUBDIR="" +# +# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS +# are optional inputs to the script that launces the WE2E test experiments. +# If one or both of these values are specified, then that script will +# replace the default values of these variables below with those values. +# Otherwise, it will keep the default values. +# +USE_CRON_TO_RELAUNCH="TRUE" +CRON_RELAUNCH_INTVL_MNTS="02" + + +QUEUE_DEFAULT="batch" +QUEUE_HPSS="service" +QUEUE_FCST="batch" + +VERBOSE="TRUE" + +RUN_ENVIR="nco" +PREEXISTING_DIR_METHOD="rename" + +EMC_GRID_NAME="GSD_HRRR3km" +GRID_GEN_METHOD="ESGgrid" + +QUILTING="TRUE" +USE_CCPP="TRUE" +CCPP_PHYS_SUITE="FV3_GSD_SAR" +FCST_LEN_HRS="06" +LBC_SPEC_INTVL_HRS="3" + +DATE_FIRST_CYCL="20200801" +DATE_LAST_CYCL="20200801" +CYCL_HRS=( "00" ) + +EXTRN_MDL_NAME_ICS="HRRRX" +EXTRN_MDL_NAME_LBCS="RAPX" + +# +# In NCO mode, the following don't need to be explicitly set to "FALSE" +# in this configuration file because the experiment generation script +# will do this (along with printing out an informational message). +# +#RUN_TASK_MAKE_GRID="FALSE" +#RUN_TASK_MAKE_OROG="FALSE" +#RUN_TASK_MAKE_SFC_CLIMO="FALSE" + +# +# In order to prevent simultaneous WE2E (Workflow End-to-End) tests that +# are running in NCO mode and which run the same cycles from interfering +# with each other, for each cycle, each such test must have a distinct +# path to the following two directories: +# +# 1) The directory in which the cycle-dependent model input files, symlinks +# to cycle-independent input files, and raw (i.e. before post-processing) +# forecast output files for a given cycle are stored. The path to this +# directory is +# +# $STMP/tmpnwprd/$RUN/$cdate +# +# where cdate is the starting year (yyyy), month (mm), day (dd) and +# hour of the cycle in the form yyyymmddhh. +# +# 2) The directory in which the output files from the post-processor (UPP) +# for a given cycle are stored. The path to this directory is +# +# $PTMP/com/$NET/$envir/$RUN.$yyyymmdd/$hh +# +# Here, we make the first directory listed above unique to a WE2E test +# by setting RUN to the name of the current test. This will also make +# the second directory unique because it also conains the variable RUN +# in its full path, but if this directory -- or set of directories since +# it involves a set of cycles and forecast hours -- already exists from +# a previous run of the same test, then it is much less confusing to the +# user to first move or delete this set of directories during the workflow +# generation step and then start the experiment (whether we move or delete +# depends on the setting of PREEXISTING_DIR_METHOD). For this purpose, +# it is most convenient to put this set of directories under an umbrella +# directory that has the same name as the experiment. This can be done +# by setting the variable envir to the name of the current test. Since +# as mentiond above we will store this name in RUN, below we simply set +# envir to RUN. Then, for this test, the UPP output will be located in +# the directory +# +# $PTMP/com/$NET/$RUN/$RUN.$yyyymmdd/$hh +# +# Note that by the time this file is sourced by the experiment generation +# script, the script that launces the WE2E test experiments will have +# filled in the value of the variable EXPT_SUBDIR above (which contains +# the name of the experiment). Thus, below, we can assume that EXPT_SUBDIR +# has a valid value and use it to set RUN and envir. +# +RUN="${EXPT_SUBDIR}" +envir="${EXPT_SUBDIR}" + +#On Hera: +#COMINgfs="/scratch1/NCEPDEV/hwrf/noscrub/hafs-input/COMGFS" +#STMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp" +#PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" + +#On Jet: +COMINgfs="/lfs1/HFIP/hwrf-data/hafs-input/COMGFS" +STMP="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp" +PTMP="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" + + +# +# In NCO mode, the user must manually (e.g. after doing the build step) +# create the symlink "${FIXrrfs}/fix_sar" that points to EMC's FIXsar +# directory on the machine. For example, on hera, the symlink's target +# needs to be +# +# /scratch2/NCEPDEV/fv3-cam/emc.campara/fix_fv3cam/fix_sar +# +# The experiment generation script will then set FIXsar to +# +# FIXsar="${FIXrrfs}/fix_sar/${EMC_GRID_NAME}" +# +# where EMC_GRID_NAME has the value set above. +# + +# If want to use user-staged external model files: + +#On Hera: +#EXTRN_MDL_SOURCE_DIR_ICS="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/HRRRX" +#EXTRN_MDL_FILES_ICS=( "hrrrx.out.for_f000" ) +#EXTRN_MDL_SOURCE_DIR_LBCS="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/RAPX" +#EXTRN_MDL_FILES_LBCS=( "rapx.out.for_f003" "rapx.out.for_f006" ) + +#On Jet: +#EXTRN_MDL_SOURCE_DIR_ICS="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/HRRRX" +#EXTRN_MDL_FILES_ICS=( "hrrrx.out.for_f000" ) +#EXTRN_MDL_SOURCE_DIR_LBCS="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/RAPX" +#EXTRN_MDL_FILES_LBCS=( "rapx.out.for_f003" "rapx.out.for_f006" ) + diff --git a/tests/baselines_list.txt b/tests/baselines_list.txt index 8d40475ee..a145fa578 100644 --- a/tests/baselines_list.txt +++ b/tests/baselines_list.txt @@ -1,6 +1,8 @@ GSD_RAP13km community_ensemble_008mems community_ensemble_2mems +nco_GSD_HRRR3km_FV3GFS_FV3GFS +nco_GSD_HRRR3km_HRRRX_RAPX nco_conus nco_conus_c96 nco_ensemble diff --git a/ush/set_predef_grid_params.sh b/ush/set_predef_grid_params.sh index b9e435efc..1b1f6bd7c 100644 --- a/ush/set_predef_grid_params.sh +++ b/ush/set_predef_grid_params.sh @@ -490,16 +490,16 @@ predefined domain: ESGgrid_DELX="3000.0" ESGgrid_DELY="3000.0" - ESGgrid_NX=1734 + ESGgrid_NX=1728 ESGgrid_NY=1008 ESGgrid_WIDE_HALO_WIDTH=6 DT_ATMOS="40" - LAYOUT_X="18" - LAYOUT_Y="12" - BLOCKSIZE="46" + LAYOUT_X="32" + LAYOUT_Y="16" + BLOCKSIZE="27" if [ "$QUILTING" = "TRUE" ]; then WRTCMP_write_groups="1" @@ -509,7 +509,7 @@ predefined domain: WRTCMP_cen_lat="${ESGgrid_LAT_CTR}" WRTCMP_stdlat1="${ESGgrid_LAT_CTR}" WRTCMP_stdlat2="${ESGgrid_LAT_CTR}" - WRTCMP_nx="1738" + WRTCMP_nx="1726" WRTCMP_ny="974" WRTCMP_lon_lwr_left="-122.21414225" WRTCMP_lat_lwr_left="22.41403305" diff --git a/ush/setup.sh b/ush/setup.sh index 939f60e73..b30601d32 100755 --- a/ush/setup.sh +++ b/ush/setup.sh @@ -459,6 +459,9 @@ case "${EMC_GRID_NAME}" in "conus_c96") PREDEF_GRID_NAME="EMC_CONUS_coarse" ;; + "GSD_HRRR3km") + PREDEF_GRID_NAME="${EMC_GRID_NAME}" + ;; "conus_orig"|"guam"|"hi"|"pr") print_err_msg_exit "\ A predefined grid (PREDEF_GRID_NAME) has not yet been defined for this @@ -1515,35 +1518,6 @@ fi # #----------------------------------------------------------------------- # -# If the run environment is "nco", the external model for both the ICs -# and the LBCs should be either the FV3GFS or the GSMGFS. -# -#----------------------------------------------------------------------- -# -if [ "${RUN_ENVIR}" = "nco" ]; then - - if [ "${EXTRN_MDL_NAME_ICS}" != "FV3GFS" ] && \ - [ "${EXTRN_MDL_NAME_ICS}" != "GSMGFS" ]; then - print_err_msg_exit "\ -When RUN_ENVIR set to \"nco\", the external model used for the initial -conditions and surface fields must be either \"FV3GFS\" or \"GSMGFS\": - RUN_ENVIR = \"${RUN_ENVIR}\" - EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\"" - fi - - if [ "${EXTRN_MDL_NAME_LBCS}" != "FV3GFS" ] && \ - [ "${EXTRN_MDL_NAME_LBCS}" != "GSMGFS" ]; then - print_err_msg_exit "\ -When RUN_ENVIR set to \"nco\", the external model used for the initial -conditions and surface fields must be either \"FV3GFS\" or \"GSMGFS\": - RUN_ENVIR = \"${RUN_ENVIR}\" - EXTRN_MDL_NAME_LBCS = \"${EXTRN_MDL_NAME_LBCS}\"" - fi - -fi -# -#----------------------------------------------------------------------- -# # Set cycle-independent parameters associated with the external models # from which we will obtain the ICs and LBCs. # diff --git a/ush/valid_param_vals.sh b/ush/valid_param_vals.sh index 5b655785b..c8d700b80 100644 --- a/ush/valid_param_vals.sh +++ b/ush/valid_param_vals.sh @@ -18,7 +18,7 @@ valid_vals_PREDEF_GRID_NAME=( \ "GSD_HRRR13km" \ "GSD_HRRR25km" \ "GSD_RAP13km" ) -valid_vals_EMC_GRID_NAME=("ak" "conus" "conus_c96" "conus_orig" "guam" "hi" "pr") +valid_vals_EMC_GRID_NAME=("ak" "conus" "conus_c96" "conus_orig" "guam" "hi" "pr" "GSD_HRRR3km") valid_vals_USE_CCPP=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") valid_vals_CCPP_PHYS_SUITE=( \ "FV3_GFS_2017_gfdlmp" \