Merge pull request ufs-community#40 from climbfuji/enable_fhcyc_ruclsm

Enable subsurface cycling (fhcyc) for regression tests using RUC LSM and other GSL physics
ShanSunNOAA · Sep 3, 2020 · 05a5f1f · 05a5f1f
2 parents cbbbd67 + 011edbd
commit 05a5f1f
Show file tree

Hide file tree

Showing 16 changed files with 3 additions and 16 deletions.
diff --git a/FV3 b/FV3
diff --git a/parm/ccpp_gsd_sar.nml.IN b/parm/ccpp_gsd_sar.nml.IN
@@ -141,7 +141,7 @@
        fhzero         = 6.
        h2o_phys       = .true.
        ldiag3d        = .false.
-       fhcyc          = 0
+       fhcyc          = @[FHCYC]
        nst_anl        = .true.
        use_ufo        = .true.
        pre_rad        = .false.

diff --git a/parm/ccpp_gsd_sar_25km.nml.IN b/parm/ccpp_gsd_sar_25km.nml.IN
@@ -141,7 +141,7 @@
      fhzero         = 1.
      h2o_phys       = .true.
      ldiag3d        = .false.
-     fhcyc          = 0.
+     fhcyc          = @[FHCYC]
      nst_anl        = .true.
      use_ufo        = .true.
      pre_rad        = .false.

diff --git a/tests/tests/fv3_ccpp_gsd b/tests/tests/fv3_ccpp_gsd
@@ -117,7 +117,6 @@ export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
 export IMFSHALCNV=3
 export IMFDEEPCNV=3
-export FHCYC=0
 export LSM=3
 export LSOIL_LSM=9
 

diff --git a/tests/tests/fv3_ccpp_gsd_coldstart b/tests/tests/fv3_ccpp_gsd_coldstart
@@ -55,7 +55,6 @@ export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
 export IMFSHALCNV=3
 export IMFDEEPCNV=3
-export FHCYC=0
 export LSM=3
 export LSOIL_LSM=9
 

diff --git a/tests/tests/fv3_ccpp_gsd_debug b/tests/tests/fv3_ccpp_gsd_debug
@@ -93,7 +93,6 @@ export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
 export IMFSHALCNV=3
 export IMFDEEPCNV=3
-export FHCYC=0
 export LSM=3
 export LSOIL_LSM=9
 

diff --git a/tests/tests/fv3_ccpp_gsd_diag3d_debug b/tests/tests/fv3_ccpp_gsd_diag3d_debug
@@ -97,7 +97,6 @@ export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
 export IMFSHALCNV=3
 export IMFDEEPCNV=3
-export FHCYC=0
 export LSM=3
 export LSOIL_LSM=9
 

diff --git a/tests/tests/fv3_ccpp_gsd_drag_suite b/tests/tests/fv3_ccpp_gsd_drag_suite
@@ -93,7 +93,6 @@ export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
 export IMFSHALCNV=3
 export IMFDEEPCNV=3
-export FHCYC=0
 export LSM=3
 export LSOIL_LSM=9
 export GWD_OPT=3

diff --git a/tests/tests/fv3_ccpp_gsd_mynnsfc b/tests/tests/fv3_ccpp_gsd_mynnsfc
@@ -118,7 +118,6 @@ export DO_MYNNEDMF=.T.
 export DO_MYNNSFCLAY=.T.
 export IMFSHALCNV=3
 export IMFDEEPCNV=3
-export FHCYC=0
 export LSM=3
 export LSOIL_LSM=9
 

diff --git a/tests/tests/fv3_ccpp_gsd_mynnsfc_debug b/tests/tests/fv3_ccpp_gsd_mynnsfc_debug
@@ -94,7 +94,6 @@ export DO_MYNNEDMF=.T.
 export DO_MYNNSFCLAY=.T.
 export IMFSHALCNV=3
 export IMFDEEPCNV=3
-export FHCYC=0
 export LSM=3
 export LSOIL_LSM=9
 

diff --git a/tests/tests/fv3_ccpp_gsd_noah b/tests/tests/fv3_ccpp_gsd_noah
@@ -117,7 +117,6 @@ export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
 export IMFSHALCNV=3
 export IMFDEEPCNV=3
-export FHCYC=0
 export LSM=1
 export LSOIL_LSM=4
 

diff --git a/tests/tests/fv3_ccpp_gsd_warmstart b/tests/tests/fv3_ccpp_gsd_warmstart
@@ -95,7 +95,6 @@ export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
 export IMFSHALCNV=3
 export IMFDEEPCNV=3
-export FHCYC=0
 export LSM=3
 export LSOIL_LSM=9
 

diff --git a/tests/tests/fv3_ccpp_hrrr b/tests/tests/fv3_ccpp_hrrr
@@ -94,7 +94,6 @@ export DO_MYNNEDMF=.T.
 export DO_MYNNSFCLAY=.T.
 export IMFSHALCNV=-1
 export IMFDEEPCNV=-1
-export FHCYC=0
 export LSM=3
 export LSOIL_LSM=9
 export GWD_OPT=3

diff --git a/tests/tests/fv3_ccpp_rap b/tests/tests/fv3_ccpp_rap
@@ -94,7 +94,6 @@ export DO_MYNNEDMF=.T.
 export DO_MYNNSFCLAY=.T.
 export IMFSHALCNV=3
 export IMFDEEPCNV=3
-export FHCYC=0
 export LSM=3
 export LSOIL_LSM=9
 export GWD_OPT=3

diff --git a/tests/tests/fv3_ccpp_rrfs_v1beta b/tests/tests/fv3_ccpp_rrfs_v1beta
@@ -117,7 +117,6 @@ export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
 export IMFSHALCNV=-1
 export IMFDEEPCNV=-1
-export FHCYC=0
 export LSM=2
 export LSOIL_LSM=4
 export GWD_OPT=3

diff --git a/tests/tests/fv3_ccpp_rrfs_v1beta_debug b/tests/tests/fv3_ccpp_rrfs_v1beta_debug
@@ -93,7 +93,6 @@ export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
 export IMFSHALCNV=-1
 export IMFDEEPCNV=-1
-export FHCYC=0
 export LSM=2
 export LSOIL_LSM=4
 export GWD_OPT=3