RUC ice for gsl/develop (replaces NCAR#47) (NCAR#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 <[email protected]>
SamuelTrahanNOAA · Dec 1, 2020 · d4de9e6 · d4de9e6
1 parent ff98902
commit d4de9e6
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 7 deletions.
diff --git a/FV3 b/FV3
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.
+0 −1		ccpp/config/ccpp_prebuild_config.py
+1 −1		ccpp/physics
+0 −3		ccpp/suites/suite_FV3_GSD_SAR.xml
+0 −3		ccpp/suites/suite_FV3_GSD_v0.xml
+0 −3		ccpp/suites/suite_FV3_GSD_v0_drag_suite.xml
+0 −3		ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml
+0 −3		ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite.xml
+0 −3		ccpp/suites/suite_FV3_HRRR.xml
+0 −3		ccpp/suites/suite_FV3_RAP.xml
+6 −6		gfsphysics/GFS_layer/GFS_diagnostics.F90
+62 −48		gfsphysics/GFS_layer/GFS_typedefs.F90
+45 −21		gfsphysics/GFS_layer/GFS_typedefs.meta
+54 −31		io/FV3GFS_io.F90