Skip to content

Commit

Permalink
HR4 GWD update (#2732)
Browse files Browse the repository at this point in the history 
This update is a combination of the gravity wave drag (GWD) versions
from the NOAA/GSL and NOAA/PSL
  • Loading branch information
@JessicaMeixner-NOAA
JessicaMeixner-NOAA authored Jul 26, 2024
1 parent a7f6b32 commit f156a78
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 5 deletions.
3 changes: 2 additions & 1 deletion parm/config/gefs/config.fcst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,9 @@ if (( gwd_opt == 2 )); then
export do_ugwp_v0_orog_only=".false."
export do_ugwp_v0_nst_only=".false."
export do_gsl_drag_ls_bl=".true."
export do_gsl_drag_ss=".true."
export do_gsl_drag_ss=".false."
export do_gsl_drag_tofd=".true."
export do_gwd_opt_psl=".true."
export do_ugwp_v1_orog_only=".false."
launch_level=$(echo "${LEVS}/2.35" |bc)
export launch_level
Expand Down
3 changes: 2 additions & 1 deletion parm/config/gfs/config.fcst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,9 @@ if (( gwd_opt == 2 )); then
export do_ugwp_v0_orog_only=".false."
export do_ugwp_v0_nst_only=".false."
export do_gsl_drag_ls_bl=".true."
export do_gsl_drag_ss=".true."
export do_gsl_drag_ss=".false."
export do_gsl_drag_tofd=".true."
export do_gwd_opt_psl=".true."
export do_ugwp_v1_orog_only=".false."
launch_level=$(echo "${LEVS}/2.35" |bc)
export launch_level
Expand Down
2 changes: 1 addition & 1 deletion parm/config/gfs/config.ufs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ case "${fv3_res}" in
export knob_ugwp_tauamp=6.0e-3 # setting for UGWPv1 non-stationary GWD
export k_split=1
export n_split=4
export tau=10.0
export tau=8.0
export rf_cutoff=100.0
export fv_sg_adj=3600
export WRITE_GROUP_GDAS=1
Expand Down
2 changes: 1 addition & 1 deletion sorc/ufs_model.fd
Submodule ufs_model.fd updated 80 files
+5 −0 .gitignore
+1 −1 FV3
+1 −1 doc/UsersGuide/requirements.txt
+33 −0 modulefiles/ufs_frontera.intel.lua
+1 −1 tests/bl_date.conf
+1 −1 tests/ci/Jenkinsfile.combined
+107 −0 tests/ci/Jenkinsfile.ort
+2 −0 tests/default_vars.sh
+3 −0 tests/detect_machine.sh
+27 −0 tests/error-test.conf
+1 −1 tests/fv3_conf/control_run.IN
+2 −2 tests/fv3_conf/cpld_control_run.IN
+7 −0 tests/fv3_conf/fv3_qsub.IN_acorn
+7 −0 tests/fv3_conf/fv3_qsub.IN_derecho
+7 −0 tests/fv3_conf/fv3_qsub.IN_wcoss2
+8 −0 tests/fv3_conf/fv3_slurm.IN_expanse
+7 −0 tests/fv3_conf/fv3_slurm.IN_gaea
+7 −0 tests/fv3_conf/fv3_slurm.IN_hera
+7 −0 tests/fv3_conf/fv3_slurm.IN_hercules
+7 −0 tests/fv3_conf/fv3_slurm.IN_jet
+7 −0 tests/fv3_conf/fv3_slurm.IN_noaacloud
+7 −0 tests/fv3_conf/fv3_slurm.IN_orion
+7 −0 tests/fv3_conf/fv3_slurm.IN_s4
+7 −0 tests/fv3_conf/fv3_slurm.IN_stampede
+31 −31 tests/logs/OpnReqTests_control_p8_hera.log
+15 −15 tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
+19 −19 tests/logs/OpnReqTests_regional_control_hera.log
+263 −262 tests/logs/RegressionTests_acorn.log
+278 −283 tests/logs/RegressionTests_derecho.log
+277 −277 tests/logs/RegressionTests_gaea.log
+427 −367 tests/logs/RegressionTests_hera.log
+437 −373 tests/logs/RegressionTests_hercules.log
+248 −248 tests/logs/RegressionTests_jet.log
+280 −279 tests/logs/RegressionTests_orion.log
+232 −232 tests/logs/RegressionTests_wcoss2.log
+7 −0 tests/module-setup.sh
+2 −0 tests/parm/global_control.nml.IN
+3 −3 tests/rt.conf
+12 −6 tests/rt_utils.sh
+2 −4 tests/run_compile.sh
+17 −11 tests/run_test.sh
+116 −0 tests/test_changes.list
+9 −1 tests/tests/cpld_2threads_p8
+8 −0 tests/tests/cpld_bmark_p8
+8 −0 tests/tests/cpld_bmark_p8_35d
+8 −0 tests/tests/cpld_control_c192_p8
+8 −0 tests/tests/cpld_control_c48
+8 −0 tests/tests/cpld_control_ciceC_p8
+8 −0 tests/tests/cpld_control_gfsv17
+8 −0 tests/tests/cpld_control_gfsv17_iau
+8 −0 tests/tests/cpld_control_noaero_p8
+8 −0 tests/tests/cpld_control_noaero_p8_agrid
+8 −0 tests/tests/cpld_control_nowave_noaero_p8
+8 −0 tests/tests/cpld_control_p8
+8 −0 tests/tests/cpld_control_p8.v2.sfc
+8 −0 tests/tests/cpld_control_p8_faster
+8 −0 tests/tests/cpld_control_p8_mixedmode
+8 −0 tests/tests/cpld_control_pdlib_p8
+8 −0 tests/tests/cpld_control_qr_p8
+8 −0 tests/tests/cpld_control_sfs
+8 −0 tests/tests/cpld_debug_gfsv17
+8 −0 tests/tests/cpld_debug_noaero_p8
+8 −0 tests/tests/cpld_debug_p8
+8 −0 tests/tests/cpld_debug_pdlib_p8
+8 −0 tests/tests/cpld_decomp_p8
+8 −2 tests/tests/cpld_mpi_gfsv17
+8 −0 tests/tests/cpld_mpi_p8
+8 −0 tests/tests/cpld_mpi_pdlib_p8
+8 −0 tests/tests/cpld_restart_bmark_p8
+8 −0 tests/tests/cpld_restart_c192_p8
+8 −0 tests/tests/cpld_restart_c48
+8 −0 tests/tests/cpld_restart_gfsv17
+8 −0 tests/tests/cpld_restart_p8
+8 −0 tests/tests/cpld_restart_pdlib_p8
+8 −0 tests/tests/cpld_restart_qr_p8
+8 −0 tests/tests/cpld_s2sa_p8
+8 −0 tests/tests/cpld_warmstart_c48
+86 −0 tests/tests/dependency_unmet
+85 −0 tests/tests/fail_to_copy
+89 −0 tests/tests/fail_to_run
1 change: 1 addition & 0 deletions ush/forecast_postdet.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ FV3_out() {
# Determine the dates for restart files to be copied to COM
local restart_date restart_dates
restart_dates=()

# Copy restarts in the assimilation window for RUN=gdas|enkfgdas|enkfgfs
if [[ "${RUN}" =~ "gdas" || "${RUN}" == "enkfgfs" ]]; then
restart_date="${model_start_date_next_cycle}"
Expand Down
2 changes: 2 additions & 0 deletions ush/parsing_namelists_FV3.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ EOF
do_gsl_drag_ls_bl = ${do_gsl_drag_ls_bl:-".true."}
do_gsl_drag_ss = ${do_gsl_drag_ss:-".true."}
do_gsl_drag_tofd = ${do_gsl_drag_tofd:-".true."}
do_gwd_opt_psl = ${do_gwd_opt_psl:-".false."}
do_ugwp_v1_orog_only = ${do_ugwp_v1_orog_only:-".false."}
min_lakeice = ${min_lakeice:-"0.15"}
min_seaice = ${min_seaice:-"0.15"}
Expand Down Expand Up @@ -369,6 +370,7 @@ cat >> input.nml <<EOF
betadcu = ${betadcu:-"2.0"}
ras = ${ras:-".false."}
cdmbgwd = ${cdmbgwd:-"3.5,0.25"}
psl_gwd_dx_factor = ${psl_gwd_dx_factor:-"6.0"}
prslrd0 = ${prslrd0:-"0."}
ivegsrc = ${ivegsrc:-"1"}
isot = ${isot:-"1"}
Expand Down
2 changes: 2 additions & 0 deletions ush/parsing_namelists_FV3_nest.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ EOF
do_gsl_drag_ls_bl = ${do_gsl_drag_ls_bl:-".true."}
do_gsl_drag_ss = ${do_gsl_drag_ss:-".true."}
do_gsl_drag_tofd = ${do_gsl_drag_tofd:-".true."}
do_gwd_opt_psl = ${do_gwd_opt_psl:-".false."}
do_ugwp_v1_orog_only = ${do_ugwp_v1_orog_only:-".false."}
min_lakeice = ${min_lakeice:-"0.15"}
min_seaice = ${min_seaice:-"0.15"}
Expand Down Expand Up @@ -426,6 +427,7 @@ cat >> "${nml_file}" <<EOF
betadcu = ${betadcu:-"2.0"}
ras = ${ras:-".false."}
cdmbgwd = ${cdmbgwd:-"3.5,0.25"}
psl_gwd_dx_factor = ${psl_gwd_dx_factor:-"6.0"}
prslrd0 = ${prslrd0:-"0."}
ivegsrc = ${ivegsrc:-"1"}
isot = ${isot:-"1"}
Expand Down
2 changes: 1 addition & 1 deletion versions/fix.ver
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export mom6_ver=20240416
export orog_ver=20231027
export reg2grb2_ver=20220805
export sfc_climo_ver=20220805
export ugwd_ver=20231027
export ugwd_ver=20240624
export verif_ver=20220805
export wave_ver=20240105
export orog_nest_ver=global-nest.20240419
Expand Down

0 comments on commit f156a78

Please sign in to comment.