set resolution depended cdmbwd values

ufs-community · Jan 26, 2021 · 5c4fb36 · junwang-noaa · Jan 26, 2021 · 5c4fb36
1 parent 0381e9d
commit 5c4fb36
Show file tree

Hide file tree

Showing 25 changed files with 74 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}