From 5c4fb360f1240c35eaa5ef41317b6bf690bb8e0a Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Tue, 26 Jan 2021 10:21:04 -0500 Subject: [PATCH] set resolution depended cdmbwd values --- tests/default_vars.sh | 7 +++++++ tests/parm/input.benchmark_ccpp.nml.IN | 2 +- tests/parm/input.benchmark_v16.nml.IN | 2 +- tests/parm/input.mom6_ccpp.nml.IN | 4 ++-- tests/tests/cpld_bmark | 3 +++ tests/tests/cpld_bmark_35d | 3 +++ tests/tests/cpld_bmark_wave | 3 +++ tests/tests/cpld_bmark_wave_35d | 3 +++ tests/tests/cpld_bmarkfrac | 3 +++ tests/tests/cpld_bmarkfrac_v16 | 3 +++ tests/tests/cpld_bmarkfrac_wave | 3 +++ tests/tests/cpld_bmarkfrac_wave_35d | 3 +++ tests/tests/cpld_bmarkfrac_wave_v16 | 3 +++ tests/tests/cpld_bmarkfrac_wave_v16_35d | 3 +++ tests/tests/cpld_control_c192 | 3 +++ tests/tests/cpld_control_c384 | 3 +++ tests/tests/cpld_controlfrac_c192 | 3 +++ tests/tests/cpld_controlfrac_c384 | 3 +++ tests/tests/cpld_restart_bmark | 3 +++ tests/tests/cpld_restart_bmarkfrac | 3 +++ tests/tests/cpld_restart_bmarkfrac_v16 | 3 +++ tests/tests/cpld_restart_c192 | 3 +++ tests/tests/cpld_restart_c384 | 3 +++ tests/tests/cpld_restartfrac_c192 | 3 +++ tests/tests/cpld_restartfrac_c384 | 3 +++ 25 files changed, 74 insertions(+), 4 deletions(-) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 9a0790c55b..99b856ec6a 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -507,6 +507,13 @@ export CPLFLX='.T.' export CPL='.true.' export NSTF_NAME='0,0,0,0,0' +# resolution dependent settings +export CDMBWD_c96='0.14,1.8,1.0,1.0' +export CDMBWD_c192='0.23,1.5,1.0,1.0' +export CDMBWD_c384='1.1,0.72,1.0,1.0' +# set default +export CDMBWD=${CDMBWD_c96} + # for FV3: default values will be changed if doing a warm-warm restart export WARM_START='.F.' export MAKE_NH='.T.' diff --git a/tests/parm/input.benchmark_ccpp.nml.IN b/tests/parm/input.benchmark_ccpp.nml.IN index 97449b8c73..79169f8722 100644 --- a/tests/parm/input.benchmark_ccpp.nml.IN +++ b/tests/parm/input.benchmark_ccpp.nml.IN @@ -175,7 +175,7 @@ cnvcld = .true. imfshalcnv = 2 imfdeepcnv = 2 - cdmbgwd = 1.0,1.2 + cdmbgwd = @[CDMBWD] prslrd0 = 0. ivegsrc = 1 isot = 1 diff --git a/tests/parm/input.benchmark_v16.nml.IN b/tests/parm/input.benchmark_v16.nml.IN index 9eea1f6131..606f3be447 100644 --- a/tests/parm/input.benchmark_v16.nml.IN +++ b/tests/parm/input.benchmark_v16.nml.IN @@ -160,7 +160,7 @@ cnvcld = .true. imfshalcnv = 2 imfdeepcnv = 2 - cdmbgwd = 0.23,1.5,1.0,1.0 + cdmbgwd = @[CDMBWD] prslrd0 = 0. ivegsrc = 1 isot = 1 diff --git a/tests/parm/input.mom6_ccpp.nml.IN b/tests/parm/input.mom6_ccpp.nml.IN index af3d12bb11..22aef11765 100644 --- a/tests/parm/input.mom6_ccpp.nml.IN +++ b/tests/parm/input.mom6_ccpp.nml.IN @@ -162,7 +162,7 @@ imfshalcnv = 2 imfdeepcnv = 2 isatmedmf = @[ISATMEDMF] - cdmbgwd = 3.5,0.25 + cdmbgwd = @[CDMBWD] prslrd0 = 0. ivegsrc = 1 isot = 1 @@ -205,7 +205,7 @@ nseed = 1000000 nfracseed = 0.5 nthresh = 0. - ca_trigger = .true. + ca_trigger = .true. ca_entr = .false. ca_closure = .false. ca_global = .false. diff --git a/tests/tests/cpld_bmark b/tests/tests/cpld_bmark index 47e155821b..6c6fc0bb4a 100644 --- a/tests/tests/cpld_bmark +++ b/tests/tests/cpld_bmark @@ -93,6 +93,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='450' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_bmark_35d b/tests/tests/cpld_bmark_35d index 68cfa6ef7c..e44e4c4adf 100644 --- a/tests/tests/cpld_bmark_35d +++ b/tests/tests/cpld_bmark_35d @@ -42,6 +42,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='450' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_bmark_wave b/tests/tests/cpld_bmark_wave index 68297228d1..544f565716 100644 --- a/tests/tests/cpld_bmark_wave +++ b/tests/tests/cpld_bmark_wave @@ -95,6 +95,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='450' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_bmark_wave_35d b/tests/tests/cpld_bmark_wave_35d index 5ac2f17767..1c9c189dd2 100644 --- a/tests/tests/cpld_bmark_wave_35d +++ b/tests/tests/cpld_bmark_wave_35d @@ -56,6 +56,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='450' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_bmarkfrac b/tests/tests/cpld_bmarkfrac index d2e41a37f6..d1e84e87ff 100644 --- a/tests/tests/cpld_bmarkfrac +++ b/tests/tests/cpld_bmarkfrac @@ -93,6 +93,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='450' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_bmarkfrac_v16 b/tests/tests/cpld_bmarkfrac_v16 index d4aaac733b..5ed0e91d6f 100644 --- a/tests/tests/cpld_bmarkfrac_v16 +++ b/tests/tests/cpld_bmarkfrac_v16 @@ -95,6 +95,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='300' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_bmarkfrac_wave b/tests/tests/cpld_bmarkfrac_wave index 956fb82e70..df5d656e75 100644 --- a/tests/tests/cpld_bmarkfrac_wave +++ b/tests/tests/cpld_bmarkfrac_wave @@ -95,6 +95,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='450' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_bmarkfrac_wave_35d b/tests/tests/cpld_bmarkfrac_wave_35d index 7c7b356688..5d0da16cfe 100644 --- a/tests/tests/cpld_bmarkfrac_wave_35d +++ b/tests/tests/cpld_bmarkfrac_wave_35d @@ -56,6 +56,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='450' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_bmarkfrac_wave_v16 b/tests/tests/cpld_bmarkfrac_wave_v16 index 1c08a5c4a7..ff26ca78f8 100644 --- a/tests/tests/cpld_bmarkfrac_wave_v16 +++ b/tests/tests/cpld_bmarkfrac_wave_v16 @@ -100,6 +100,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='300' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_bmarkfrac_wave_v16_35d b/tests/tests/cpld_bmarkfrac_wave_v16_35d index 210c02ce77..54d72cf498 100644 --- a/tests/tests/cpld_bmarkfrac_wave_v16_35d +++ b/tests/tests/cpld_bmarkfrac_wave_v16_35d @@ -67,6 +67,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='300' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_control_c192 b/tests/tests/cpld_control_c192 index 353d6a4398..c138a9ba99 100644 --- a/tests/tests/cpld_control_c192 +++ b/tests/tests/cpld_control_c192 @@ -87,6 +87,9 @@ export NX_GLB=720 export NY_GLB=576 export NPROC_ICE='24' +# resolution dependent setting +export CDMBWD=${CDMBWD_c192} + # set component and coupling timesteps export DT_ATMOS='900' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_control_c384 b/tests/tests/cpld_control_c384 index b68958ce7a..98986dc3c9 100644 --- a/tests/tests/cpld_control_c384 +++ b/tests/tests/cpld_control_c384 @@ -87,6 +87,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='450' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_controlfrac_c192 b/tests/tests/cpld_controlfrac_c192 index 1eaf7c5f2e..98e58d2ef2 100644 --- a/tests/tests/cpld_controlfrac_c192 +++ b/tests/tests/cpld_controlfrac_c192 @@ -87,6 +87,9 @@ export NX_GLB=720 export NY_GLB=576 export NPROC_ICE='24' +# resolution dependent setting +export CDMBWD=${CDMBWD_c192} + # set component and coupling timesteps export DT_ATMOS='900' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_controlfrac_c384 b/tests/tests/cpld_controlfrac_c384 index 0002b0f5cd..998d756323 100644 --- a/tests/tests/cpld_controlfrac_c384 +++ b/tests/tests/cpld_controlfrac_c384 @@ -87,6 +87,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='450' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_restart_bmark b/tests/tests/cpld_restart_bmark index 6c33644033..8f60c1b0da 100644 --- a/tests/tests/cpld_restart_bmark +++ b/tests/tests/cpld_restart_bmark @@ -96,6 +96,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='450' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_restart_bmarkfrac b/tests/tests/cpld_restart_bmarkfrac index d7ff9015c4..4b57f86f25 100644 --- a/tests/tests/cpld_restart_bmarkfrac +++ b/tests/tests/cpld_restart_bmarkfrac @@ -96,6 +96,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='450' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_restart_bmarkfrac_v16 b/tests/tests/cpld_restart_bmarkfrac_v16 index c2991018ef..db33686f5e 100644 --- a/tests/tests/cpld_restart_bmarkfrac_v16 +++ b/tests/tests/cpld_restart_bmarkfrac_v16 @@ -99,6 +99,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='300' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_restart_c192 b/tests/tests/cpld_restart_c192 index 36bc961bb5..29b2ba6c24 100644 --- a/tests/tests/cpld_restart_c192 +++ b/tests/tests/cpld_restart_c192 @@ -91,6 +91,9 @@ export NX_GLB=720 export NY_GLB=576 export NPROC_ICE='24' +# resolution dependent setting +export CDMBWD=${CDMBWD_c192} + # set component and coupling timesteps export DT_ATMOS='900' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_restart_c384 b/tests/tests/cpld_restart_c384 index 0beebf5907..78c2f141cc 100644 --- a/tests/tests/cpld_restart_c384 +++ b/tests/tests/cpld_restart_c384 @@ -91,6 +91,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='450' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_restartfrac_c192 b/tests/tests/cpld_restartfrac_c192 index 4a8c1fc903..0274c638fd 100644 --- a/tests/tests/cpld_restartfrac_c192 +++ b/tests/tests/cpld_restartfrac_c192 @@ -92,6 +92,9 @@ export NX_GLB=720 export NY_GLB=576 export NPROC_ICE='24' +# resolution dependent setting +export CDMBWD=${CDMBWD_c192} + # set component and coupling timesteps export DT_ATMOS='900' export DT_CICE=${DT_ATMOS} diff --git a/tests/tests/cpld_restartfrac_c384 b/tests/tests/cpld_restartfrac_c384 index 71d798fbde..6d84d16f54 100644 --- a/tests/tests/cpld_restartfrac_c384 +++ b/tests/tests/cpld_restartfrac_c384 @@ -91,6 +91,9 @@ export NX_GLB=1440 export NY_GLB=1080 export NPROC_ICE='48' +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + # set component and coupling timesteps export DT_ATMOS='450' export DT_CICE=${DT_ATMOS}