Remove interstitial variables for land and ice emissivity and update …

…the land and ice emissivity in the routine setemis in CCPP (#821) * Update of fv3atm submodule * Update to regression test setup for correctly setting cplice for coupled and uncoupled runs Co-authored-by: Dom Heinzeller <climbfuji@ymail.com> Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com> Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>
ufs-community · Oct 22, 2021 · b87cdaa · b87cdaa
1 parent 5a20ea4
commit b87cdaa
Show file tree

Hide file tree

Showing 14 changed files with 2,635 additions and 2,784 deletions.
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/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -549,6 +549,7 @@ export H2O_PHYS=.false.
 export CPL=.false.
 export CPLCHM=.false.
 export CPLFLX=.false.
+export CPLICE=.false.
 export CPLWAV=.false.
 export CPLWAV2ATM=.false.
 export DAYS=1
@@ -792,6 +793,7 @@ export KTHERM=2
 export TFREEZE_OPTION=mushy
 
 export CPLFLX=.true.
+export CPLICE=.true.
 export CPL=.true.
 export MIN_SEAICE=1.0e-11
 

diff --git a/tests/parm/cpld_control.nml.IN b/tests/parm/cpld_control.nml.IN
@@ -178,6 +178,7 @@ deflate_level=1
   cplwav       = @[CPLWAV]
   cplwav2atm   = @[CPLWAV2ATM]
   cplflx       = @[CPLFLX]
+  cplice       = @[CPLICE]
   min_seaice   = @[MIN_SEAICE]
   use_cice_alb = @[USE_CICE_ALB]
   frac_grid    = @[FRAC_GRID]

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -116,7 +116,7 @@ RUN     | control_thompson_extdiag_debug
 RUN     | regional_control_debug                                                                                                  |                                         | fv3 |
 RUN     | regional_quilt_debug                                                                                                    |                                         | fv3 |
 RUN     | fv3_gsd_debug                                                                                                           |                                         | fv3 |
-RUN     | fv3_gsd_diag_debug                                                                                                      |                                         | fv3 |
+#RUN     | fv3_gsd_diag_debug                                                                                                      |                                         | fv3 |
 RUN     | fv3_rrfs_v1beta_debug                                                                                                   |                                         | fv3 |
 RUN     | fv3_rrfs_v1alpha_debug                                                                                                  |                                         | fv3 |
 

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -445,7 +445,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20211006
+BL_DATE=20211019
 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