From 6a32ae254563f7510e39fbe9a82718747f7437d8 Mon Sep 17 00:00:00 2001 From: dpsarmie Date: Fri, 9 Aug 2024 09:07:28 -0500 Subject: [PATCH] Adds changes to default_vars and creates export_ugwpv1 This commit adds a new export_ugwpv1 fucntion to default_vars that assigns the new paramter values to tests that are currently using the version 1 of ugwp. --- tests/default_vars.sh | 20 ++++++++++++-------- tests/tests/control_p8_mynn | 1 + tests/tests/cpld_control_gfsv17 | 11 +---------- tests/tests/cpld_control_gfsv17_iau | 1 + tests/tests/cpld_control_sfs | 1 + tests/tests/cpld_debug_gfsv17 | 1 + tests/tests/cpld_mpi_gfsv17 | 1 + tests/tests/cpld_restart_gfsv17 | 1 + 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 53ee9fb706..c420503abf 100644 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -755,7 +755,6 @@ export FSICS=0 # Dynamical core export FV_CORE_TAU=0. -export RF_CUTOFF=10.0 export FAST_TAU_W_SEC=0.2 export DRY_MASS=98320.0 @@ -925,7 +924,7 @@ export_ugwpv1() { export CDMBGWD="0.071,2.1,1.0,1.0" export CDMBGWD_GSL="40.0,1.77,1.0,1.0" export KNOB_UGWP_TAUAMP=6.0e-3 - export K_SPLIT=1 + #export K_SPLIT=1 export N_SPLIT=4 export TAU=10.0 export RF_CUTOFF=100.0 @@ -937,7 +936,7 @@ export_ugwpv1() { export CDMBGWD="0.14,1.8,1.0,1.0" export CDMBGWD_GSL="20.0,2.5,1.0,1.0" export KNOB_UGWP_TAUAMP=3.0e-3 - export K_SPLIT=1 + #export K_SPLIT=1 export N_SPLIT=4 export TAU=8.0 export RF_CUTOFF=100.0 @@ -947,9 +946,10 @@ export_ugwpv1() { export DELTIM=600 export XR_CNVCLD=.true. export CDMBGWD="0.23,1.5,1.0,1.0" + export CDMBGWD="5.0,5.0,1.0,1.0" export CDMBGWD_GSL="5.0,5.0,1.0,1.0" export KNOB_UGWP_TAUAMP=1.5e-3 - export K_SPLIT=2 + #export K_SPLIT=2 export N_SPLIT=4 export TAU=6.0 export RF_CUTOFF=100.0 @@ -961,7 +961,7 @@ export_ugwpv1() { export CDMBGWD="1.1,0.72,1.0,1.0" export CDMBGWD_GSL="5.0,5.0,1.0,1.0" export KNOB_UGWP_TAUAMP=0.8e-3 - export K_SPLIT=2 + #export K_SPLIT=2 export N_SPLIT=4 export TAU=4.0 export RF_CUTOFF=100.0 @@ -973,7 +973,7 @@ export_ugwpv1() { export CDMBGWD="4.0,0.15,1.0,1.0" export CDMBGWD_GSL="2.5,7.5,1.0,1.0" export KNOB_UGWP_TAUAMP=0.5e-3 - export K_SPLIT=2 + #export K_SPLIT=2 export N_SPLIT=4 export TAU=3.0 export RF_CUTOFF=100.0 @@ -985,7 +985,7 @@ export_ugwpv1() { export CDMBGWD="4.0,0.10,1.0,1.0" export CDMBGWD_GSL="1.67,8.8,1.0,1.0" export KNOB_UGWP_TAUAMP=0.35e-3 - export K_SPLIT=2 + #export K_SPLIT=2 export N_SPLIT=6 export TAU=2.5 export RF_CUTOFF=100.0 @@ -997,7 +997,7 @@ export_ugwpv1() { export CDMBGWD="4.0,0.05,1.0,1.0" export CDMBGWD_GSL="0.625,14.1,1.0,1.0" export KNOB_UGWP_TAUAMP=0.13e-3 - export K_SPLIT=4 + #export K_SPLIT=4 export N_SPLIT=5 export TAU=0.5 export RF_CUTOFF=100.0 @@ -1008,6 +1008,10 @@ export_ugwpv1() { exit 1 ;; esac + + if [[ ${DO_GSL_DRAG_SS} = .true. ]]; then + export CDMBGWD=${CDMBGWD_GSL} + fi } # Defaults for the CICE6 model namelist, mx100 diff --git a/tests/tests/control_p8_mynn b/tests/tests/control_p8_mynn index 593b283f63..9eac9bb346 100644 --- a/tests/tests/control_p8_mynn +++ b/tests/tests/control_p8_mynn @@ -171,5 +171,6 @@ export LANDICE=".false." export FSICL=0 export FSICS=0 +export RF_CUTOFF=10. export IOVR=3 export ICLIQ_SW=2 diff --git a/tests/tests/cpld_control_gfsv17 b/tests/tests/cpld_control_gfsv17 index a69d2c81ec..ee654c1c63 100644 --- a/tests/tests/cpld_control_gfsv17 +++ b/tests/tests/cpld_control_gfsv17 @@ -71,6 +71,7 @@ export LIST_FILES="sfcf021.tile1.nc \ export_fv3 export_cpl +export_ugwpv1 export CPLCHM=.false. export DNATS=0 @@ -136,13 +137,3 @@ export DO_GSL_DRAG_LS_BL=.true. export DO_GWD_OPT_PSL=.true. export DO_GSL_DRAG_SS=.false. export DO_GSL_DRAG_TOFD=.true. -export DELTIM=600 -export XR_CNVCLD=.false. -export CDMBGWD="20.0,2.5,1.0,1.0" -export KNOB_UGWP_TAUAMP=3.0e-3 -export K_SPLIT=1 -export N_SPLIT=4 -export TAU=8.0 -export RF_CUTOFF=100.0 -export FV_SG_ADJ=1800 - diff --git a/tests/tests/cpld_control_gfsv17_iau b/tests/tests/cpld_control_gfsv17_iau index dbf82fe08c..9011030721 100644 --- a/tests/tests/cpld_control_gfsv17_iau +++ b/tests/tests/cpld_control_gfsv17_iau @@ -52,6 +52,7 @@ export LIST_FILES="sfcf024.nc \ export_fv3 export_cpl +export_ugwpv1 export CPLCHM=.false. export DNATS=0 diff --git a/tests/tests/cpld_control_sfs b/tests/tests/cpld_control_sfs index 362e5a112d..9fdf5fd9ed 100644 --- a/tests/tests/cpld_control_sfs +++ b/tests/tests/cpld_control_sfs @@ -18,6 +18,7 @@ export LIST_FILES="sfcf021.nc \ export_fv3 export_cpl +export_ugwpv1 export CPLCHM=.false. export DNATS=0 diff --git a/tests/tests/cpld_debug_gfsv17 b/tests/tests/cpld_debug_gfsv17 index 37220564ac..d353aefbd9 100644 --- a/tests/tests/cpld_debug_gfsv17 +++ b/tests/tests/cpld_debug_gfsv17 @@ -58,6 +58,7 @@ export LIST_FILES="sfcf003.tile1.nc \ export_fv3 export_cpl +export_ugwpv1 export FHMAX=3 export DAYS=0.125 diff --git a/tests/tests/cpld_mpi_gfsv17 b/tests/tests/cpld_mpi_gfsv17 index 6fc53f2686..f366117ee4 100644 --- a/tests/tests/cpld_mpi_gfsv17 +++ b/tests/tests/cpld_mpi_gfsv17 @@ -71,6 +71,7 @@ export LIST_FILES="sfcf021.tile1.nc \ export_fv3 export_cpl +export_ugwpv1 export CPLCHM=.false. export DNATS=0 diff --git a/tests/tests/cpld_restart_gfsv17 b/tests/tests/cpld_restart_gfsv17 index 924c60a9b7..bc701e749e 100644 --- a/tests/tests/cpld_restart_gfsv17 +++ b/tests/tests/cpld_restart_gfsv17 @@ -60,6 +60,7 @@ export LIST_FILES="sfcf024.tile1.nc \ export_fv3 export_cpl +export_ugwpv1 export CPLCHM=.false. export DNATS=0