From 7028a734fa220e92285fdf17f149377b0157c972 Mon Sep 17 00:00:00 2001 From: "fanglin.yang" Date: Tue, 7 May 2024 05:00:34 +0000 Subject: [PATCH] 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