From d4de9e6e0754475d40d4b68559232c5a23042289 Mon Sep 17 00:00:00 2001
From: DomHeinzeller <58610420+DomHeinzeller@users.noreply.github.com>
Date: Tue, 1 Dec 2020 10:09:00 -0700
Subject: [PATCH] RUC ice for gsl/develop (replaces #47) (#49)

Implementation of RUC LSM ice model in CCPP

* Squash-merge climbfuji:rucice_gfsv16dzmin into gsl/develop

* Add kice=9 to tests/tests/fv3_ccpp_rap and tests/tests/fv3_ccpp_hrrr

* Change NEW_BASELINE directory for gsl/develop to avoid conflicts with development work on the authoritative branches

* Add KICE=9 to tests/tests/fv3_ccpp_gsd_unified_ugwp and tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp

* Revert change to .gitmodules and update submodule pointer for fv3atm

Co-authored-by: Dom Heinzeller <climbfuji@ymail.com>
---
 FV3                                              | 2 +-
 tests/default_vars.sh                            | 1 +
 tests/parm/ccpp_gsd.nml.IN                       | 1 +
 tests/parm/ccpp_gsd_sar.nml.IN                   | 1 +
 tests/rt.sh                                      | 2 +-
 tests/tests/fv3_ccpp_gsd                         | 2 +-
 tests/tests/fv3_ccpp_gsd_coldstart               | 2 +-
 tests/tests/fv3_ccpp_gsd_debug                   | 2 +-
 tests/tests/fv3_ccpp_gsd_diag3d_debug            | 2 +-
 tests/tests/fv3_ccpp_gsd_drag_suite              | 1 +
 tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp | 2 ++
 tests/tests/fv3_ccpp_gsd_mynnsfc                 | 1 +
 tests/tests/fv3_ccpp_gsd_mynnsfc_debug           | 1 +
 tests/tests/fv3_ccpp_gsd_unified_ugwp            | 2 ++
 tests/tests/fv3_ccpp_gsd_warmstart               | 2 +-
 tests/tests/fv3_ccpp_hrrr                        | 2 ++
 tests/tests/fv3_ccpp_rap                         | 2 ++
 17 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/FV3 b/FV3
index 478d3482fe..bd71c2afd1 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 478d3482fef6ae7be0a2ebd6d7fdcb407a3f4209
+Subproject commit bd71c2afd1195e9e25962ec94bdb5e41de349769
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 1e7a4c4632..19f4fc20de 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -275,6 +275,7 @@ export DO_MYNNSFCLAY=.F.
 export LSM=1
 export LSOIL_LSM=4
 export LANDICE=.T.
+export KICE=2
 
 # Ozone / stratospheric H2O
 export OZ_PHYS_OLD=.T.
diff --git a/tests/parm/ccpp_gsd.nml.IN b/tests/parm/ccpp_gsd.nml.IN
index 92623f50a9..67e880a656 100644
--- a/tests/parm/ccpp_gsd.nml.IN
+++ b/tests/parm/ccpp_gsd.nml.IN
@@ -176,6 +176,7 @@
        n_var_lndp     = @[N_VAR_LNDP]
        lsm            = @[LSM]
        lsoil_lsm      = @[LSOIL_LSM]
+       kice           = @[KICE]
        iopt_dveg      = 2
        iopt_crs       = 1
        iopt_btr       = 1
diff --git a/tests/parm/ccpp_gsd_sar.nml.IN b/tests/parm/ccpp_gsd_sar.nml.IN
index 39d40f8162..ec5c0869f2 100644
--- a/tests/parm/ccpp_gsd_sar.nml.IN
+++ b/tests/parm/ccpp_gsd_sar.nml.IN
@@ -199,6 +199,7 @@
      lsm            = 3
      lsoil          = 9
      lsoil_lsm      = 9
+     kice           = 9
      iopt_dveg      = 2
      iopt_crs       = 1
      iopt_btr       = 1
diff --git a/tests/rt.sh b/tests/rt.sh
index ad3e85deec..16d2665bdc 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -317,7 +317,7 @@ fi
 mkdir -p ${STMP}/${USER}
 
 # Different own baseline directories for different compilers on Theia/Cheyenne
-NEW_BASELINE=${STMP}/${USER}/FV3_RT/REGRESSION_TEST
+NEW_BASELINE=${STMP}/${USER}/FV3_RT/REGRESSION_TEST_GSL_DEVELOP
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]]; then
     NEW_BASELINE=${NEW_BASELINE}_${RT_COMPILER^^}
 fi
diff --git a/tests/tests/fv3_ccpp_gsd b/tests/tests/fv3_ccpp_gsd
index 442117df57..077446b405 100644
--- a/tests/tests/fv3_ccpp_gsd
+++ b/tests/tests/fv3_ccpp_gsd
@@ -118,7 +118,7 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
-
+export KICE=9
 
 export WLCLK=30
 
diff --git a/tests/tests/fv3_ccpp_gsd_coldstart b/tests/tests/fv3_ccpp_gsd_coldstart
index e43553acb8..d1343f0b9b 100644
--- a/tests/tests/fv3_ccpp_gsd_coldstart
+++ b/tests/tests/fv3_ccpp_gsd_coldstart
@@ -56,4 +56,4 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
-
+export KICE=9
diff --git a/tests/tests/fv3_ccpp_gsd_debug b/tests/tests/fv3_ccpp_gsd_debug
index 2e2d073d4d..e665bbf9e3 100644
--- a/tests/tests/fv3_ccpp_gsd_debug
+++ b/tests/tests/fv3_ccpp_gsd_debug
@@ -94,6 +94,6 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
-
+export KICE=9
 
 export WLCLK=30
diff --git a/tests/tests/fv3_ccpp_gsd_diag3d_debug b/tests/tests/fv3_ccpp_gsd_diag3d_debug
index 2f46c151e6..cade76ed3e 100644
--- a/tests/tests/fv3_ccpp_gsd_diag3d_debug
+++ b/tests/tests/fv3_ccpp_gsd_diag3d_debug
@@ -98,7 +98,7 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
-
+export KICE=9
 
 export WLCLK=30
 
diff --git a/tests/tests/fv3_ccpp_gsd_drag_suite b/tests/tests/fv3_ccpp_gsd_drag_suite
index 0091c90558..e7f7cdfc0a 100644
--- a/tests/tests/fv3_ccpp_gsd_drag_suite
+++ b/tests/tests/fv3_ccpp_gsd_drag_suite
@@ -94,6 +94,7 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
+export KICE=9
 export GWD_OPT=3
 export DO_UGWP_V0=.F.
 export DO_UGWP_V0_OROG_ONLY=.F.
diff --git a/tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp b/tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp
index 44ddf4fcfd..022cd47b69 100644
--- a/tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp
+++ b/tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp
@@ -94,6 +94,8 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
+export KICE=9
+
 export GWD_OPT=2
 export DO_UGWP_V0=.F.
 export DO_UGWP_V0_OROG_ONLY=.F.
diff --git a/tests/tests/fv3_ccpp_gsd_mynnsfc b/tests/tests/fv3_ccpp_gsd_mynnsfc
index 8d39c21413..fae4d8512b 100644
--- a/tests/tests/fv3_ccpp_gsd_mynnsfc
+++ b/tests/tests/fv3_ccpp_gsd_mynnsfc
@@ -120,6 +120,7 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
+export KICE=9
 
 RUN_SCRIPT=rt_fv3.sh
 
diff --git a/tests/tests/fv3_ccpp_gsd_mynnsfc_debug b/tests/tests/fv3_ccpp_gsd_mynnsfc_debug
index a394908ad7..21d9901715 100644
--- a/tests/tests/fv3_ccpp_gsd_mynnsfc_debug
+++ b/tests/tests/fv3_ccpp_gsd_mynnsfc_debug
@@ -96,6 +96,7 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
+export KICE=9
 
 RUN_SCRIPT=rt_fv3.sh
 
diff --git a/tests/tests/fv3_ccpp_gsd_unified_ugwp b/tests/tests/fv3_ccpp_gsd_unified_ugwp
index f9387b81d9..1425c0c4aa 100644
--- a/tests/tests/fv3_ccpp_gsd_unified_ugwp
+++ b/tests/tests/fv3_ccpp_gsd_unified_ugwp
@@ -118,6 +118,8 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
+export KICE=9
+
 export GWD_OPT=2
 export DO_UGWP_V0=.T.
 export DO_UGWP_V0_OROG_ONLY=.F.
diff --git a/tests/tests/fv3_ccpp_gsd_warmstart b/tests/tests/fv3_ccpp_gsd_warmstart
index 3904d145b9..0d9d28950d 100644
--- a/tests/tests/fv3_ccpp_gsd_warmstart
+++ b/tests/tests/fv3_ccpp_gsd_warmstart
@@ -96,4 +96,4 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
-
+export KICE=9
diff --git a/tests/tests/fv3_ccpp_hrrr b/tests/tests/fv3_ccpp_hrrr
index be2a1f9c2f..70c67c1afc 100644
--- a/tests/tests/fv3_ccpp_hrrr
+++ b/tests/tests/fv3_ccpp_hrrr
@@ -95,6 +95,8 @@ export IMFSHALCNV=-1
 export IMFDEEPCNV=-1
 export LSM=3
 export LSOIL_LSM=9
+export KICE=9
+
 export GWD_OPT=3
 export DO_UGWP_V0=.F.
 export DO_UGWP_V0_OROG_ONLY=.F.
diff --git a/tests/tests/fv3_ccpp_rap b/tests/tests/fv3_ccpp_rap
index f87f7034b2..d3b2ab7df5 100644
--- a/tests/tests/fv3_ccpp_rap
+++ b/tests/tests/fv3_ccpp_rap
@@ -95,6 +95,8 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
+export KICE=9
+
 export GWD_OPT=3
 export DO_UGWP_V0=.F.
 export DO_UGWP_V0_OROG_ONLY=.F.