Skip to content

add and test FV3_RRFS_v1beta #270

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

Merged
JeffBeck-NOAA merged 9 commits into from
Aug 22, 2020
Merged

add and test FV3_RRFS_v1beta #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a2c6926
RRFS_v1beta test finished
siwei-noaa Aug 17, 2020
d19300d
Merge branch 'feature/rrfs_v1beta_test' into tested
siwei-noaa Aug 17, 2020
26b866c
remove config.sh
siwei-noaa Aug 18, 2020
8f09ac1
revoke change on DT_ATMOS
siwei-noaa Aug 18, 2020
feb09a1
add if condition for RRFS_v1beta
siwei-noaa Aug 21, 2020
4b668a4
Merge branch 'develop' of https://github.com/NOAA-EMC/regional_workfl…
siwei-noaa Aug 21, 2020
9194eba
Merge branch 'develop' into feature/rrfs_v1beta_test
siwei-noaa Aug 21, 2020
9eb7f59
bug fix for atmos_nthreads
siwei-noaa Aug 21, 2020
081dc3c
FIXsar to FIXLAM
siwei-noaa Aug 22, 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
5 changes: 4 additions & 1 deletion scripts/exregional_make_ics.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ case "${CCPP_PHYS_SUITE}" in
"FV3_GFS_2017_gfdlmp" | "FV3_GFS_2017_gfdlmp_regional" )
phys_suite="GFS"
;;
"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_GSD_SAR_v1" |"FV3_RRFS_v0" )
"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_GSD_SAR_v1" |"FV3_RRFS_v0" |"FV3_RRFS_v1beta")
phys_suite="GSD"
;;
"FV3_CPT_v0")
Expand Down Expand Up @@ -307,6 +307,7 @@ case "${EXTRN_MDL_NAME_ICS}" in
elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
# For GSD physics, add three additional tracers (the ice, rain and water
# number concentrations) that are required for Thompson microphysics.
Expand Down Expand Up @@ -372,6 +373,7 @@ HRRRX grib2 files created after about \"${cdate_min_HRRRX}\"..."
[ "${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_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
Expand Down Expand Up @@ -419,6 +421,7 @@ of external model (EXTRN_MDL_NAME_ICS) and physics suite (CCPP_PHYS_SUITE):
[ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
numsoil_out="4"
Expand Down
4 changes: 3 additions & 1 deletion scripts/exregional_make_lbcs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ case "${CCPP_PHYS_SUITE}" in
"FV3_GFS_2017_gfdlmp" | "FV3_GFS_2017_gfdlmp_regional")
phys_suite="GFS"
;;
"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_GSD_SAR_v1" | "FV3_RRFS_v0" )
"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_GSD_SAR_v1" | "FV3_RRFS_v0" | "FV3_RRFS_v1beta" )
phys_suite="GSD"
;;
"FV3_CPT_v0" )
Expand Down Expand Up @@ -290,6 +290,7 @@ case "${EXTRN_MDL_NAME_LBCS}" in
elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
# For GSD physics, add three additional tracers (the ice, rain and water
# number concentrations) that are required for Thompson microphysics.
Expand Down Expand Up @@ -341,6 +342,7 @@ and FV3GFS file type (FV3GFS_FILE_FMT_LBCS):
[ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
numsoil_out="4"
Expand Down
3 changes: 3 additions & 0 deletions scripts/exregional_make_orog.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,9 @@ raw_orog_fn="${raw_orog_fn_prefix}.${fn_suffix_with_halo}"
raw_orog_fp="${raw_dir}/${raw_orog_fn}"
mv_vrfy "${raw_orog_fp_orig}" "${raw_orog_fp}"

# copy two files for drag_suite to the orog directory (temporary)
Copy link
Copy Markdown
Collaborator

@mkavulich mkavulich Aug 18, 2020

Choose a reason for hiding this comment

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

If they are necessary for running the case, these files should be added to the standard static/fix files on each official platform. We should not point to personal directories that could change unexpectedly.

Copy link
Copy Markdown
Contributor Author

@siwei-noaa siwei-noaa Aug 18, 2020

Choose a reason for hiding this comment

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

Thank you. We are waiting on Mike's script to replace those files, and will update this when it is ready.

cp_vrfy /scratch2/BMC/gsd-fv3-test/she/orog/* ${OROG_DIR} # temporary code

print_info_msg "$VERBOSE" "
Orography file generation complete."
#
Expand Down
23 changes: 23 additions & 0 deletions scripts/exregional_run_fcst.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,28 @@ Cannot create symlink because target does not exist:
target = \"$target\""
fi

# two files for drag_suite scheme
Comment thread
JeffBeck-NOAA marked this conversation as resolved.
if [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
Copy link
Copy Markdown
Collaborator

@JeffBeck-NOAA JeffBeck-NOAA Aug 22, 2020

Choose a reason for hiding this comment

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

@siwei-noaa, one last bug in this block of code. All ${FIXsar} variables are now ${FIXLAM} in the community workflow. Once that change is in, I think we'll be ready to merge.

# Symlink to orographic statistics fields file with "${CRES}_" and "halo0" stripped from name.
target="${FIXLAM}/${CRES}${DOT_OR_USCORE}oro_data_ls.tile${TILE_RGNL}.halo${NH0}.nc"
symlink="oro_data_ls.nc"
if [ -f "${target}" ]; then
ln_vrfy -sf ${relative_or_null} $target $symlink
else
print_err_msg_exit "\
Cannot create symlink because target does not exist:
target = \"$target}\""
fi
target="${FIXLAM}/${CRES}${DOT_OR_USCORE}oro_data_ss.tile${TILE_RGNL}.halo${NH0}.nc"
symlink="oro_data_ss.nc"
if [ -f "${target}" ]; then
ln_vrfy -sf ${relative_or_null} $target $symlink
else
print_err_msg_exit "\
Cannot create symlink because target does not exist:
target = \"$target}\""
fi
fi
#
# Symlink to halo-4 orography file with "${CRES}_" stripped from name.
#
Expand Down Expand Up @@ -415,6 +437,7 @@ if [ "${USE_CCPP}" = "TRUE" ]; then
if [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
ln_vrfy -sf ${relative_or_null} $EXPTDIR/CCN_ACTIVATE.BIN ${run_dir}
fi
Expand Down
1 change: 1 addition & 0 deletions ush/generate_FV3LAM_wflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,7 @@ the forecast model directory sturcture to the experiment directory..."
if [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
print_info_msg "$VERBOSE" "
Copying the fixed file containing cloud condensation nuclei (CCN) data
Expand Down
14 changes: 12 additions & 2 deletions ush/link_fix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,20 @@ Creating links in the FIXLAM directory to the grid files..."
;;
#
"orog")
if [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
fns=( \
"C*${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH0}.nc" \
"C*${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH4}.nc" \
"C*${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH0}.nc" \
"C*${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH4}.nc" \
"C*${DOT_OR_USCORE}oro_data_ss.tile${TILE_RGNL}.halo${NH0}.nc" \
"C*${DOT_OR_USCORE}oro_data_ls.tile${TILE_RGNL}.halo${NH0}.nc" \
)
else
fns=( \
"C*${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH0}.nc" \
"C*${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH4}.nc" \
)
fi

fps=( "${fns[@]/#/${OROG_DIR}/}" )
run_task="${RUN_TASK_MAKE_OROG}"
;;
Expand Down
13 changes: 13 additions & 0 deletions ush/templates/FV3.input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,18 @@ FV3_RRFS_v0:
lsm: 2
lsoil_lsm: 4

FV3_RRFS_v1beta:
gfs_physics_nml:
<<: *gsd_sar_phys
lsm: 2
lsoil_lsm: 4
imfshalcnv: -1
IMFDEEPCNV: -1
DO_MYNNSFCLAY: true
GWD_OPT: 3
atmos_model_nml:
fdiag: 3

FV3_GFS_2017_gfdlmp:
atmos_model_nml:
avg_max_length: 3600.0
Expand Down Expand Up @@ -429,3 +441,4 @@ FV3_CPT_v0:
xkzm_s: 1.0
nam_sfcperts: !!python/none
surf_map_nml: !!python/none

Loading