Suite name updates:

     - Replace old suite names in test files
     - Updating some documentation for new suite names

README.md

@@ -34,9 +34,9 @@ The top level directory structure groups source code and input files as follow:
 | ```tests/```              | Regression and unit testing framework scripts. |
 | ```build.sh```            | Script to build the model executable (also used by `tests/`) |
 
-E.g. use of `build.sh` to build the coupled model with `FV3_GFS_v15p2` as the CCPP suite.
+E.g. use of `build.sh` to build the coupled model with `kingfisher` as the CCPP suite.
 ```
-$> CMAKE_FLAGS="-DAPP=S2S" CCPP_SUITES="FV3_GFS_v15p2" ./build.sh
+$> CMAKE_FLAGS="-DAPP=S2S" CCPP_SUITES="kingfisher" ./build.sh
 ```
 The build system is regularly tested with [Tier-1 and Tier-2 platforms](
 https://github.com/ufs-community/ufs-weather-model/wiki/Regression-Test-Policy-for-Weather-Model-Platforms-and-Compilers).

doc/UsersGuide/source/BuildingAndRunning.rst

@@ -276,7 +276,7 @@ For the ``ufs-weather-model ATMAERO`` configuration (standalone ATM coupled to :
 
 .. code-block:: console
 
-    export CMAKE_FLAGS="-DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v17_p8"
+    export CMAKE_FLAGS="-DAPP=ATMAERO -DCCPP_SUITES=bluebird"
 
 .. _atmaq:
 
@@ -286,7 +286,7 @@ For the ``ufs-weather-model ATMAQ`` configuration (standalone ATM coupled to :te
 
 .. code-block:: console
 
-    export CMAKE_FLAGS="-DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2"
+    export CMAKE_FLAGS="-DAPP=ATMAQ -DCCPP_SUITES=kingfisher"
 
 .. _atml:
 
@@ -296,7 +296,7 @@ For the ``ufs-weather-model ATML`` configuration (standalone ATM coupled to :ter
 
 .. code-block:: console
 
-    export CMAKE_FLAGS="-DAPP=ATML -DCCPP_SUITES=FV3_GFS_v17_p8"
+    export CMAKE_FLAGS="-DAPP=ATML -DCCPP_SUITES=bluebird"
 
 S2S Configurations 
 ----------------------

doc/UsersGuide/source/FAQ.rst

@@ -29,18 +29,19 @@ The steps are:
          cd tests
 
    #. Find a configure (``*.conf``) file that contains the machine and compiler you are using. For this
-      example, the Intel compiler on Derecho is used.  To create a custom configure file, two lines are
+      example, the test is being run on the Derecho machine.  To create a custom configure file, two lines are
       needed:  a ``COMPILE`` line and a ``RUN`` line.   The ``COMPILE`` line should contain the name
-      of the machine and compiler ``derecho.intel`` and the desired ``SUITES`` for the build.  Choose a
+      of the machine``derecho`` and the desired ``SUITES`` for the build.  Choose a
       ``RUN`` line under this ``COMPILE`` command that uses the desired ``SUITE``.  For example:
 
       .. code-block:: console
 
-         COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_no_nsst,FV3_GFS_v16beta_no_nsst                     | standard    | derecho.intel | fv3
-         RUN     | fv3_ccpp_gfs_v16beta                                                                                                           | standard    |                | fv3         |
+         COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=raven,bluebird,hummingbird -D32BIT=ON | | fv3 |
+         RUN | control_c192                                      | - derecho                | baseline |
+
 
       Put these two lines into a file called ``my_test.conf``.  The parameters used in this run can be
-      found in the ``fv3_ccpp_gfs_v16beta`` file in the ``ufs-weather-model/tests/tests`` directory.
+      found in the ``control_c192`` file in the ``ufs-weather-model/tests/tests`` directory.
 
       .. note::  These two lines are long and may not appear in entirety in your browser. Scroll to the right to see
                the entire line.

tests/default_vars.sh

@@ -437,7 +437,7 @@ export DIAG_TABLE=diag_table_gfsv16
 export FIELD_TABLE=field_table_gfsv16
 export FV3_RUN=control_run.IN
 export INPUT_NML=control.nml.IN
-export CCPP_SUITE=FV3_GFS_v16
+export CCPP_SUITE=raven
 
 export DOGP_CLDOPTICS_LUT=.false.
 export DOGP_LWSCAT=.false.
@@ -537,7 +537,7 @@ export MIN_LAKEICE=0.15
 
 #input file
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v17_p8
+export CCPP_SUITE=bluebird
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
 export INPUT_NML=global_control.nml.IN
@@ -1115,7 +1115,7 @@ export_cmeps
 
 # FV3 defaults
 export FRAC_GRID=.true.
-export CCPP_SUITE=FV3_GFS_v17_coupled_p8
+export CCPP_SUITE=pelican
 export INPUT_NML=global_control.nml.IN
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 export DIAG_TABLE=diag_table_cpld.IN
@@ -1601,7 +1601,7 @@ export FV_CORE_TAU=10.
 export RF_CUTOFF=7.5e2
 
 export FV3_RUN=lake_control_run.IN
-export CCPP_SUITE=FV3_HRRR
+export CCPP_SUITE=bald_eagle
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
 export NEW_DIAGTABLE=diag_table_rap
@@ -1680,7 +1680,7 @@ export HYBEDMF=.false.
 export SHAL_CNV=.false.
 export DO_SAT_ADJ=.false.
 export DO_DEEP=.false.
-export CCPP_SUITE='FV3_HRRR'
+export CCPP_SUITE='bald_eagle'
 export INPES=12
 export JNPES=12
 export NPX=397
@@ -1773,7 +1773,7 @@ export_rap()
   export_rap_common
 
   export DIAG_TABLE=diag_table_rap
-  export CCPP_SUITE=FV3_RAP
+  export CCPP_SUITE=albatross
 
   export IMFSHALCNV=3
   export IMFDEEPCNV=3
@@ -1795,7 +1795,7 @@ export_rrfs_v1()
 {
   export_rap_common
 
-  export CCPP_SUITE=FV3_RRFS_v1beta
+  export CCPP_SUITE=pigeon
   export DIAG_TABLE=diag_table_rap_noah
 
   export DO_DEEP=.false.

tests/parm/diag_table/diag_additional_control_dtend

@@ -1,4 +1,4 @@
-# This file contains diag_table entries for 3D diagnostic tendencies from the fv3_gfs_v16 suite.
+# This file contains diag_table entries for 3D diagnostic tendencies from the "raven" physics suite.
 # It should be appended to the end of the diag_table before execution of the test.
 
 # Old d*3dt variables with new names: