Merge branch 'develop' into feature/vvalenti/gocart2g_to_gmi_connecti…

…vity

fvcore_layout.rc

@@ -29,21 +29,16 @@
   const_vs = .F.
   const_vg = .F.
   const_vr = .F.
-  vi_fac = 1.
-  vi_max = 1.
-  vs_max = 2.
-  vg_max = 12.
-  vr_max = 12.
   qi_lim = 1.
-  do_evap = .false.
-  do_subl = .false.
+  do_evap = .true.
+  do_subl = .true.
   do_qa = .false.
   sat_adj0 = 0.75
-  tau_l2v  = 225.
-  tau_i2v  = 225.
-  tau_revp = 225.
-  tau_frz  = 450.
-  tau_i2s  = 450.
+  tau_l2v  = 600.
+  tau_i2v  = 600.
+  tau_revp = 600.
+  tau_frz  = 600.
+  tau_i2s  = 600.
   dw_land  = 0.05
   dw_ocean = 0.20
   ql_mlt = 1.0e-4