Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/update model namelist definitions #377

Merged
merged 4 commits into from
Dec 11, 2020
Merged

Feature/update model namelist definitions #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
458f927
new weather model executable name
mkavulich Dec 6, 2020
2b990d4
Update namelist template and yaml rules for new ufs-weather-model nam…
mkavulich Dec 9, 2020
a549ae0
Final namelist fixes maybe
mkavulich Dec 10, 2020
36285ba
Cherry-picking 5a4b90e7 from release/public-v1: Add the RRFS_v1alpha …
gsketefian Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions scripts/exregional_make_ics.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ case "${CCPP_PHYS_SUITE}" in
#
"FV3_GSD_v0" | \
"FV3_GSD_SAR" | \
"FV3_RRFS_v1alpha" | \
"FV3_RRFS_v1beta" )
if [ "${EXTRN_MDL_NAME_ICS}" = "RAP" ] || \
[ "${EXTRN_MDL_NAME_ICS}" = "HRRR" ]; then
Expand Down Expand Up @@ -325,8 +326,9 @@ case "${EXTRN_MDL_NAME_ICS}" in
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
thomp_mp_climo_file=""
elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
else
print_err_msg_exit "\
Expand Down Expand Up @@ -357,8 +359,9 @@ case "${EXTRN_MDL_NAME_ICS}" in
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
thomp_mp_climo_file=""
elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
else
print_err_msg_exit "\
Expand Down Expand Up @@ -410,11 +413,11 @@ case "${EXTRN_MDL_NAME_ICS}" in
#
if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
nsoill_out="4"
elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
Expand Down Expand Up @@ -450,9 +453,10 @@ case "${EXTRN_MDL_NAME_ICS}" in
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_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
nsoill_out="4"
elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
Expand Down Expand Up @@ -491,8 +495,9 @@ case "${EXTRN_MDL_NAME_ICS}" in
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
thomp_mp_climo_file=""
elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
fi

Expand Down
16 changes: 10 additions & 6 deletions scripts/exregional_make_lbcs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ case "${CCPP_PHYS_SUITE}" in
#
"FV3_GSD_v0" | \
"FV3_GSD_SAR" | \
"FV3_RRFS_v1alpha" | \
"FV3_RRFS_v1beta" )
if [ "${EXTRN_MDL_NAME_LBCS}" = "RAP" ] || \
[ "${EXTRN_MDL_NAME_LBCS}" = "HRRR" ]; then
Expand Down Expand Up @@ -294,8 +295,9 @@ case "${EXTRN_MDL_NAME_LBCS}" in
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
thomp_mp_climo_file=""
elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
else
print_err_msg_exit "\
Expand All @@ -319,8 +321,9 @@ case "${EXTRN_MDL_NAME_LBCS}" in
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
thomp_mp_climo_file=""
elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
else
print_err_msg_exit "\
Expand Down Expand Up @@ -378,8 +381,9 @@ case "${EXTRN_MDL_NAME_LBCS}" in
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
thomp_mp_climo_file=""
elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
else
print_err_msg_exit "\
Expand Down
18 changes: 18 additions & 0 deletions tests/baseline_configs/config.grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_13km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
FCST_LEN_HRS="06"
LBC_SPEC_INTVL_HRS="3"

DATE_FIRST_CYCL="20200801"
DATE_LAST_CYCL="20200801"
CYCL_HRS=( "00" )

EXTRN_MDL_NAME_ICS="HRRR"
EXTRN_MDL_NAME_LBCS="RAP"
USE_USER_STAGED_EXTRN_FILES="TRUE"
18 changes: 18 additions & 0 deletions tests/baseline_configs/config.grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
FCST_LEN_HRS="06"
LBC_SPEC_INTVL_HRS="3"

DATE_FIRST_CYCL="20200801"
DATE_LAST_CYCL="20200801"
CYCL_HRS=( "00" )

EXTRN_MDL_NAME_ICS="HRRR"
EXTRN_MDL_NAME_LBCS="RAP"
USE_USER_STAGED_EXTRN_FILES="TRUE"
18 changes: 18 additions & 0 deletions tests/baseline_configs/config.grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_3km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
FCST_LEN_HRS="06"
LBC_SPEC_INTVL_HRS="3"

DATE_FIRST_CYCL="20200801"
DATE_LAST_CYCL="20200801"
CYCL_HRS=( "00" )

EXTRN_MDL_NAME_ICS="HRRR"
EXTRN_MDL_NAME_LBCS="RAP"
USE_USER_STAGED_EXTRN_FILES="TRUE"
19 changes: 19 additions & 0 deletions tests/baseline_configs/config.suite_FV3_RRFS_v1alpha.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"

FCST_LEN_HRS="06"
LBC_SPEC_INTVL_HRS="6"

DATE_FIRST_CYCL="20190520"
DATE_LAST_CYCL="20190520"
CYCL_HRS=( "00" )

EXTRN_MDL_NAME_ICS="HRRR"
EXTRN_MDL_NAME_LBCS="RAP"
USE_USER_STAGED_EXTRN_FILES="TRUE"
4 changes: 4 additions & 0 deletions tests/baselines_list.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,17 @@ grid_RRFS_AK_3km_RAP_RAP
grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
grid_RRFS_SUBCONUS_3km_FV3GFS_FV3GFS
grid_RRFS_SUBCONUS_3km_HRRR_RAP
Expand All @@ -46,4 +49,5 @@ suite_FV3_GFS_v15p2
suite_FV3_GFS_v16beta
suite_FV3_GSD_SAR
suite_FV3_GSD_v0
suite_FV3_RRFS_v1alpha
suite_FV3_RRFS_v1beta
8 changes: 4 additions & 4 deletions tests/testlist.release_public_v1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GST_release_public_v1
grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
2 changes: 1 addition & 1 deletion ush/generate_FV3LAM_wflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ cp_vrfy "${CCPP_PHYS_SUITE_IN_CCPP_FP}" "${CCPP_PHYS_SUITE_FP}"
#
#-----------------------------------------------------------------------
#
exec_fn="NEMS.exe"
exec_fn="ufs_model"
exec_fp="${SR_WX_APP_TOP_DIR}/bin/${exec_fn}"
#Check for the old build location for fv3 executable
if [ ! -f "${exec_fp}" ]; then
Expand Down
44 changes: 25 additions & 19 deletions ush/templates/FV3.input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@


FV3_GSD_v0:
gfs_physics_nml:
effr_in: True
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd suggest putting this in the file input.nml.FV3 to keep this section empty always. It will not be needed in the other sections unless you want set to False, or need to leave it out altogether.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was the one who added that line, and I definitely prefer putting it in input.nml.FV3, but I wasn't (and still am not) sure which suites require it to be set to False, or what the default value is in FV3 if it is not specified.

The whole approach to namelist settings needs to be changed so it is centralized in one place -- the ufs-weather-model repo -- i.e. we should get all required namelist settings for each suite from the ufs-weather-model repo instead of setting them here and risking our settings being wrong or becoming outdated.


FV3_GSD_SAR:
gfs_physics_nml: &gsd_sar_phys
cnvcld: false
cnvgwd: false
effr_in: True
imfdeepcnv: 0
imfshalcnv: 0
iopt_alb: 2
Expand All @@ -33,28 +36,29 @@ FV3_GSD_SAR:
shal_cnv: false
do_deep: False

FV3_GSD_SAR_v1:
gfs_physics_nml:
<<: *gsd_sar_phys
lsm: 1
lsoil_lsm: 4

FV3_RRFS_v0:
FV3_RRFS_v1alpha:
gfs_physics_nml:
<<: *gsd_sar_phys
do_deep: False
do_mynnsfclay: False
effr_in: True
imfdeepcnv: -1
imfshalcnv: -1
lsm: 2
lsoil_lsm: 4
do_deep: False
atmos_model_nml:
fdiag: 3

FV3_RRFS_v1beta:
gfs_physics_nml:
<<: *gsd_sar_phys
do_deep: False
do_mynnsfclay: True
effr_in: True
imfdeepcnv: -1
imfshalcnv: -1
lsm: 2
lsoil_lsm: 4
imfshalcnv: -1
IMFDEEPCNV: -1
DO_MYNNSFCLAY: true
do_deep: False
atmos_model_nml:
fdiag: 3

Expand Down Expand Up @@ -87,7 +91,8 @@ FV3_GFS_2017_gfdlmp:
do_deep: False
do_mynnedmf: !!python/none
do_mynnsfclay: !!python/none
do_sfcperts: !!python/none
lndp_type: !!python/none
n_var_lndp: !!python/none
effr_in: True
fhcyc: 0.0
fhlwr: 3600.0
Expand Down Expand Up @@ -167,7 +172,8 @@ FV3_GFS_2017_gfdlmp_regional:
gfs_physics_nml:
<<: *gfs_2017_gfdlmp_phys
cplflx: False
do_sfcperts: False
lndp_type: 0
n_var_lndp: 0
iopt_alb: 2
iopt_btr: 1
iopt_crs: 1
Expand Down Expand Up @@ -321,16 +327,16 @@ FV3_GFS_v16beta:
cdmbgwd: [4.0, 0.15, 1.0, 1.0]
do_myjpbl: !!python/none
do_myjsfc: !!python/none
do_sfcperts: !!python/none
lndp_type: !!python/none
n_var_lndp: !!python/none
do_tofd: True
do_ysu: !!python/none
effr_in: True
hybedmf: False
iaer: 5111
icliq_sw: 2
iopt_dveg: 1
iovr_lw: 3
iovr_sw: 3
iovr: 3
isatmedmf: 1
lgfdlmprad: True
lheatstrg: True
Expand Down Expand Up @@ -389,7 +395,8 @@ FV3_CPT_v0:
do_sb_physics: True
do_mynnedmf: !!python/none
do_mynnsfclay: !!python/none
do_sfcperts: !!python/none
lndp_type: !!python/none
n_var_lndp: !!python/none
do_shoc: False
effr_in: True
fhcyc: 0.0
Expand Down Expand Up @@ -441,6 +448,5 @@ FV3_CPT_v0:
xkzm_h: 0.5
xkzm_m: 0.5
xkzm_s: 1.0
nam_sfcperts: !!python/none
surf_map_nml: !!python/none

Loading