From e52d141aca49a93d21885fb61103be8f1e3f539b Mon Sep 17 00:00:00 2001 From: "fanglin.yang" Date: Tue, 7 May 2024 03:14:33 +0000 Subject: [PATCH 01/12] On branch dycore_update_hr4 Changes to be committed: modified: parm/config/gefs/config.fcst parm/config/gefs/config.ufs parm/config/gfs/config.fcst parm/config/gfs/config.ufs Apply new damping and time-step options to all supported atmos resolutions and to both GFS and GEFS. Apply the same damping to both GFS and GDAS cycles. Stronger damping was applied to GDAS in GFSv16. This new damping option includes both explicit Rayleigh damping aaplied to u and v and implicit damping applied to w. --- parm/config/gefs/config.fcst | 19 ++++++++++-------- parm/config/gefs/config.ufs | 39 ++++++++++++++++++++++++++++++++++-- parm/config/gfs/config.fcst | 19 ++++++++++-------- parm/config/gfs/config.ufs | 39 ++++++++++++++++++++++++++++++++++-- 4 files changed, 96 insertions(+), 20 deletions(-) diff --git a/parm/config/gefs/config.fcst b/parm/config/gefs/config.fcst index 5c592556c8..cadb3d9b3e 100644 --- a/parm/config/gefs/config.fcst +++ b/parm/config/gefs/config.fcst @@ -108,18 +108,21 @@ if (( gwd_opt == 2 )); then fi # Sponge layer settings -export tau=0. -export rf_cutoff=10. +# export tau=0. ; #moved to config.ufs +# export rf_cutoff=10. ; #moved to config.ufs + export d2_bg_k1=0.20 export d2_bg_k2=0.04 export dz_min=6 export n_sponge=42 -if (( LEVS == 128 )) && [[ "${CDUMP}" =~ "gdas" ]]; then - export tau=5.0 - export rf_cutoff=1.0e3 - export d2_bg_k1=0.20 - export d2_bg_k2=0.0 -fi + +## comment out the follow 6 lines to apply the same damping options to both GFS and GDAS cycles +#if (( LEVS == 128 )) && [[ "${CDUMP}" =~ "gdas" ]]; then +# export tau=5.0 +# export rf_cutoff=1.0e3 +# export d2_bg_k1=0.20 +# export d2_bg_k2=0.0 +#fi # PBL/turbulance schemes export hybedmf=".false." diff --git a/parm/config/gefs/config.ufs b/parm/config/gefs/config.ufs index b8695b6dbb..b16862a24b 100644 --- a/parm/config/gefs/config.ufs +++ b/parm/config/gefs/config.ufs @@ -82,6 +82,11 @@ case "${fv3_res}" in export nthreads_ufs_gfs=1 export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="40.0,1.77,1.0,1.0" # settings for GSL drag suite + export k_split=1 + export n_split=4 + export tau=10.0 + export rf_cutoff=100.0 + export fv_sg_adj=3600 export knob_ugwp_tauamp=6.0e-3 # setting for UGWPv1 non-stationary GWD export WRITE_GROUP=1 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=1 @@ -101,13 +106,18 @@ case "${fv3_res}" in export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="20.0,2.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=3.0e-3 # setting for UGWPv1 non-stationary GWD + export k_split=1 + export n_split=4 + export tau=8.0 + export rf_cutoff=100.0 + export fv_sg_adj=1800 export WRITE_GROUP=1 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=1 export WRITE_GROUP_GFS=1 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=1 ;; "C192") - export DELTIM=450 + export DELTIM=600 export layout_x=4 export layout_y=6 export layout_x_gfs=4 @@ -119,6 +129,11 @@ case "${fv3_res}" in export cdmbgwd="0.23,1.5,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="10.0,3.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=1.5e-3 # setting for UGWPv1 non-stationary GWD + export k_split=2 + export n_split=4 + export tau=6.0 + export rf_cutoff=100.0 + export fv_sg_adj=1800 export WRITE_GROUP=1 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 export WRITE_GROUP_GFS=2 @@ -137,6 +152,11 @@ case "${fv3_res}" in export cdmbgwd="1.1,0.72,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="5.0,5.0,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=0.8e-3 # setting for UGWPv1 non-stationary GWD + export k_split=2 + export n_split=4 + export tau=4.0 + export rf_cutoff=100.0 + export fv_sg_adj=900 export WRITE_GROUP=2 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=8 export WRITE_GROUP_GFS=2 @@ -155,13 +175,18 @@ case "${fv3_res}" in export cdmbgwd="4.0,0.15,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="2.5,7.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=0.5e-3 # setting for UGWPv1 non-stationary GWD + export k_split=2 + export n_split=4 + export tau=3.0 + export rf_cutoff=100.0 + export fv_sg_adj=450 export WRITE_GROUP=2 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 export WRITE_GROUP_GFS=4 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=20 #Note this should be 10 for WCOSS2 ;; "C1152") - export DELTIM=120 + export DELTIM=150 export layout_x=8 export layout_y=16 export layout_x_gfs=8 @@ -173,6 +198,11 @@ case "${fv3_res}" in export cdmbgwd="4.0,0.10,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="1.67,8.8,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=0.35e-3 # setting for UGWPv1 non-stationary GWD + export k_split=2 + export n_split=6 + export tau=2.5 + export rf_cutoff=100.0 + export fv_sg_adj=450 export WRITE_GROUP=4 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 # TODO: refine these numbers when a case is available export WRITE_GROUP_GFS=4 @@ -191,6 +221,11 @@ case "${fv3_res}" in export cdmbgwd="4.0,0.05,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="0.625,14.1,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=0.13e-3 # setting for UGWPv1 non-stationary GWD + export k_split=4 + export n_split=5 + export tau=0.5 + export rf_cutoff=100.0 + export fv_sg_adj=300 export WRITE_GROUP=4 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 # TODO: refine these numbers when a case is available export WRITE_GROUP_GFS=4 diff --git a/parm/config/gfs/config.fcst b/parm/config/gfs/config.fcst index 63273e0fe4..33ba33af61 100644 --- a/parm/config/gfs/config.fcst +++ b/parm/config/gfs/config.fcst @@ -120,18 +120,21 @@ if (( gwd_opt == 2 )); then fi # Sponge layer settings -export tau=0. -export rf_cutoff=10. +# export tau=0. ; #moved to config.ufs +# export rf_cutoff=10. ; #moved to config.ufs + export d2_bg_k1=0.20 export d2_bg_k2=0.04 export dz_min=6 export n_sponge=42 -if (( LEVS == 128 )) && [[ "${CDUMP}" =~ "gdas" ]]; then - export tau=5.0 - export rf_cutoff=1.0e3 - export d2_bg_k1=0.20 - export d2_bg_k2=0.0 -fi + +## comment out the follow 6 lines to apply the same damping options to both GFS and GDAS cycles +#if (( LEVS == 128 )) && [[ "${CDUMP}" =~ "gdas" ]]; then +# export tau=5.0 +# export rf_cutoff=1.0e3 +# export d2_bg_k1=0.20 +# export d2_bg_k2=0.0 +#fi # PBL/turbulance schemes export hybedmf=".false." diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs index e37e46cf70..103591d50b 100644 --- a/parm/config/gfs/config.ufs +++ b/parm/config/gfs/config.ufs @@ -99,6 +99,11 @@ case "${fv3_res}" in export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="40.0,1.77,1.0,1.0" # settings for GSL drag suite 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 rf_cutoff=100.0 + export fv_sg_adj=3600 export WRITE_GROUP=1 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=1 export WRITE_GROUP_GFS=1 @@ -135,6 +140,11 @@ case "${fv3_res}" in export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="20.0,2.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=3.0e-3 # setting for UGWPv1 non-stationary GWD + export k_split=1 + export n_split=4 + export tau=8.0 + export rf_cutoff=100.0 + export fv_sg_adj=1800 export WRITE_GROUP=1 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=1 export WRITE_GROUP_GFS=1 @@ -160,7 +170,7 @@ case "${fv3_res}" in export WRITE_GROUP_GFS=2 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=15 else - export DELTIM=450 + export DELTIM=600 export layout_x=4 export layout_y=6 export layout_x_gfs=4 @@ -172,6 +182,11 @@ case "${fv3_res}" in export cdmbgwd="0.23,1.5,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="10.0,3.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=1.5e-3 # setting for UGWPv1 non-stationary GWD + export k_split=2 + export n_split=4 + export tau=6.0 + export rf_cutoff=100.0 + export fv_sg_adj=1800 export WRITE_GROUP=1 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 export WRITE_GROUP_GFS=2 @@ -211,6 +226,11 @@ case "${fv3_res}" in export cdmbgwd="1.1,0.72,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="5.0,5.0,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=0.8e-3 # setting for UGWPv1 non-stationary GWD + export k_split=2 + export n_split=4 + export tau=4.0 + export rf_cutoff=100.0 + export fv_sg_adj=900 export WRITE_GROUP=4 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 export WRITE_GROUP_GFS=4 @@ -252,6 +272,11 @@ case "${fv3_res}" in export cdmbgwd="4.0,0.15,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="2.5,7.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=0.5e-3 # setting for UGWPv1 non-stationary GWD + export k_split=2 + export n_split=4 + export tau=3.0 + export rf_cutoff=100.0 + export fv_sg_adj=450 export WRITE_GROUP=2 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 export WRITE_GROUP_GFS=4 @@ -259,7 +284,7 @@ case "${fv3_res}" in fi ;; "C1152") - export DELTIM=120 + export DELTIM=150 export layout_x=8 export layout_y=16 export layout_x_gfs=8 @@ -271,6 +296,11 @@ case "${fv3_res}" in export cdmbgwd="4.0,0.10,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="1.67,8.8,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=0.35e-3 # setting for UGWPv1 non-stationary GWD + export k_split=2 + export n_split=6 + export tau=2.5 + export rf_cutoff=100.0 + export fv_sg_adj=450 export WRITE_GROUP=4 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 # TODO: refine these numbers when a case is available export WRITE_GROUP_GFS=4 @@ -289,6 +319,11 @@ case "${fv3_res}" in export cdmbgwd="4.0,0.05,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="0.625,14.1,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=0.13e-3 # setting for UGWPv1 non-stationary GWD + export k_split=4 + export n_split=5 + export tau=0.5 + export rf_cutoff=100.0 + export fv_sg_adj=300 export WRITE_GROUP=4 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 # TODO: refine these numbers when a case is available export WRITE_GROUP_GFS=4 From 7028a734fa220e92285fdf17f149377b0157c972 Mon Sep 17 00:00:00 2001 From: "fanglin.yang" Date: Tue, 7 May 2024 05:00:34 +0000 Subject: [PATCH 02/12] remove old comments and clean up indentation mismatches --- parm/config/gefs/config.fcst | 12 ----------- parm/config/gefs/config.ufs | 40 +++++++++++++++++----------------- parm/config/gfs/config.fcst | 12 ----------- parm/config/gfs/config.ufs | 42 ++++++++++++++++++------------------ 4 files changed, 41 insertions(+), 65 deletions(-) diff --git a/parm/config/gefs/config.fcst b/parm/config/gefs/config.fcst index cadb3d9b3e..8cccd0ce31 100644 --- a/parm/config/gefs/config.fcst +++ b/parm/config/gefs/config.fcst @@ -107,23 +107,11 @@ if (( gwd_opt == 2 )); then export launch_level fi -# Sponge layer settings -# export tau=0. ; #moved to config.ufs -# export rf_cutoff=10. ; #moved to config.ufs - export d2_bg_k1=0.20 export d2_bg_k2=0.04 export dz_min=6 export n_sponge=42 -## comment out the follow 6 lines to apply the same damping options to both GFS and GDAS cycles -#if (( LEVS == 128 )) && [[ "${CDUMP}" =~ "gdas" ]]; then -# export tau=5.0 -# export rf_cutoff=1.0e3 -# export d2_bg_k1=0.20 -# export d2_bg_k2=0.0 -#fi - # PBL/turbulance schemes export hybedmf=".false." export satmedmf=".true." diff --git a/parm/config/gefs/config.ufs b/parm/config/gefs/config.ufs index b16862a24b..ada90f3505 100644 --- a/parm/config/gefs/config.ufs +++ b/parm/config/gefs/config.ufs @@ -82,10 +82,10 @@ case "${fv3_res}" in export nthreads_ufs_gfs=1 export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="40.0,1.77,1.0,1.0" # settings for GSL drag suite - export k_split=1 - export n_split=4 - export tau=10.0 - export rf_cutoff=100.0 + export k_split=1 + export n_split=4 + export tau=10.0 + export rf_cutoff=100.0 export fv_sg_adj=3600 export knob_ugwp_tauamp=6.0e-3 # setting for UGWPv1 non-stationary GWD export WRITE_GROUP=1 @@ -129,11 +129,11 @@ case "${fv3_res}" in export cdmbgwd="0.23,1.5,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="10.0,3.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=1.5e-3 # setting for UGWPv1 non-stationary GWD - export k_split=2 - export n_split=4 - export tau=6.0 - export rf_cutoff=100.0 - export fv_sg_adj=1800 + export k_split=2 + export n_split=4 + export tau=6.0 + export rf_cutoff=100.0 + export fv_sg_adj=1800 export WRITE_GROUP=1 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 export WRITE_GROUP_GFS=2 @@ -175,11 +175,11 @@ case "${fv3_res}" in export cdmbgwd="4.0,0.15,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="2.5,7.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=0.5e-3 # setting for UGWPv1 non-stationary GWD - export k_split=2 - export n_split=4 - export tau=3.0 - export rf_cutoff=100.0 - export fv_sg_adj=450 + export k_split=2 + export n_split=4 + export tau=3.0 + export rf_cutoff=100.0 + export fv_sg_adj=450 export WRITE_GROUP=2 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 export WRITE_GROUP_GFS=4 @@ -202,7 +202,7 @@ case "${fv3_res}" in export n_split=6 export tau=2.5 export rf_cutoff=100.0 - export fv_sg_adj=450 + export fv_sg_adj=450 export WRITE_GROUP=4 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 # TODO: refine these numbers when a case is available export WRITE_GROUP_GFS=4 @@ -221,11 +221,11 @@ case "${fv3_res}" in export cdmbgwd="4.0,0.05,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="0.625,14.1,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=0.13e-3 # setting for UGWPv1 non-stationary GWD - export k_split=4 - export n_split=5 - export tau=0.5 - export rf_cutoff=100.0 - export fv_sg_adj=300 + export k_split=4 + export n_split=5 + export tau=0.5 + export rf_cutoff=100.0 + export fv_sg_adj=300 export WRITE_GROUP=4 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 # TODO: refine these numbers when a case is available export WRITE_GROUP_GFS=4 diff --git a/parm/config/gfs/config.fcst b/parm/config/gfs/config.fcst index 33ba33af61..1d79b89599 100644 --- a/parm/config/gfs/config.fcst +++ b/parm/config/gfs/config.fcst @@ -119,23 +119,11 @@ if (( gwd_opt == 2 )); then export launch_level fi -# Sponge layer settings -# export tau=0. ; #moved to config.ufs -# export rf_cutoff=10. ; #moved to config.ufs - export d2_bg_k1=0.20 export d2_bg_k2=0.04 export dz_min=6 export n_sponge=42 -## comment out the follow 6 lines to apply the same damping options to both GFS and GDAS cycles -#if (( LEVS == 128 )) && [[ "${CDUMP}" =~ "gdas" ]]; then -# export tau=5.0 -# export rf_cutoff=1.0e3 -# export d2_bg_k1=0.20 -# export d2_bg_k2=0.0 -#fi - # PBL/turbulance schemes export hybedmf=".false." if [[ "${CCPP_SUITE}" == "FV3_global_nest"* ]]; then diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs index 103591d50b..1ac7205897 100644 --- a/parm/config/gfs/config.ufs +++ b/parm/config/gfs/config.ufs @@ -99,11 +99,11 @@ case "${fv3_res}" in export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="40.0,1.77,1.0,1.0" # settings for GSL drag suite 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 rf_cutoff=100.0 - export fv_sg_adj=3600 + export k_split=1 + export n_split=4 + export tau=10.0 + export rf_cutoff=100.0 + export fv_sg_adj=3600 export WRITE_GROUP=1 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=1 export WRITE_GROUP_GFS=1 @@ -183,10 +183,10 @@ case "${fv3_res}" in export cdmbgwd_gsl="10.0,3.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=1.5e-3 # setting for UGWPv1 non-stationary GWD export k_split=2 - export n_split=4 - export tau=6.0 - export rf_cutoff=100.0 - export fv_sg_adj=1800 + export n_split=4 + export tau=6.0 + export rf_cutoff=100.0 + export fv_sg_adj=1800 export WRITE_GROUP=1 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 export WRITE_GROUP_GFS=2 @@ -272,10 +272,10 @@ case "${fv3_res}" in export cdmbgwd="4.0,0.15,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="2.5,7.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=0.5e-3 # setting for UGWPv1 non-stationary GWD - export k_split=2 - export n_split=4 - export tau=3.0 - export rf_cutoff=100.0 + export k_split=2 + export n_split=4 + export tau=3.0 + export rf_cutoff=100.0 export fv_sg_adj=450 export WRITE_GROUP=2 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 @@ -296,10 +296,10 @@ case "${fv3_res}" in export cdmbgwd="4.0,0.10,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="1.67,8.8,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=0.35e-3 # setting for UGWPv1 non-stationary GWD - export k_split=2 - export n_split=6 - export tau=2.5 - export rf_cutoff=100.0 + export k_split=2 + export n_split=6 + export tau=2.5 + export rf_cutoff=100.0 export fv_sg_adj=450 export WRITE_GROUP=4 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 # TODO: refine these numbers when a case is available @@ -319,10 +319,10 @@ case "${fv3_res}" in export cdmbgwd="4.0,0.05,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="0.625,14.1,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=0.13e-3 # setting for UGWPv1 non-stationary GWD - export k_split=4 - export n_split=5 - export tau=0.5 - export rf_cutoff=100.0 + export k_split=4 + export n_split=5 + export tau=0.5 + export rf_cutoff=100.0 export fv_sg_adj=300 export WRITE_GROUP=4 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 # TODO: refine these numbers when a case is available From 04161ab3324e42d017c376e7fc3df04a9b09eed4 Mon Sep 17 00:00:00 2001 From: Fanglin Yang Date: Tue, 7 May 2024 08:56:14 -0400 Subject: [PATCH 03/12] Update parm/config/gefs/config.ufs Co-authored-by: Walter Kolczynski - NOAA --- parm/config/gefs/config.ufs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parm/config/gefs/config.ufs b/parm/config/gefs/config.ufs index ada90f3505..a5fb33d6ab 100644 --- a/parm/config/gefs/config.ufs +++ b/parm/config/gefs/config.ufs @@ -107,9 +107,9 @@ case "${fv3_res}" in export cdmbgwd_gsl="20.0,2.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=3.0e-3 # setting for UGWPv1 non-stationary GWD export k_split=1 - export n_split=4 - export tau=8.0 - export rf_cutoff=100.0 + export n_split=4 + export tau=8.0 + export rf_cutoff=100.0 export fv_sg_adj=1800 export WRITE_GROUP=1 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=1 From 2d7f1c019c6ac2bbadafaeecb115a44d4614d61b Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Tue, 7 May 2024 10:31:12 -0500 Subject: [PATCH 04/12] Add xr_cnvcld flag to namelist and configure files --- parm/config/gefs/config.ufs | 4 +++- parm/config/gfs/config.ufs | 4 +++- ush/parsing_namelists_FV3.sh | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/parm/config/gefs/config.ufs b/parm/config/gefs/config.ufs index a5fb33d6ab..ac8c7fd9c0 100644 --- a/parm/config/gefs/config.ufs +++ b/parm/config/gefs/config.ufs @@ -80,6 +80,7 @@ case "${fv3_res}" in export nthreads_fv3_gfs=1 export nthreads_ufs=1 export nthreads_ufs_gfs=1 + export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="40.0,1.77,1.0,1.0" # settings for GSL drag suite export k_split=1 @@ -103,7 +104,8 @@ case "${fv3_res}" in export nthreads_fv3_gfs=1 export nthreads_ufs=1 export nthreads_ufs_gfs=1 - export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling + export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction + export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="20.0,2.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=3.0e-3 # setting for UGWPv1 non-stationary GWD export k_split=1 diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs index 1ac7205897..59a63e2ed5 100644 --- a/parm/config/gfs/config.ufs +++ b/parm/config/gfs/config.ufs @@ -96,7 +96,8 @@ case "${fv3_res}" in export nthreads_fv3_gfs=1 export nthreads_ufs=1 export nthreads_ufs_gfs=1 - export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling + export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction + export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="40.0,1.77,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=6.0e-3 # setting for UGWPv1 non-stationary GWD export k_split=1 @@ -137,6 +138,7 @@ case "${fv3_res}" in export nthreads_fv3_gfs=1 export nthreads_ufs=1 export nthreads_ufs_gfs=1 + export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="20.0,2.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=3.0e-3 # setting for UGWPv1 non-stationary GWD diff --git a/ush/parsing_namelists_FV3.sh b/ush/parsing_namelists_FV3.sh index 9e6e67f9cc..b88849d7e7 100755 --- a/ush/parsing_namelists_FV3.sh +++ b/ush/parsing_namelists_FV3.sh @@ -360,6 +360,7 @@ cat >> input.nml < Date: Tue, 7 May 2024 11:56:13 -0500 Subject: [PATCH 05/12] fix indendation --- parm/config/gefs/config.ufs | 4 ++-- parm/config/gfs/config.ufs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parm/config/gefs/config.ufs b/parm/config/gefs/config.ufs index ac8c7fd9c0..64383ac233 100644 --- a/parm/config/gefs/config.ufs +++ b/parm/config/gefs/config.ufs @@ -81,7 +81,7 @@ case "${fv3_res}" in export nthreads_ufs=1 export nthreads_ufs_gfs=1 export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction - export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling + export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="40.0,1.77,1.0,1.0" # settings for GSL drag suite export k_split=1 export n_split=4 @@ -104,7 +104,7 @@ case "${fv3_res}" in export nthreads_fv3_gfs=1 export nthreads_ufs=1 export nthreads_ufs_gfs=1 - export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction + export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="20.0,2.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=3.0e-3 # setting for UGWPv1 non-stationary GWD diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs index 59a63e2ed5..861d2a685d 100644 --- a/parm/config/gfs/config.ufs +++ b/parm/config/gfs/config.ufs @@ -96,7 +96,7 @@ case "${fv3_res}" in export nthreads_fv3_gfs=1 export nthreads_ufs=1 export nthreads_ufs_gfs=1 - export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction + export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="40.0,1.77,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=6.0e-3 # setting for UGWPv1 non-stationary GWD @@ -139,7 +139,7 @@ case "${fv3_res}" in export nthreads_ufs=1 export nthreads_ufs_gfs=1 export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction - export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling + export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="20.0,2.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=3.0e-3 # setting for UGWPv1 non-stationary GWD export k_split=1 From 43f4ef65b6f50ccc3bbaa597a21c4d35bf012c77 Mon Sep 17 00:00:00 2001 From: "fanglin.yang" Date: Tue, 7 May 2024 17:13:51 +0000 Subject: [PATCH 06/12] add back removed comment line --- 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 8cccd0ce31..c9255db76b 100644 --- a/parm/config/gefs/config.fcst +++ b/parm/config/gefs/config.fcst @@ -107,6 +107,7 @@ if (( gwd_opt == 2 )); then export launch_level fi +# Sponge layer settings export d2_bg_k1=0.20 export d2_bg_k2=0.04 export dz_min=6 diff --git a/parm/config/gfs/config.fcst b/parm/config/gfs/config.fcst index 1d79b89599..6f6b7eaa15 100644 --- a/parm/config/gfs/config.fcst +++ b/parm/config/gfs/config.fcst @@ -119,6 +119,7 @@ if (( gwd_opt == 2 )); then export launch_level fi +# Sponge layer settings export d2_bg_k1=0.20 export d2_bg_k2=0.04 export dz_min=6 From 10f13b738b6f59b7e9981146c10e688c92ec880d Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Tue, 7 May 2024 15:54:01 -0400 Subject: [PATCH 07/12] Apply suggestions from code review --- parm/config/gefs/config.ufs | 4 ++-- parm/config/gfs/config.ufs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/parm/config/gefs/config.ufs b/parm/config/gefs/config.ufs index 64383ac233..874fb08735 100644 --- a/parm/config/gefs/config.ufs +++ b/parm/config/gefs/config.ufs @@ -104,8 +104,8 @@ case "${fv3_res}" in export nthreads_fv3_gfs=1 export nthreads_ufs=1 export nthreads_ufs_gfs=1 - export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction - export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling + export xr_cnvcld=".false." # Do not pass conv. clouds to Xu-Randall cloud fraction + export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="20.0,2.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=3.0e-3 # setting for UGWPv1 non-stationary GWD export k_split=1 diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs index 861d2a685d..ca87762027 100644 --- a/parm/config/gfs/config.ufs +++ b/parm/config/gfs/config.ufs @@ -96,8 +96,8 @@ case "${fv3_res}" in export nthreads_fv3_gfs=1 export nthreads_ufs=1 export nthreads_ufs_gfs=1 - export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction - export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling + export xr_cnvcld=".false." # Do not pass conv. clouds to Xu-Randall cloud fraction + export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="40.0,1.77,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=6.0e-3 # setting for UGWPv1 non-stationary GWD export k_split=1 @@ -138,8 +138,8 @@ case "${fv3_res}" in export nthreads_fv3_gfs=1 export nthreads_ufs=1 export nthreads_ufs_gfs=1 - export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction - export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling + export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction + export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="20.0,2.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=3.0e-3 # setting for UGWPv1 non-stationary GWD export k_split=1 From e3413653e967bcbfc9fadd4d352275842dc9bc98 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Tue, 7 May 2024 15:54:49 -0400 Subject: [PATCH 08/12] Apply suggestions from code review --- parm/config/gfs/config.ufs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs index ca87762027..cb2082f6b2 100644 --- a/parm/config/gfs/config.ufs +++ b/parm/config/gfs/config.ufs @@ -138,8 +138,8 @@ case "${fv3_res}" in export nthreads_fv3_gfs=1 export nthreads_ufs=1 export nthreads_ufs_gfs=1 - export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction - export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling + export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction + export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="20.0,2.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=3.0e-3 # setting for UGWPv1 non-stationary GWD export k_split=1 From c10bd7340fa25b4c1f22c530ae6742ce4652fefb Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Tue, 7 May 2024 15:55:18 -0400 Subject: [PATCH 09/12] Apply suggestions from code review --- parm/config/gfs/config.ufs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs index cb2082f6b2..a7dabd3d0e 100644 --- a/parm/config/gfs/config.ufs +++ b/parm/config/gfs/config.ufs @@ -96,8 +96,8 @@ case "${fv3_res}" in export nthreads_fv3_gfs=1 export nthreads_ufs=1 export nthreads_ufs_gfs=1 - export xr_cnvcld=".false." # Do not pass conv. clouds to Xu-Randall cloud fraction - export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling + export xr_cnvcld=".false." # Do not pass conv. clouds to Xu-Randall cloud fraction + export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="40.0,1.77,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=6.0e-3 # setting for UGWPv1 non-stationary GWD export k_split=1 From d01616795b5ea7ada322ec9154a2324fc4bcd5ee Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Tue, 7 May 2024 15:55:39 -0400 Subject: [PATCH 10/12] Apply suggestions from code review --- parm/config/gefs/config.ufs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parm/config/gefs/config.ufs b/parm/config/gefs/config.ufs index 874fb08735..a2a49e9ca7 100644 --- a/parm/config/gefs/config.ufs +++ b/parm/config/gefs/config.ufs @@ -80,8 +80,8 @@ case "${fv3_res}" in export nthreads_fv3_gfs=1 export nthreads_ufs=1 export nthreads_ufs_gfs=1 - export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction - export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling + export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction + export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="40.0,1.77,1.0,1.0" # settings for GSL drag suite export k_split=1 export n_split=4 From ae76ac217659b2e8e89950993d0929eb6a22df3a Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Tue, 7 May 2024 15:56:07 -0400 Subject: [PATCH 11/12] Update parm/config/gefs/config.ufs --- parm/config/gefs/config.ufs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parm/config/gefs/config.ufs b/parm/config/gefs/config.ufs index a2a49e9ca7..9b42e4aa82 100644 --- a/parm/config/gefs/config.ufs +++ b/parm/config/gefs/config.ufs @@ -104,8 +104,8 @@ case "${fv3_res}" in export nthreads_fv3_gfs=1 export nthreads_ufs=1 export nthreads_ufs_gfs=1 - export xr_cnvcld=".false." # Do not pass conv. clouds to Xu-Randall cloud fraction - export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling + export xr_cnvcld=".false." # Do not pass conv. clouds to Xu-Randall cloud fraction + export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export cdmbgwd_gsl="20.0,2.5,1.0,1.0" # settings for GSL drag suite export knob_ugwp_tauamp=3.0e-3 # setting for UGWPv1 non-stationary GWD export k_split=1 From 1efb0bf5acc438cc266e77d82faf5c63aba92b33 Mon Sep 17 00:00:00 2001 From: "fanglin.yang" Date: Thu, 9 May 2024 20:13:25 +0000 Subject: [PATCH 12/12] check out ufs_model.fd hash c54e98637ead81b1fc1e336bd0443c8bfb6faf01 --- 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 7fdb58cad0..c54e98637e 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 7fdb58cad0dad2f62ce7813c6719554d1c5a17af +Subproject commit c54e98637ead81b1fc1e336bd0443c8bfb6faf01