From a0ac5e3abdf82734a1cfc089ca093d86bd9a059c Mon Sep 17 00:00:00 2001 From: Qingfu Liu Date: Mon, 10 Jun 2024 10:33:54 -0400 Subject: [PATCH 01/16] update scripts parsing_namelists_FV3.sh parsing_namelists_FV3_nest.sh --- ush/parsing_namelists_FV3.sh | 3 +++ ush/parsing_namelists_FV3_nest.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/ush/parsing_namelists_FV3.sh b/ush/parsing_namelists_FV3.sh index b88849d7e7..c5d20c8017 100755 --- a/ush/parsing_namelists_FV3.sh +++ b/ush/parsing_namelists_FV3.sh @@ -284,6 +284,9 @@ 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."} + psl_gwd_dx_factor = ${psl_gwd_dx_factor:-"6.0"} + psl_gwd_z0m_factor = ${psl_gwd_z0m_factor:-"0.003"} do_ugwp_v1_orog_only = ${do_ugwp_v1_orog_only:-".false."} min_lakeice = ${min_lakeice:-"0.15"} min_seaice = ${min_seaice:-"0.15"} diff --git a/ush/parsing_namelists_FV3_nest.sh b/ush/parsing_namelists_FV3_nest.sh index 2f99a1cdf5..675760a839 100755 --- a/ush/parsing_namelists_FV3_nest.sh +++ b/ush/parsing_namelists_FV3_nest.sh @@ -342,6 +342,9 @@ 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."} + psl_gwd_dx_factor = ${psl_gwd_dx_factor:-"6.0"} + psl_gwd_z0m_factor = ${psl_gwd_z0m_factor:-"0.003"} do_ugwp_v1_orog_only = ${do_ugwp_v1_orog_only:-".false."} min_lakeice = ${min_lakeice:-"0.15"} min_seaice = ${min_seaice:-"0.15"} From c1688a49bbcd1044e257ec0a92c22e04755610df Mon Sep 17 00:00:00 2001 From: Qingfu Liu Date: Mon, 10 Jun 2024 10:45:34 -0400 Subject: [PATCH 02/16] update config.fcst file for gfs and gefs --- parm/config/gefs/config.fcst | 1 + parm/config/gfs/config.fcst | 1 + 2 files changed, 2 insertions(+) diff --git a/parm/config/gefs/config.fcst b/parm/config/gefs/config.fcst index 12e461cef8..e9d15edba7 100644 --- a/parm/config/gefs/config.fcst +++ b/parm/config/gefs/config.fcst @@ -109,6 +109,7 @@ if (( gwd_opt == 2 )); then export do_gsl_drag_ls_bl=".true." export do_gsl_drag_ss=".true." 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 diff --git a/parm/config/gfs/config.fcst b/parm/config/gfs/config.fcst index f45874a31a..2e8be3366a 100644 --- a/parm/config/gfs/config.fcst +++ b/parm/config/gfs/config.fcst @@ -121,6 +121,7 @@ if (( gwd_opt == 2 )); then export do_gsl_drag_ls_bl=".true." export do_gsl_drag_ss=".true." 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 From 0aed4eff0d8ed7efb0306c0f74063f2f551bd46f Mon Sep 17 00:00:00 2001 From: Qingfu Liu Date: Sat, 22 Jun 2024 12:47:23 -0400 Subject: [PATCH 03/16] update control variables for HR4-GWD-update --- parm/config/gfs/config.fcst | 5 +++-- ush/parsing_namelists_FV3.sh | 3 +-- ush/parsing_namelists_FV3_nest.sh | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/parm/config/gfs/config.fcst b/parm/config/gfs/config.fcst index 2e8be3366a..3323107ba7 100644 --- a/parm/config/gfs/config.fcst +++ b/parm/config/gfs/config.fcst @@ -39,7 +39,8 @@ case ${RUN} in export FHOUT=${FHOUT_GFS} export FHMAX_HF=${FHMAX_HF_GFS} export FHOUT_HF=${FHOUT_HF_GFS} - export FHOUT_OCNICE=${FHOUT_OCNICE_GFS} + export FHOUT_OCN=${FHOUT_OCN_GFS} + export FHOUT_ICE=${FHOUT_ICE_GFS} ;; *gdas) export FHMAX_HF=0 @@ -119,7 +120,7 @@ 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." diff --git a/ush/parsing_namelists_FV3.sh b/ush/parsing_namelists_FV3.sh index c5d20c8017..08746423c8 100755 --- a/ush/parsing_namelists_FV3.sh +++ b/ush/parsing_namelists_FV3.sh @@ -285,8 +285,6 @@ EOF 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."} - psl_gwd_dx_factor = ${psl_gwd_dx_factor:-"6.0"} - psl_gwd_z0m_factor = ${psl_gwd_z0m_factor:-"0.003"} do_ugwp_v1_orog_only = ${do_ugwp_v1_orog_only:-".false."} min_lakeice = ${min_lakeice:-"0.15"} min_seaice = ${min_seaice:-"0.15"} @@ -372,6 +370,7 @@ cat >> input.nml <> "${nml_file}" < Date: Sat, 22 Jun 2024 12:58:24 -0400 Subject: [PATCH 04/16] update control variable in config.fcst --- parm/config/gefs/config.fcst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/config/gefs/config.fcst b/parm/config/gefs/config.fcst index 7397f6025c..bf24c4e906 100644 --- a/parm/config/gefs/config.fcst +++ b/parm/config/gefs/config.fcst @@ -108,7 +108,7 @@ 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." From 77474e059f7243925655d32cca360de6ac42b95e Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 26 Jun 2024 17:41:38 +0000 Subject: [PATCH 05/16] point to branch of UFS --- .gitmodules | 3 ++- sorc/ufs_model.fd | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5c9e569243..a8c370852f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "sorc/ufs_model.fd"] path = sorc/ufs_model.fd - url = https://github.com/ufs-community/ufs-weather-model + url = https://github.com/Qingfu-Liu/ufs-weather-model + #url = https://github.com/ufs-community/ufs-weather-model ignore = dirty [submodule "sorc/wxflow"] path = sorc/wxflow diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 485ccdfc4a..1172b9c95a 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 485ccdfc4a7ed6deeb02d82c2cebe51b37e892f5 +Subproject commit 1172b9c95a7cd2c21a699129ab95812dc6592d73 From 83af198f32cef3a78951301e10b6233fd55eec9c Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 26 Jun 2024 18:07:15 +0000 Subject: [PATCH 06/16] update version number of ugwd fix --- versions/fix.ver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/fix.ver b/versions/fix.ver index 1d54572c0b..acac25d82b 100644 --- a/versions/fix.ver +++ b/versions/fix.ver @@ -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 From 1483aea8423c0529717f2a24b8bc71b4ec5faf2f Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 26 Jun 2024 18:21:05 +0000 Subject: [PATCH 07/16] updates for CICE with model update --- ush/parsing_namelists_CICE.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ush/parsing_namelists_CICE.sh b/ush/parsing_namelists_CICE.sh index aa495d1864..3822094c97 100755 --- a/ush/parsing_namelists_CICE.sh +++ b/ush/parsing_namelists_CICE.sh @@ -59,6 +59,7 @@ local CICE_RUNID="unknown" local CICE_USE_RESTART_TIME=${use_restart_time} local CICE_RESTART_DIR="./CICE_RESTART/" local CICE_RESTART_FILE="cice_model.res" +local CICE_ICE_IC='cice_model.res.nc' local CICE_RESTART_DEFLATE=0 local CICE_RESTART_CHUNK=0,0 local CICE_RESTART_STRIDE=-99 @@ -117,6 +118,12 @@ local CICE_NPROC=${ntasks_cice6} local CICE_BLCKX=${block_size_x} local CICE_BLCKY=${block_size_y} local CICE_DECOMP=${processor_shape} +# ice_prescribed_nml section +local CICE_PRESCRIBED="false" +local MESH_DICE="none" +local stream_files_dice="none" + + # Ensure the template exists local template=${CICE_TEMPLATE:-"${PARMgfs}/ufs/ice_in.IN"} From b775719513dcc5badc473000d6c9882c529a62b7 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Thu, 27 Jun 2024 12:58:29 +0000 Subject: [PATCH 08/16] add variable for ufs.configure --- ush/parsing_ufs_configure.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ush/parsing_ufs_configure.sh b/ush/parsing_ufs_configure.sh index 24ea80e56c..1c58425fac 100755 --- a/ush/parsing_ufs_configure.sh +++ b/ush/parsing_ufs_configure.sh @@ -39,6 +39,8 @@ if [[ "${cpl}" = ".true." ]]; then local coupling_interval_slow_sec="${CPL_SLOW}" fi +local WRITE_ENDOFRUN_RESTART=.false. + if [[ "${cplflx}" = ".true." ]]; then local use_coldstart=${use_coldstart:-".false."} From e41e7002ceef62d93770537cc22c10965f0828f1 Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Tue, 2 Jul 2024 10:43:57 -0500 Subject: [PATCH 09/16] updates for running latest model --- sorc/ufs_model.fd | 2 +- ush/forecast_postdet.sh | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 1172b9c95a..fc39323125 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 1172b9c95a7cd2c21a699129ab95812dc6592d73 +Subproject commit fc393231255ab6f5bc4bf8ac06871480eb4abfdc diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh index 993331d70b..204a6c9024 100755 --- a/ush/forecast_postdet.sh +++ b/ush/forecast_postdet.sh @@ -252,9 +252,17 @@ FV3_out() { ${NCP} "${DATA}/diag_table" "${COMOUT_CONF}/ufs.diag_table" - # Determine the dates for restart files to be copied to COM - local restart_date restart_dates - restart_dates=() + # Create an array of fv3 restart files + local fv3_restart_files tile_files fv3_restart_file restart_file + fv3_restart_files=(coupler.res fv_core.res.nc) + tile_files=(fv_core.res fv_srf_wnd.res fv_tracer.res phy_data sfc_data ca_data) + local nn tt + for (( nn = 1; nn <= ntiles; nn++ )); do + for tt in "${tile_files[@]}"; do + fv3_restart_files+=("${tt}.tile${nn}.nc") + done + done + # Copy restarts in the assimilation window for RUN=gdas|enkfgdas|enkfgfs if [[ "${RUN}" =~ "gdas" || "${RUN}" == "enkfgfs" ]]; then restart_date="${model_start_date_next_cycle}" From e4813209c1ec5c8d5e104b7e81b3b5767ac3d0d0 Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Tue, 2 Jul 2024 10:45:58 -0500 Subject: [PATCH 10/16] fix unintentional change --- ush/forecast_postdet.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh index 204a6c9024..7de31d6235 100755 --- a/ush/forecast_postdet.sh +++ b/ush/forecast_postdet.sh @@ -252,16 +252,9 @@ FV3_out() { ${NCP} "${DATA}/diag_table" "${COMOUT_CONF}/ufs.diag_table" - # Create an array of fv3 restart files - local fv3_restart_files tile_files fv3_restart_file restart_file - fv3_restart_files=(coupler.res fv_core.res.nc) - tile_files=(fv_core.res fv_srf_wnd.res fv_tracer.res phy_data sfc_data ca_data) - local nn tt - for (( nn = 1; nn <= ntiles; nn++ )); do - for tt in "${tile_files[@]}"; do - fv3_restart_files+=("${tt}.tile${nn}.nc") - done - done + # 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 From ac09ed408affaf33b2b2187060e76919209d613e Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 5 Jul 2024 13:00:34 +0000 Subject: [PATCH 11/16] update model to latest in branch --- sorc/ufs_model.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index fc39323125..b2ee782678 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit fc393231255ab6f5bc4bf8ac06871480eb4abfdc +Subproject commit b2ee782678a6bed721f1b8441292364b22d92722 From bd5e6856c9aa92e5abd63a7342f615da9902d097 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Thu, 11 Jul 2024 15:03:38 +0000 Subject: [PATCH 12/16] update ufs-weather-model to latest hash --- .gitmodules | 3 +-- sorc/ufs_model.fd | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a8c370852f..5c9e569243 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,6 @@ [submodule "sorc/ufs_model.fd"] path = sorc/ufs_model.fd - url = https://github.com/Qingfu-Liu/ufs-weather-model - #url = https://github.com/ufs-community/ufs-weather-model + url = https://github.com/ufs-community/ufs-weather-model ignore = dirty [submodule "sorc/wxflow"] path = sorc/wxflow diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index b2ee782678..d3daaf1bc4 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit b2ee782678a6bed721f1b8441292364b22d92722 +Subproject commit d3daaf1bc477bf5aabb1dbddc1e12f92278d7498 From f7bdf14b472d07ec285a1bf71f183420cc83fb5c Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Thu, 11 Jul 2024 17:18:44 +0000 Subject: [PATCH 13/16] update ufs --- sorc/ufs_model.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index d3daaf1bc4..0b59ad3dbc 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit d3daaf1bc477bf5aabb1dbddc1e12f92278d7498 +Subproject commit 0b59ad3dbc8c84bb453a1fd782c2eb55accb37a7 From 16c98a2bae47d93dd9faf8b9bee3d9eb33412f53 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Tue, 16 Jul 2024 16:46:23 +0000 Subject: [PATCH 14/16] update ufsmodel with bugfix commit --- sorc/ufs_model.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 0b59ad3dbc..73424e2d12 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 0b59ad3dbc8c84bb453a1fd782c2eb55accb37a7 +Subproject commit 73424e2d12af2632afbad7d26a1942df088423e8 From c174659a4adad9347a6d3619a26cab82abcc2741 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 22 Jul 2024 18:20:17 +0000 Subject: [PATCH 15/16] update ufs --- sorc/ufs_model.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 73424e2d12..c12760125c 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 73424e2d12af2632afbad7d26a1942df088423e8 +Subproject commit c12760125ce7c5a85e8ced92d7f37c9ad6a59afe From 3bf9d213767f399e348fcf9c6e60116f91f956b2 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 22 Jul 2024 18:21:15 +0000 Subject: [PATCH 16/16] update C48 tau value to address instability --- parm/config/gfs/config.ufs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs index f630226826..148793927f 100644 --- a/parm/config/gfs/config.ufs +++ b/parm/config/gfs/config.ufs @@ -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