ufs-community · junwang-noaa · Jan 31, 2022 · Jan 26, 2022 · Jan 26, 2022 · Jan 27, 2022
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,9 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/grantfirl/fv3atm
+  branch = iovr5_repair
+  #url = https://github.com/NOAA-EMC/fv3atm
+  #branch = develop
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/parm/control.nml.IN b/tests/parm/control.nml.IN
@@ -123,7 +123,7 @@ deflate_level=1
   iems         = 1
   iaer         = @[IAER]
   icliq_sw     = 2
-  iovr         = 3
+  iovr         = @[IOVR]
   ico2         = 2
   isubc_sw     = 2
   isubc_lw     = 2

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -47,6 +47,8 @@ RUN     | control_c384gdas
 RUN     | control_stochy                                                                                                          |                                         | fv3 |
 RUN     | control_stochy_restart                                                                                                  |                                         |     | control_stochy
 RUN     | control_lndp                                                                                                            |                                         | fv3 |
+RUN     | control_iovr4                                                                                                           |                                         | fv3 |
+RUN     | control_iovr5                                                                                                           |                                         | fv3 |
 
 RUN     | control_p8                                                                                                              |                                         | fv3 |
 RUN     | control_restart_p8                                                                                                      |                                         |     | control_p8

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -479,7 +479,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220121
+BL_DATE=20220128
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/tests/control b/tests/tests/control
@@ -66,6 +66,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export IOVR=3
 export OUTPUT_FH='0 21 24'
 
 

diff --git a/tests/tests/control_2threads b/tests/tests/control_2threads
@@ -61,6 +61,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export IOVR=3
 
 export THRD=2
 export TASKS=$TASKS_thrd

diff --git a/tests/tests/control_2threads_debug b/tests/tests/control_2threads_debug
@@ -24,6 +24,7 @@ export SHOUR=06
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
+export IOVR=3
 export FHMAX=01
 export OUTPUT_FH="0 1"
 

diff --git a/tests/tests/control_CubedSphereGrid b/tests/tests/control_CubedSphereGrid
@@ -44,6 +44,7 @@ export RESTART_INTERVAL=0
 export OUTPUT_GRID='cubed_sphere_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
+export IOVR=3
 
 export WRITE_DOPOST=.false.
 

diff --git a/tests/tests/control_CubedSphereGrid_debug b/tests/tests/control_CubedSphereGrid_debug
@@ -45,6 +45,7 @@ export FHMAX=1
 export OUTPUT_GRID='cubed_sphere_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
+export IOVR=3
 export OUTPUT_FH="0 1"
 
 export FV3_RUN=control_run.IN

diff --git a/tests/tests/control_atm_aerosols b/tests/tests/control_atm_aerosols
@@ -66,6 +66,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export IOVR=3
 export FSCAV_AERO='"*:0.6", "seas1:1.0", "seas2:1.0", "seas3:1.0", "seas4:1.0", "seas5:1.0"'
 export DNATS=3
 

diff --git a/tests/tests/control_atmwav b/tests/tests/control_atmwav
@@ -62,6 +62,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export IOVR=3
 
 export FHMAX=12
 #wave

diff --git a/tests/tests/control_c192 b/tests/tests/control_c192
@@ -36,6 +36,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export IOVR=3
 export IMO=768
 export JMO=384
 

diff --git a/tests/tests/control_c384 b/tests/tests/control_c384
@@ -40,6 +40,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export IOVR=3
 export IMO=1536
 export JMO=768
 export OUTPUT_FH="6 -1"

diff --git a/tests/tests/control_c48 b/tests/tests/control_c48
@@ -67,6 +67,7 @@ export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.false.
 export OUTPUT_FH="6 -1"
 export IAER=5111
+export IOVR=3
 export IMO=192
 export JMO=94
 

diff --git a/tests/tests/control_c768 b/tests/tests/control_c768
@@ -42,6 +42,7 @@ export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export IOVR=3
 export IMO=3072
 export JMO=1536
 export IDEFLATE=1

diff --git a/tests/tests/control_debug b/tests/tests/control_debug
@@ -24,6 +24,7 @@ export SHOUR=06
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
+export IOVR=3
 export FHMAX=1
 export OUTPUT_FH="0 1"
 #export WRITE_DOPOST=.true.

diff --git a/tests/tests/control_decomp b/tests/tests/control_decomp
@@ -62,6 +62,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export IOVR=3
 
 export INPES=6
 export JNPES=4

diff --git a/tests/tests/control_diag_debug b/tests/tests/control_diag_debug
@@ -24,6 +24,7 @@ export SHOUR=06
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
+export IOVR=3
 export FHMAX=1
 export OUTPUT_FH="0 1"
 

diff --git a/tests/tests/control_fhzero b/tests/tests/control_fhzero
@@ -61,6 +61,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export IOVR=3
 export FHZERO=3
 export OUTPUT_FH='0 21'
 

diff --git a/tests/tests/control_iovr4 b/tests/tests/control_iovr4
@@ -0,0 +1,42 @@
+###############################################################################
+#
+#  global control test: GFSv16 atmosphere only at C96L127 using cloud overlap option iovr=4
+#
+###############################################################################
+
+export TEST_DESCR="Compare global control using iovr=4 results with previous trunk version"
+
+export CNTL_DIR=control_iovr4
+
+export LIST_FILES="sfcf000.nc \
+                   sfcf021.nc \
+                   sfcf024.nc \
+                   atmf000.nc \
+                   atmf021.nc \
+                   atmf024.nc \
+                   GFSFLX.GrbF00 \
+                   GFSFLX.GrbF21 \
+                   GFSFLX.GrbF24 \
+                   GFSPRS.GrbF00 \
+                   GFSPRS.GrbF21 \
+                   GFSPRS.GrbF24"
+
+export_fv3
+export NPZ=127
+export NPZP=128
+export DT_ATMOS=720
+export SYEAR=2021
+export SMONTH=03
+export SDAY=22
+export SHOUR=06
+export RESTART_INTERVAL="12 -1"
+export OUTPUT_GRID='gaussian_grid'
+export NSTF_NAME='2,0,0,0,0'
+export WRITE_DOPOST=.true.
+export IAER=5111
+export OUTPUT_FH='0 21 24'
+export IOVR=4
+
+export FV3_RUN=control_run.IN
+export CCPP_SUITE=FV3_GFS_v16
+export INPUT_NML=control.nml.IN
diff --git a/tests/tests/control_iovr5 b/tests/tests/control_iovr5
@@ -0,0 +1,42 @@
+###############################################################################
+#
+#  global control test: GFSv16 atmosphere only at C96L127 using cloud overlap option iovr=5
+#
+###############################################################################
+
+export TEST_DESCR="Compare global control using iovr=5 results with previous trunk version"
+
+export CNTL_DIR=control_iovr5
+
+export LIST_FILES="sfcf000.nc \
+                   sfcf021.nc \
+                   sfcf024.nc \
+                   atmf000.nc \
+                   atmf021.nc \
+                   atmf024.nc \
+                   GFSFLX.GrbF00 \
+                   GFSFLX.GrbF21 \
+                   GFSFLX.GrbF24 \
+                   GFSPRS.GrbF00 \
+                   GFSPRS.GrbF21 \
+                   GFSPRS.GrbF24"
+
+export_fv3
+export NPZ=127
+export NPZP=128
+export DT_ATMOS=720
+export SYEAR=2021
+export SMONTH=03
+export SDAY=22
+export SHOUR=06
+export RESTART_INTERVAL="12 -1"
+export OUTPUT_GRID='gaussian_grid'
+export NSTF_NAME='2,0,0,0,0'
+export WRITE_DOPOST=.true.
+export IAER=5111
+export OUTPUT_FH='0 21 24'
+export IOVR=5
+
+export FV3_RUN=control_run.IN
+export CCPP_SUITE=FV3_GFS_v16
+export INPUT_NML=control.nml.IN
diff --git a/tests/tests/control_latlon b/tests/tests/control_latlon
@@ -31,6 +31,7 @@ export JMO=181
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export IOVR=3
 export OUTPUT_FH='0 24'
 
 

diff --git a/tests/tests/control_ras b/tests/tests/control_ras
@@ -29,6 +29,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export IOVR=3
 
 export RAS=.true.
 export IMFDEEPCNV=-1

diff --git a/tests/tests/control_ras_debug b/tests/tests/control_ras_debug
@@ -25,6 +25,7 @@ export FHMAX=1
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
+export IOVR=3
 export OUTPUT_FH="0 1"
 
 export RAS=.true.

diff --git a/tests/tests/control_restart b/tests/tests/control_restart
@@ -57,6 +57,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export IOVR=3
 export FHROT=12
 
 export WARM_START=.true.

diff --git a/tests/tests/control_stochy b/tests/tests/control_stochy
@@ -31,6 +31,7 @@ export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export OUTPUT_FH='6 -1'
 export IAER=5111
+export IOVR=3
 export DO_SPPT=.true.
 export DO_SHUM=.true.
 export DO_SKEB=.true.

diff --git a/tests/tests/control_stochy_debug b/tests/tests/control_stochy_debug
@@ -25,6 +25,7 @@ export FHMAX=1
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
+export IOVR=3
 export OUTPUT_FH="0 1"
 export DO_SPPT=.true.
 export DO_SHUM=.true.

diff --git a/tests/tests/control_stochy_restart b/tests/tests/control_stochy_restart
@@ -26,6 +26,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export IOVR=3
 export FHROT=06
 export OUTPUT_FH="3 -1"
 

diff --git a/tests/tests/control_wrtGauss_netcdf_parallel b/tests/tests/control_wrtGauss_netcdf_parallel
@@ -29,6 +29,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export IOVR=3
 export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
 export IDEFLATE=1
 export NBITS=14

diff --git a/tests/tests/control_wrtGauss_netcdf_parallel_debug b/tests/tests/control_wrtGauss_netcdf_parallel_debug
@@ -25,6 +25,7 @@ export FHMAX=1
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
+export IOVR=3
 export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
 export IDEFLATE=1
 export NBITS=14
+4 −2		.gitmodules
+1 −1		ccpp/data/GFS_typedefs.F90
+1 −1		ccpp/physics