Merge branch 'develop' into feature/ocnobs2ioda

NOAA-EMC · Nov 29, 2023 · 9a1a4ef · 9a1a4ef
2 parents 94204a0 + c2d78a6
commit 9a1a4ef
Show file tree

Hide file tree

Showing 115 changed files with 1,173 additions and 809 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -8,7 +8,7 @@ protocol = git
 required = True
 
 [UFS]
-tag = 63a43d9
+tag = 3ba8dff 
 local_path = sorc/ufs_model.fd
 repo_url = https://github.com/ufs-community/ufs-weather-model.git
 protocol = git

diff --git a/ci/cases/pr/C48_S2SA_gefs.yaml → ci/cases/pr/C48_S2SWA_gefs.yaml b/ci/cases/pr/C48_S2SA_gefs.yaml → ci/cases/pr/C48_S2SWA_gefs.yaml
@@ -4,7 +4,7 @@ experiment:
 
 arguments:
   pslot: {{ 'pslot' | getenv }}
-  app: S2SA
+  app: S2SWA
   resdet: 48
   resens: 48
   nens: 2

diff --git a/docs/source/configure.rst b/docs/source/configure.rst
@@ -4,47 +4,58 @@ Configure Run
 
 The global-workflow configs contain switches that change how the system runs. Many defaults are set initially. Users wishing to run with different settings should adjust their $EXPDIR configs and then rerun the ``setup_xml.py`` script since some configuration settings/switches change the workflow/xml ("Adjusts XML" column value is "YES").
 
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
-| Switch         | What                         | Default       | Adjusts XML | More Details                                      |
-+================+==============================+===============+=============+===================================================+
-| APP            | Model application            | ATM           | YES         | See case block in config.base for options         |
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
-| DOIAU          | Enable 4DIAU for control     | YES           | NO          | Turned off for cold-start first half cycle        |
-|                | with 3 increments            |               |             |                                                   |
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
-| DOHYBVAR       | Run EnKF                     | YES           | YES         | Don't recommend turning off                       |
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
-| DONST          | Run NSST                     | YES           | NO          | If YES, turns on NSST in anal/fcst steps, and     |
-|                |                              |               |             | turn off rtgsst                                   |
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
-| DO_AWIPS       | Run jobs to produce AWIPS    | NO            | YES         | downstream processing, ops only                   |
-|                | products                     |               |             |                                                   |
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
-| DO_BUFRSND     | Run job to produce BUFR      | NO            | YES         | downstream processing                             |
-|                | sounding products            |               |             |                                                   |
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
-| DO_GEMPAK      | Run job to produce GEMPAK    | NO            | YES         | downstream processing, ops only                   |
-|                | products                     |               |             |                                                   |
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
-| DO_VRFY        | Run vrfy job                 | NO            | YES         | Whether to include vrfy job (GSI monitoring,      |
-|                |                              |               |             | tracker, VSDB, fit2obs)                           |
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
-| DO_METP        | Run METplus jobs             | YES           | YES         | One cycle spinup                                  |
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
-| EXP_WARM_START | Is experiment starting warm  | .false.       | NO          | Impacts IAU settings for initial cycle. Can also  |
-|                | (.true.) or cold (.false)?   |               |             | be set when running ``setup_expt.py`` script with |
-|                |                              |               |             | the ``--start`` flag (e.g. ``--start warm``)      |
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
-| HPSSARCH       | Archive to HPPS              | NO            | Possibly    | Whether to save output to tarballs on HPPS        |
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
-| LOCALARCH      | Archive to a local directory | NO            | Possibly    | Instead of archiving data to HPSS, archive to a   |
-|                |                              |               |             | local directory, specified by ATARDIR. If         |
-|                |                              |               |             | LOCALARCH=YES, then HPSSARCH must =NO. Changing   |
-|                |                              |               |             | HPSSARCH from YES to NO will adjust the XML.      |
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
-| QUILTING       | Use I/O quilting             | .true.        | NO          | If .true. choose OUTPUT_GRID as cubed_sphere_grid |
-|                |                              |               |             | in netcdf or gaussian_grid                        |
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
-| WRITE_DOPOST   | Run inline post              | .true.        | NO          | If .true. produces master post output in forecast |
-|                |                              |               |             | job                                               |
-+----------------+------------------------------+---------------+-------------+---------------------------------------------------+
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| Switch         | What                             | Default       | Adjusts XML | More Details                                      |
++================+==================================+===============+=============+===================================================+
+| APP            | Model application                | ATM           | YES         | See case block in config.base for options         |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| DOIAU          | Enable 4DIAU for control         | YES           | NO          | Turned off for cold-start first half cycle        |
+|                | with 3 increments                |               |             |                                                   |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| DOHYBVAR       | Run EnKF                         | YES           | YES         | Don't recommend turning off                       |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| DONST          | Run NSST                         | YES           | NO          | If YES, turns on NSST in anal/fcst steps, and     |
+|                |                                  |               |             | turn off rtgsst                                   |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| DO_AWIPS       | Run jobs to produce AWIPS        | NO            | YES         | downstream processing, ops only                   |
+|                | products                         |               |             |                                                   |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| DO_BUFRSND     | Run job to produce BUFR          | NO            | YES         | downstream processing                             |
+|                | sounding products                |               |             |                                                   |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| DO_GEMPAK      | Run job to produce GEMPAK        | NO            | YES         | downstream processing, ops only                   |
+|                | products                         |               |             |                                                   |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| DO_FIT2OBS     | Run FIT2OBS job                  | YES           | YES         | Whether to run the FIT2OBS job                    |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| DO_TRACKER     | Run tracker job                  | YES           | YES         | Whether to run the tracker job                    |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| DO_GENESIS     | Run genesis job                  | YES           | YES         | Whether to run the genesis job                    |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| DO_GENESIS_FSU | Run FSU genesis job              | YES           | YES         | Whether to run the FSU genesis job                |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| DO_VERFOZN     | Run GSI monitor ozone job        | YES           | YES         | Whether to run the GSI monitor ozone job          |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| DO_VERFRAD     | Run GSI monitor radiance job     | YES           | YES         | Whether to run the GSI monitor radiance job       |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| DO_VMINMON     | Run GSI monitor minimization job | YES           | YES         | Whether to run the GSI monitor minimization job   |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| DO_METP        | Run METplus jobs                 | YES           | YES         | One cycle spinup                                  |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| EXP_WARM_START | Is experiment starting warm      | .false.       | NO          | Impacts IAU settings for initial cycle. Can also  |
+|                | (.true.) or cold (.false)?       |               |             | be set when running ``setup_expt.py`` script with |
+|                |                                  |               |             | the ``--start`` flag (e.g. ``--start warm``)      |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| HPSSARCH       | Archive to HPPS                  | NO            | Possibly    | Whether to save output to tarballs on HPPS        |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| LOCALARCH      | Archive to a local directory     | NO            | Possibly    | Instead of archiving data to HPSS, archive to a   |
+|                |                                  |               |             | local directory, specified by ATARDIR. If         |
+|                |                                  |               |             | LOCALARCH=YES, then HPSSARCH must =NO. Changing   |
+|                |                                  |               |             | HPSSARCH from YES to NO will adjust the XML.      |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| QUILTING       | Use I/O quilting                 | .true.        | NO          | If .true. choose OUTPUT_GRID as cubed_sphere_grid |
+|                |                                  |               |             | in netcdf or gaussian_grid                        |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
+| WRITE_DOPOST   | Run inline post                  | .true.        | NO          | If .true. produces master post output in forecast |
+|                |                                  |               |             | job                                               |
++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+
diff --git a/docs/source/jobs.rst b/docs/source/jobs.rst
@@ -18,10 +18,10 @@ An experimental run is different from operations in the following ways:
 
 * Addition steps in experimental mode:
 
-  - verification (vrfy)
-
   - archive (arch)
 
+  - cleanup (cleanup)
+
 Downstream jobs (e.g. awips, gempak, etc.) are not included in the diagram. Those jobs are not normally run in developmental tests.
 
 =============================
@@ -71,8 +71,6 @@ Jobs in the GFS Configuration
 +-------------------+-----------------------------------------------------------------------------------------------------------------------+
 | postN             | Runs the post processor.                                                                                              |
 +-------------------+-----------------------------------------------------------------------------------------------------------------------+
-| vrfy              | Runs the verification tasks.                                                                                          |
-+-------------------+-----------------------------------------------------------------------------------------------------------------------+
 | waveinit          | Runs wave initialization step.                                                                                        |
 +-------------------+-----------------------------------------------------------------------------------------------------------------------+
 | waveprep          | Runs wave prep step.                                                                                                  |

diff --git a/env/AWSPW.env b/env/AWSPW.env
@@ -5,7 +5,7 @@ if [[ $# -ne 1 ]]; then
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
     echo "atmanlrun atmensanlrun aeroanlrun landanlrun"
-    echo "anal sfcanl fcst post vrfy metp"
+    echo "anal sfcanl fcst post metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"
     exit 1

diff --git a/env/CONTAINER.env b/env/CONTAINER.env
@@ -5,7 +5,7 @@ if [[ $# -ne 1 ]]; then
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
     echo "atmanlrun atmensanlrun aeroanlrun landanl"
-    echo "anal sfcanl fcst post vrfy metp"
+    echo "anal sfcanl fcst post metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"
     exit 1