Updated land perturbation scheme (NOAA-EMC#176)

* update to pre-existing land perts scheme, ready for addition of the new scheme
* updates to land perts scheme, so that namelist input and control_type variables are in generic (i.e., variable agnostic) arrays
* Phil's ccpp changes
* minor bug fix
* Comitting stochastic physics updates
* Comitting FV3 submodules updates
* Updates for minimal set of regression tests.
* lndp sub-module clean-up
* Updates to tests to include new input parameters for revised land pert scheme (lndp).

.gitmodules

@@ -17,4 +17,5 @@
 [submodule "stochastic_physics"]
 	path = stochastic_physics
 	url = https://github.com/noaa-psd/stochastic_physics
-	branch = master
+        branch = master
+

parm/ccpp.gocart.nml.IN

@@ -185,7 +185,8 @@
        do_sppt        = @[DO_SPPT]
        do_shum        = @[DO_SHUM]
        do_skeb        = @[DO_SKEB]
-       do_sfcperts    = @[DO_SFCPERTS]
+       lndp_type      = @[LNDP_TYPE]
+       n_var_lndp     = @[N_VAR_LNDP]
 /
 
 &gfdl_cloud_microphysics_nml

parm/ccpp_ca.nml.IN

@@ -190,7 +190,8 @@
        do_sppt        = @[DO_SPPT]
        do_shum        = @[DO_SHUM]
        do_skeb        = @[DO_SKEB]
-       do_sfcperts    = @[DO_SFCPERTS]
+       lndp_type     = @[LNDP_TYPE]
+       n_var_lndp     = @[N_VAR_LNDP]
        do_ca          = @[DO_CA]
        ca_sgs         = @[CA_SGS]
        ca_global      = @[CA_GLOBAL]
@@ -282,17 +283,10 @@
   ISEED_SPPT=3,
 /
 &nam_sfcperts
-  NSFCPERT=6,
-  PERTZ0=-999.,
-  PERTSHC=-999.,
-  PERTZT=-999.,
-  PERTLAI=-999.,
-  PERTVEGF=-999.,
-  PERTALB=-999.,
-  SFC_TAU=21600,
-  SFC_LSCALE=500000,
-  ISEED_SFC=0,
-  SPPT_LAND=.FALSE.,
+  lndp_type      = @[LNDP_TYPE]
+  LNDP_TAU=21600,
+  LNDP_LSCALE=500000,
+  ISEED_LNDP=2010,
 /
 
 &cires_ugwp_nml

parm/ccpp_control.nml.IN

@@ -192,7 +192,8 @@
        do_sppt        = @[DO_SPPT]
        do_shum        = @[DO_SHUM]
        do_skeb        = @[DO_SKEB]
-       do_sfcperts    = @[DO_SFCPERTS]
+       lndp_type      = @[LNDP_TYPE]
+       n_var_lndp     = @[N_VAR_LNDP]
        do_ca          = .false.
        ca_sgs         = .false.
        nca            = 1
@@ -284,17 +285,10 @@
   ISEED_SPPT=3,
 /
 &nam_sfcperts
-  NSFCPERT=6,
-  PERTZ0=-999.,
-  PERTSHC=-999.,
-  PERTZT=-999.,
-  PERTLAI=-999.,
-  PERTVEGF=-999.,
-  PERTALB=-999.,
-  SFC_TAU=21600,
-  SFC_LSCALE=500000,
-  ISEED_SFC=0,
-  SPPT_LAND=.FALSE.,
+  lndp_type      = @[LNDP_TYPE]
+  LNDP_TAU=21600,
+  LNDP_LSCALE=500000,
+  ISEED_LNDP=2010,
 /
 
 &cires_ugwp_nml

parm/ccpp_gfdlmp.nml.IN

@@ -190,7 +190,8 @@
        do_sppt        = @[DO_SPPT]
        do_shum        = @[DO_SHUM]
        do_skeb        = @[DO_SKEB]
-       do_sfcperts    = @[DO_SFCPERTS]
+       lndp_type      = @[LNDP_TYPE]
+       n_var_lndp     = @[N_VAR_LNDP]
 /
 
 &gfdl_cloud_microphysics_nml

parm/ccpp_gsd.nml.IN

@@ -172,7 +172,8 @@
        do_sppt        = @[DO_SPPT]
        do_shum        = @[DO_SHUM]
        do_skeb        = @[DO_SKEB]
-       do_sfcperts    = @[DO_SFCPERTS]
+       lndp_type      = @[LNDP_TYPE]
+       n_var_lndp     = @[N_VAR_LNDP]
        lsm            = @[LSM]
        lsoil_lsm      = @[LSOIL_LSM]
        iopt_dveg      = 2
@@ -312,17 +313,10 @@
   ISEED_SPPT=3,
 /
 &nam_sfcperts
-  NSFCPERT=6,
-  PERTZ0=-999.,
-  PERTSHC=-999.,
-  PERTZT=-999.,
-  PERTLAI=-999.,
-  PERTVEGF=-999.,
-  PERTALB=-999.,
-  SFC_TAU=21600,
-  SFC_LSCALE=500000,
-  ISEED_SFC=0,
-  SPPT_LAND=.FALSE.,
+  lndp_type      = @[LNDP_TYPE]
+  LNDP_TAU=21600,
+  LNDP_LSCALE=500000,
+  ISEED_LNDP=2010,
 /
 
 &cires_ugwp_nml

parm/ccpp_gsd_sar.nml.IN

@@ -193,7 +193,8 @@
        do_sppt        = .F.
        do_shum        = .F.
        do_skeb        = .F.
-       do_sfcperts    = .F.
+       lndp_type      = @[LNDP_TYPE]
+       n_var_lndp     = @[N_VAR_LNDP]
        lsm            = 3
        lsoil          = 4
        lsoil_lsm      = 9
@@ -283,17 +284,10 @@
   ISEED_SPPT=3,
 /
 &nam_sfcperts
-  NSFCPERT=6,
-  PERTZ0=-999.,
-  PERTSHC=-999.,
-  PERTZT=-999.,
-  PERTLAI=-999.,
-  PERTVEGF=-999.,
-  PERTALB=-999.,
-  SFC_TAU=21600,
-  SFC_LSCALE=500000,
-  ISEED_SFC=0,
-  SPPT_LAND=.FALSE.,
+  lndp_type      = @[LNDP_TYPE]
+  LNDP_TAU=21600,
+  LNDP_LSCALE=500000,
+  ISEED_LNDP=2010,
 /
 
 &cires_ugwp_nml

parm/ccpp_gsd_sar_25km.nml.IN

@@ -194,7 +194,8 @@
      do_sppt        = .F.
      do_shum        = .F.
      do_skeb        = .F.
-     do_sfcperts    = .F.
+       lndp_type      = @[LNDP_TYPE]
+       n_var_lndp     = @[N_VAR_LNDP]
      lsm            = 3
      lsoil          = 9
      lsoil_lsm      = 9
@@ -299,15 +300,8 @@
      ISEED_SPPT=3,
 /
 &nam_sfcperts
-     NSFCPERT=6,
-     PERTZ0=-999.,
-     PERTSHC=-999.,
-     PERTZT=-999.,
-     PERTLAI=-999.,
-     PERTVEGF=-999.,
-     PERTALB=-999.,
-     SFC_TAU=21600,
-     SFC_LSCALE=500000,
-     ISEED_SFC=0,
-     SPPT_LAND=.FALSE.,
+     lndp_type      = @[LNDP_TYPE]
+     LNDP_TAU=21600,
+     LNDP_LSCALE=500000,
+     ISEED_LNDP=2010,
 /

parm/ccpp_gsd_sar_v1.nml.IN

@@ -192,7 +192,8 @@
        do_sppt        = .F.
        do_shum        = .F.
        do_skeb        = .F.
-       do_sfcperts    = .F.
+       lndp_type      = @[LNDP_TYPE]
+       n_var_lndp     = @[N_VAR_LNDP]
        lsm            = 1
        lsoil          = 4
        iopt_dveg      = 2
@@ -281,17 +282,10 @@
   ISEED_SPPT=3,
 /
 &nam_sfcperts
-  NSFCPERT=6,
-  PERTZ0=-999.,
-  PERTSHC=-999.,
-  PERTZT=-999.,
-  PERTLAI=-999.,
-  PERTVEGF=-999.,
-  PERTALB=-999.,
-  SFC_TAU=21600,
-  SFC_LSCALE=500000,
-  ISEED_SFC=0,
-  SPPT_LAND=.FALSE.,
+   lndp_type      = @[LNDP_TYPE]
+   LNDP_TAU=21600,
+   LNDP_LSCALE=500000,
+   ISEED_LNDP=2010
 /
 
 &cires_ugwp_nml