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

Jump to bottom

HR4 GWD update #2732

Merged
merged 26 commits into from
Jul 26, 2024
Merged

HR4 GWD update #2732

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a0ac5e3
update scripts parsing_namelists_FV3.sh parsing_namelists_FV3_nest.sh
Qingfu-Liu Jun 10, 2024
c1688a4
update config.fcst file for gfs and gefs
Qingfu-Liu Jun 10, 2024
0aed4ef
update control variables for HR4-GWD-update
Qingfu-Liu Jun 22, 2024
97e118a
Merge remote-tracking branch 'origin/develop' into HR4-GWD-update
Qingfu-Liu Jun 22, 2024
2c9d679
update control variable in config.fcst
Qingfu-Liu Jun 22, 2024
83a71b9
Merge remote-tracking branch 'EMC/develop' into HR4-GWD-update
JessicaMeixner-NOAA Jun 26, 2024
77474e0
point to branch of UFS
JessicaMeixner-NOAA Jun 26, 2024
83af198
update version number of ugwd fix
JessicaMeixner-NOAA Jun 26, 2024
1483aea
updates for CICE with model update
JessicaMeixner-NOAA Jun 26, 2024
b775719
add variable for ufs.configure
JessicaMeixner-NOAA Jun 27, 2024
b8a28f5
Merge branch 'NOAA-EMC:develop' into HR4-GWD-update
JessicaMeixner-NOAA Jun 27, 2024
4f841b6
Merge branch 'NOAA-EMC:develop' into HR4-GWD-update
JessicaMeixner-NOAA Jul 2, 2024
e41e700
updates for running latest model
JessicaMeixner-NOAA Jul 2, 2024
e481320
fix unintentional change
JessicaMeixner-NOAA Jul 2, 2024
1399dbf
Merge remote-tracking branch 'EMC/develop' into HR4-GWD-update
JessicaMeixner-NOAA Jul 5, 2024
ac09ed4
update model to latest in branch
JessicaMeixner-NOAA Jul 5, 2024
d0d37e7
Merge remote-tracking branch 'EMC/develop' into HR4-GWD-update
JessicaMeixner-NOAA Jul 11, 2024
bd5e685
update ufs-weather-model to latest hash
JessicaMeixner-NOAA Jul 11, 2024
f7bdf14
update ufs
JessicaMeixner-NOAA Jul 11, 2024
ad4dfad
Merge branch 'develop' into HR4-GWD-update
JessicaMeixner-NOAA Jul 11, 2024
91d8bfb
Merge branch 'NOAA-EMC:develop' into HR4-GWD-update
JessicaMeixner-NOAA Jul 16, 2024
16c98a2
update ufsmodel with bugfix commit
JessicaMeixner-NOAA Jul 16, 2024
01a6b0b
Merge branch 'NOAA-EMC:develop' into HR4-GWD-update
JessicaMeixner-NOAA Jul 22, 2024
c174659
update ufs
JessicaMeixner-NOAA Jul 22, 2024
3bf9d21
update C48 tau value to address instability
JessicaMeixner-NOAA Jul 22, 2024
0c745ea
Merge branch 'NOAA-EMC:develop' into HR4-GWD-update
JessicaMeixner-NOAA Jul 23, 2024
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
3 changes: 2 additions & 1 deletion parm/config/gefs/config.fcst
View file
Open in desktop
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
Open in desktop
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 sorc/ufs_model.fd
Open in desktop
Submodule ufs_model.fd updated 56 files
+1 −1 FV3
+1 −1 tests/bl_date.conf
+1 −1 tests/ci/Jenkinsfile.combined
+107 −0 tests/ci/Jenkinsfile.ort
+2 −0 tests/default_vars.sh
+1 −1 tests/fv3_conf/control_run.IN
+2 −2 tests/fv3_conf/cpld_control_run.IN
+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
+275 −275 tests/logs/RegressionTests_gaea.log
+432 −369 tests/logs/RegressionTests_hera.log
+372 −373 tests/logs/RegressionTests_hercules.log
+245 −245 tests/logs/RegressionTests_jet.log
+279 −279 tests/logs/RegressionTests_orion.log
+232 −232 tests/logs/RegressionTests_wcoss2.log
+2 −0 tests/parm/global_control.nml.IN
+3 −3 tests/rt.conf
+106 −2 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
1 change: 1 addition & 0 deletions ush/forecast_postdet.sh
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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
Loading