Merge pull request #537 from GEOS-ESM/feature/sdrabenh/update_setup_DTs

Update DTs in `gcm_setup` for non-stock configs

AGCM.rc.tmpl

@@ -65,6 +65,10 @@ ORBIT_ANAL2B: .TRUE.
 # GFDL_1M microphysics options
 # ----------------------------------------
 @GFDL_1M_CLDMICR_OPTION: GFDL_1M
+@GFDL_1M_USE_BERGERON: .FALSE.
+@GFDL_1M_USE_AEROSOL_NN: .TRUE.
+@GFDL_1M_ICE_RADII_PARAM: 1
+@GFDL_1M_MELTFRZ: .TRUE.
 @GFDL_1M_HYDROSTATIC: @GFDL_HYDRO
 ###########################################################
 

fvcore_layout.rc

@@ -31,10 +31,12 @@
   do_evap = .false.
   do_subl = .false.
   do_qa = .false.
-  tau_l2v  = 450.
-  tau_i2v  = 450.
-  tau_revp = 450.
-  tau_frz  = 450.
+  tau_l2v  = 300.
+  tau_i2v  = 300.
+  tau_s2v  = 300.
+  tau_g2v  = 300.
+  tau_revp = 300.
+  tau_frz  = 300.
   dw_land  = 0.05
   dw_ocean = 0.10
   rh_inc = 0.30

gcm_setup

@@ -1100,7 +1100,7 @@ if( $AGCM_IM ==  "c48" ) then
      set POST_NDS = 4
 endif
 if( $AGCM_IM ==  "c90" ) then
-     set       DT = 1800
+     set       DT = 900
      set SOLAR_DT = 3600
      set IRRAD_DT = 3600
      set  LONG_DT = $DT
@@ -1129,7 +1129,7 @@ if( $AGCM_IM ==  "c90" ) then
      set POST_NDS = 8
 endif
 if( $AGCM_IM ==  "c180" ) then
-     set       DT = 900
+     set       DT = 600
      set SOLAR_DT = 3600
      set IRRAD_DT = 3600
      set  LONG_DT = $DT
@@ -1173,11 +1173,11 @@ if( $AGCM_IM == "c360" ) then
      set POST_NDS = 12
 endif
 if( $AGCM_IM == "c720" ) then
-     set       DT = 225
+     set       DT = 300
      set SOLAR_DT = 3600
      set IRRAD_DT = 3600
      set OCEAN_DT = $IRRAD_DT
-     set  LONG_DT = 450
+     set  LONG_DT = $DT
      set AGCM_IM  = 720
      set AGCM_JM  = `expr $AGCM_IM \* 6`
      set       NX = 24
@@ -1235,7 +1235,7 @@ if( $AGCM_IM == "c2880" ) then
      set CONVPAR_OPTION = NONE
 endif
 if( $AGCM_IM == "c5760" ) then
-     set       DT = 30
+     set       DT = 45
      set SOLAR_DT = 900
      set IRRAD_DT = 900
      set OCEAN_DT = $IRRAD_DT