Update FV3 namelist settings; clean up diag_tables; fix QUILTING="FALSE" bug

tests/baseline_configs/config.suite_FV3_GFS_2017_gfdlmp_regional.sh

@@ -0,0 +1,17 @@
+RUN_ENVIR="community"
+PREEXISTING_DIR_METHOD="rename"
+
+PREDEF_GRID_NAME="RRFS_CONUS_25km"
+QUILTING="TRUE"
+
+CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp_regional"
+FCST_LEN_HRS="6"
+LBC_SPEC_INTVL_HRS="6"
+
+DATE_FIRST_CYCL="20190701"
+DATE_LAST_CYCL="20190701"
+CYCL_HRS=( "00" )
+
+EXTRN_MDL_NAME_ICS="FV3GFS"
+EXTRN_MDL_NAME_LBCS="FV3GFS"
+USE_USER_STAGED_EXTRN_FILES="TRUE"

tests/baseline_configs/config.suite_FV3_RRFS_v1alpha.sh

@@ -5,8 +5,7 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
 QUILTING="TRUE"
 
 CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
-
-FCST_LEN_HRS="06"
+FCST_LEN_HRS="6"
 LBC_SPEC_INTVL_HRS="6"
 
 DATE_FIRST_CYCL="20190520"

tests/baseline_configs/config.suite_FV3_RRFS_v1beta.sh

@@ -5,8 +5,7 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
 QUILTING="TRUE"
 
 CCPP_PHYS_SUITE="FV3_RRFS_v1beta"
-
-FCST_LEN_HRS="06"
+FCST_LEN_HRS="6"
 LBC_SPEC_INTVL_HRS="6"
 
 DATE_FIRST_CYCL="20190520"

tests/baselines_list.txt

@@ -43,9 +43,10 @@ new_GFDLgrid
 new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE
 new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE
 pregen_grid_orog_sfc_climo
-regional_001
 regional_002
 suite_FV3_CPT_v0
+suite_FV3_GFS_2017_gfdlmp
+suite_FV3_GFS_2017_gfdlmp_regional
 suite_FV3_GFS_v15p2
 suite_FV3_GFS_v16beta
 suite_FV3_GSD_SAR

ush/generate_FV3LAM_wflow.sh

@@ -19,11 +19,11 @@ function generate_FV3LAM_wflow() {
 #
 #-----------------------------------------------------------------------
 #
-  if [[ $(uname -s) == Darwin ]]; then
-    local scrfunc_fp=$( greadlink -f "${BASH_SOURCE[0]}" )
-  else
-    local scrfunc_fp=$( readlink -f "${BASH_SOURCE[0]}" )
-  fi
+if [[ $(uname -s) == Darwin ]]; then
+  local scrfunc_fp=$( greadlink -f "${BASH_SOURCE[0]}" )
+else
+  local scrfunc_fp=$( readlink -f "${BASH_SOURCE[0]}" )
+fi
 local scrfunc_fn=$( basename "${scrfunc_fp}" )
 local scrfunc_dir=$( dirname "${scrfunc_fp}" )
 #

ush/launch_FV3LAM_wflow.sh

@@ -87,6 +87,14 @@ fi
 #
 #-----------------------------------------------------------------------
 #
+# Source bash utility functions.
+#
+#-----------------------------------------------------------------------
+#
+. $USHDIR/source_util_funcs.sh
+#
+#-----------------------------------------------------------------------
+#
 # Set the name of the experiment.  We take this to be the name of the 
 # experiment subdirectory (i.e. the string after the last "/" in the 
 # full path to the experiment directory).

ush/templates/FV3.input.yml

@@ -11,12 +11,10 @@
 
 
 FV3_GSD_v0:
-  gfs_physics_nml:
-    effr_in: True
 
 FV3_GSD_SAR: 
   gfs_physics_nml: &gsd_sar_phys
-    effr_in: True
+    do_deep: False
     imfdeepcnv: 0
     imfshalcnv: 0
     iopt_alb: 2
@@ -31,14 +29,12 @@ FV3_GSD_SAR:
     iopt_snf: 4
     iopt_stc: 1
     iopt_tbot: 2
-    do_deep: False
 
 FV3_RRFS_v1alpha:
   gfs_physics_nml:
     <<: *gsd_sar_phys
     do_deep: False
     do_mynnsfclay: False
-    effr_in: True
     imfdeepcnv: -1
     imfshalcnv: -1
     lsm: 2
@@ -51,7 +47,6 @@ FV3_RRFS_v1beta:
     <<: *gsd_sar_phys
     do_deep: False
     do_mynnsfclay: True
-    effr_in: True
     imfdeepcnv: -1
     imfshalcnv: -1
     lsm: 2
@@ -86,7 +81,6 @@ FV3_GFS_2017_gfdlmp:
     do_deep: False
     do_mynnedmf: !!python/none
     do_mynnsfclay: !!python/none
-    effr_in: True
     fhcyc: 0.0
     fhlwr: 3600.0
     fhswr: 3600.0
@@ -193,7 +187,6 @@ FV3_GFS_2017_gfdlmp_regional:
 
 FV3_GFS_v15p2:
   atmos_model_nml:
-    ccpp_suite: FV3_GFS_v15
     fdiag: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 18, 21, 24]
   fms_nml:
     domains_stack_size: 1800200
@@ -217,9 +210,6 @@ FV3_GFS_v15p2:
     range_warn: False
     rf_cutoff: 750.0
     rf_fast: False
-    stretch_fac: 0.999
-    target_lat: 38.5
-    target_lon: -97.5
   gfdl_cloud_microphysics_nml:
     <<: *gfs_gfdl_cloud_mp
     sedi_transport: True
@@ -239,7 +229,6 @@ FV3_GFS_v15p2:
     do_tofd: False
     do_ugwp: False
     do_ysu: False
-    effr_in: False
     fhcyc: 0.0
     fhlwr: 3600.0
     fhswr: 3600.0
@@ -264,15 +253,14 @@ FV3_GFS_v15p2:
     iopt_stc: 1
     iopt_tbot: 2
     ldiag_ugwp: False
-    lgfdlmprad: False
+    lgfdlmprad: True
     lradar: !!python/none
     lsm: 1
     lsoil: !!python/none
     lsoil_lsm: !!python/none
     ltaerosol: !!python/none
     shal_cnv: True
     shinhong: False
-    trans_trac: False
     ttendlim: !!python/none
     xkzm_h: 1.0
     xkzm_m: 1.0
@@ -284,7 +272,6 @@ FV3_GFS_v15p2:
 
 FV3_GFS_v16beta:
   atmos_model_nml:
-    ccpp_suite: FV3_GFS_v16
     fdiag: 3
     fhmax: 240
     fhmaxhf: 0
@@ -327,7 +314,6 @@ FV3_GFS_v16beta:
     do_myjsfc: !!python/none
     do_tofd: True
     do_ysu: !!python/none
-    effr_in: True
     hybedmf: False
     iaer: 5111
     icliq_sw: 2
@@ -344,7 +330,6 @@ FV3_GFS_v16beta:
     psautco: [0.0008, 0.0005]
     satmedmf: True
     shinhong: !!python/none
-    trans_trac: True
     xkzminv: !!python/none
     xkzm_m: !!python/none
     xkzm_h: !!python/none
@@ -358,7 +343,6 @@ FV3_GFS_v16beta:
 
 FV3_CPT_v0:
   atmos_model_nml:
-    ccpp_suite: FV3_CPT_v0
     fdiag: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 18, 21, 24]
   fms_nml:
     domains_stack_size: 1800200
@@ -394,7 +378,6 @@ FV3_CPT_v0:
     do_mynnedmf: !!python/none
     do_mynnsfclay: !!python/none
     do_shoc: False
-    effr_in: True
     fhcyc: 0.0
     fhlwr: 3600.0
     fhswr: 3600.0

ush/templates/input.nml.FV3

@@ -144,6 +144,7 @@
     do_skeb = .false.
     do_sppt = .false.
     dspheat = .true.
+    effr_in = .true.
     fhcyc = 0.0
     fhlwr = 1200.0
     fhswr = 1200.0