Remove several deprecated grids (#342)

## DESCRIPTION OF CHANGES: 
* Rename the GSD_HAFS grids to include underscores (from GSD_HAVSV0.A3km, GSD_HAVSV0.A13km, and GSD_HAVSV0.A25km to GSD_HAVSV0.A_3km, GSD_HAVSV0.A_13km and GSD_HAVSV0.A_25km, respectively).
* Remove grids EMC_CONUS_3km and EMC_CONUS_coarse since the grids CONUS_3km_GFDLgrid and CONUS_25km_GFDLgrid are very similar to these.
* Remove WE2E tests involving the EMC_CONUS_3km and EMC_CONUS_coarse grids (names of removed tests are nco_EMC_CONUS_3km, nco_EMC_CONUS_coarse, and nco_EMC_CONUS_coarse__suite_FV3_GFS_2017_gfdlmp).
* Modify the WE2E test nco_ensemble to use the CONUS_25km_GFDLgrid grid instead of EMC_CONUS_coarse.
* Add new WE2E test nco_CONUS_25km_GFDLgrid to test this grid in NCO mode.  (This test is a replacement for the removed test nco_EMC_CONUS_coarse.)
* Rename all WE2E test configuration files containing the strings "RAPX" and "HRRRX" so that they are replaced with "RAP" and "HRRR", respectively. 
* Update the list of WE2E tests in baselines_list.txt.
* Update the sample NCO-mode workflow configuration file config.nco.sh to:
  a) Use the CONUS_25km_GFDLgrid grid instead of EMC_CONUS_coarse.
  b) Use the FV3_GFS_v15p2 physics suite (which is one of the two supported by the release) instead of FV3_GFS_2017_gfdlmp.
  c) Remove commented-out code.
* Reorder the remaining grids in the case-statement in set_predef_grid_params.sh and in valid_param_vals.sh.

## TESTS CONDUCTED:
On Hera, ran the following tests:
* The renamed test grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.  This is to make sure that the RAPX,HRRRX --> RAP,HRRR changes did not introduce bugs.
* The existing test nco_ensemble.  This is to make sure that the change in grid in this test didn't break this test.
* The existing test grid_CONUS_25km_GFDLgrid_FV3GFS_FV3GFS to make sure it still works and to generate grid, orography, and surface climatology files for the new test nco_CONUS_25km_GFDLgrid (which uses pregenerated such files).
* The new test nco_CONUS_25km_GFDLgrid.  

All tests were successful.  Also used the sample NCO-mode workflow configuration file config.nco.sh to manually (i.e. without using cron) run a test, which was successful.

tests/baseline_configs/config.get_extrn_files_from_hpss_RAPX_RAPX.sh → tests/baseline_configs/config.get_extrn_files_from_hpss_RAP_RAP.sh

@@ -14,5 +14,5 @@ DATE_FIRST_CYCL="20190520"
 DATE_LAST_CYCL="20190520"
 CYCL_HRS=( "00" )
 
-EXTRN_MDL_NAME_ICS="RAPX"
-EXTRN_MDL_NAME_LBCS="RAPX"
+EXTRN_MDL_NAME_ICS="RAP"
+EXTRN_MDL_NAME_LBCS="RAP"

tests/baseline_configs/config.grid_GSD_HRRR_AK_50km.sh

@@ -14,8 +14,8 @@ DATE_FIRST_CYCL="20190520"
 DATE_LAST_CYCL="20190520"
 CYCL_HRS=( "00" )
 
-EXTRN_MDL_NAME_ICS="RAPX"
-EXTRN_MDL_NAME_LBCS="RAPX"
+EXTRN_MDL_NAME_ICS="RAP"
+EXTRN_MDL_NAME_LBCS="RAP"
 USE_USER_STAGED_EXTRN_FILES="TRUE"
 #
 # For a coarse grid such as this, the number of MPI processes (= NNODES*PPN) 

tests/baseline_configs/config.grid_RRFS_AK_13km_RAPX_RAPX.sh → tests/baseline_configs/config.grid_RRFS_AK_13km_RAP_RAP.sh

@@ -14,6 +14,6 @@ DATE_FIRST_CYCL="20200801"
 DATE_LAST_CYCL="20200801"
 CYCL_HRS=( "00" )
 
-EXTRN_MDL_NAME_ICS="RAPX"
-EXTRN_MDL_NAME_LBCS="RAPX"
+EXTRN_MDL_NAME_ICS="RAP"
+EXTRN_MDL_NAME_LBCS="RAP"
 USE_USER_STAGED_EXTRN_FILES="TRUE"

tests/baseline_configs/config.grid_RRFS_AK_3km_RAPX_RAPX.sh → tests/baseline_configs/config.grid_RRFS_AK_3km_RAP_RAP.sh

@@ -14,6 +14,6 @@ DATE_FIRST_CYCL="20200801"
 DATE_LAST_CYCL="20200801"
 CYCL_HRS=( "00" )
 
-EXTRN_MDL_NAME_ICS="RAPX"
-EXTRN_MDL_NAME_LBCS="RAPX"
+EXTRN_MDL_NAME_ICS="RAP"
+EXTRN_MDL_NAME_LBCS="RAP"
 USE_USER_STAGED_EXTRN_FILES="TRUE"

tests/baseline_configs/config.nco_EMC_CONUS_coarse__suite_FV3_GFS_2017_gfdlmp.sh → tests/baseline_configs/config.nco_CONUS_25km_GFDLgrid.sh

@@ -1,11 +1,11 @@
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
-PREDEF_GRID_NAME="EMC_CONUS_coarse"
+PREDEF_GRID_NAME="CONUS_25km_GFDLgrid"
 GRID_GEN_METHOD="GFDLgrid"
 QUILTING="TRUE"
 
-CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
+CCPP_PHYS_SUITE="FV3_GFS_v16beta"
 
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"

tests/baseline_configs/config.nco_ensemble.sh

@@ -1,7 +1,7 @@
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
-PREDEF_GRID_NAME="EMC_CONUS_coarse"
+PREDEF_GRID_NAME="CONUS_25km_GFDLgrid"
 GRID_GEN_METHOD="GFDLgrid"
 QUILTING="TRUE"
 

tests/baselines_list.txt

@@ -28,9 +28,7 @@ grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
 grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
 grid_RRFS_SUBCONUS_3km_FV3GFS_FV3GFS
 grid_RRFS_SUBCONUS_3km_HRRR_RAP
-nco_EMC_CONUS_3km
-nco_EMC_CONUS_coarse
-nco_EMC_CONUS_coarse__suite_FV3_GFS_2017_gfdlmp
+nco_CONUS_25km_GFDLgrid
 nco_RRFS_CONUS_25km_HRRR_RAP
 nco_RRFS_CONUS_3km_FV3GFS_FV3GFS
 nco_RRFS_CONUS_3km_HRRR_RAP

ush/config.nco.sh

@@ -7,11 +7,12 @@ VERBOSE="TRUE"
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
-PREDEF_GRID_NAME="EMC_CONUS_coarse"
+PREDEF_GRID_NAME="CONUS_25km_GFDLgrid"
 GRID_GEN_METHOD="GFDLgrid"
-
 QUILTING="TRUE"
-CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
+
+CCPP_PHYS_SUITE="FV3_GFS_v15p2"
+
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="6"
 
@@ -22,15 +23,7 @@ CYCL_HRS=( "18" )
 EXTRN_MDL_NAME_ICS="FV3GFS"
 EXTRN_MDL_NAME_LBCS="FV3GFS"
 
-#
-# In NCO mode, the following don't need to be explicitly set to "FALSE" 
-# in this configuration file because the experiment generation script
-# will do this (along with printing out an informational message).
-#
-#RUN_TASK_MAKE_GRID="FALSE"
-#RUN_TASK_MAKE_OROG="FALSE"
-#RUN_TASK_MAKE_SFC_CLIMO="FALSE"
-
+# The following must be modified for different platforms and users.
 RUN="an_experiment"
 COMINgfs="/scratch1/NCEPDEV/hwrf/noscrub/hafs-input/COMGFS"     # Path to directory containing files from the external model (FV3GFS).
 STMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp"  # Path to directory STMP that mostly contains input files.

ush/generate_FV3LAM_wflow.sh

@@ -615,7 +615,7 @@ if [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
     print_err_msg_exit "\
 The value to set the variable lsoil to in the FV3 namelist file (FV3_NML_FP)
 has not been specified for the following combination of physics suite and
-external model ICs:
+external model for ICs:
   CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\"
   EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\"
 Please change one or more of these parameters or provide a value for lsoil