Merge pull request #87 from chan-hoo/cherrypick

Cherry-picking changes of RRFS_dev1 between Sep 7 and Oct 19. Non-squashed merge at the request of Chan-Hoo.
NOAA-EMC · Nov 3, 2023 · 2527f00 · 2527f00
2 parents 44ac96f + b69f8fc
commit 2527f00
Show file tree

Hide file tree

Showing 67 changed files with 6,824 additions and 1,802 deletions.
diff --git a/README.md b/README.md
@@ -23,9 +23,13 @@ cd rrfs-workflow/sorc
 
 4. Build the RRFS workflow:
 ```
+./app_build.sh
+```
+Alternatively, the above command can be followed by the platform (machine) name as follows:
+```
 ./app_build.sh -p=[machine]
 ```
-where `[machine]` is `wcoss2`, `hera`, `orion`, or `jet`.
+where `[machine]` is `wcoss2`, `hera`, `jet`, or `orion`.
 
 5. Move to the home directory (rrfs-workflow):
 ```

diff --git a/doc/UsersGuide/source/Quickstart.rst b/doc/UsersGuide/source/Quickstart.rst
@@ -27,6 +27,12 @@ Building RRFS workflow
 
    #. Set up the build environment and build the executables:
 
+      .. code-block:: console
+            
+         ./app_build.sh
+
+      Alternatively, the above command can be followed by the platform (machine) name as follows:
+
       .. code-block:: console
             
          ./app_build.sh --platform=<machine>

diff --git a/fix/gsi/anavinfo.rrfs_sd b/fix/gsi/anavinfo.rrfs_sd
@@ -44,6 +44,7 @@ state_vector::
  ps        1      0     met_guess    prse
  smoke    65      1     chem_guess   smoke
  dust     65      1     chem_guess   dust
+ coarsepm 65      1     chem_guess   coarsepm
 ::
 
 control_vector::
@@ -55,11 +56,13 @@ control_vector::
  q        65      1       0.80        -1.0     state    q
  smoke    65      1       1.00        -1.0     state    smoke
  dust     65      1       1.00        -1.0     state    dust
+ coarsepm 65      1       1.00        -1.0     state    coarsepm
 ::
 
 chem_guess::
 !var     level  itracer crtm_use   type    orig_name
  smoke    65      1       12     smoke     smoke
  dust     65      1       12     dust      dust
+ coarsepm 65      1       12     coarsepm  coarsepm
  pm2_5    65      1       10     pm2_5     pm2_5
 ::
diff --git a/fix/gsi/berror.rrfs_sd b/fix/gsi/berror.rrfs_sd
diff --git a/fix/gsi/global_satinfo.txt b/fix/gsi/global_satinfo.txt
diff --git a/fix/gsi/gsiparm.anl.sh b/fix/gsi/gsiparm.anl.sh
@@ -124,12 +124,15 @@ OBS_INPUT::
    seviribufr     seviri      m10       seviri_m10           0.0     2     0
    seviribufr     seviri      m11       seviri_m11           0.0     2     0
    iasibufr       iasi        metop-b   iasi_metop-b         0.0     2     0
+   iasibufr       iasi        metop-c   iasi_metop-c         0.0     2     0
    gomebufr       gome        metop-b   gome_metop-b         0.0     2     0
    atmsbufr       atms        npp       atms_npp             0.0     2     0
    atmsbufr       atms        n20       atms_n20             0.0     2     0
+   atmsbufr       atms        n21       atms_n21             0.0     2     0
    crisbufr       cris        npp       cris_npp             0.0     2     0
    crisfsbufr     cris-fsr    npp       cris-fsr_npp         0.0     2     0 
    crisfsbufr     cris-fsr    n20       cris-fsr_n20         0.0     2     0 
+   crisfsbufr     cris-fsr    n21       cris-fsr_n21         0.0     2     0 
    abibufr        abi         g16       abi_g16              0.0     2     0
    mlsbufr        mls30       aura      mls30_aura           0.0     0     0
    oscatbufr      uv          null      uv                   0.0     0     0
@@ -138,6 +141,7 @@ OBS_INPUT::
    refInGSI       rad_ref     null      rad_ref              1.0     0     0
    lghtInGSI      lghtn       null      lghtn                1.0     0     0
    larcInGSI      larccld     null      larccld              1.0     0     0
+   abibufr        abi         g18       abi_g18              0.0     2     0
 ::
  &SUPEROB_RADAR
    del_azimuth=5.,del_elev=.25,del_range=5000.,del_time=.5,elev_angle_max=5.,minnum=50,range_max=100000., l2superob_only=.false.,

diff --git a/fix/gsi/pm.bufrtable b/fix/gsi/pm.bufrtable
@@ -0,0 +1,72 @@
+.------------------------------------------------------------------------------.
+| ------------   USER DEFINITIONS FOR TABLE-A TABLE-B TABLE D   -------------- |
+|------------------------------------------------------------------------------|
+| MNEMONIC | NUMBER | DESCRIPTION                                              |
+|----------|--------|----------------------------------------------------------|
+|          |        |                                                          |
+| AIRNOW   | A62206 | AIRNOW OZONE CONCENTRATION REPORTS                       |
+| ANOWPM   | A62207 | AIRNOW FINE PARTICULATE MATTER REPORTS                   |
+|          |        |                                                          |
+| HEADR1   | 361001 | AIRNOW REPORT HEADER SEQUENCE                            |
+| AOZSEQ   | 361101 | AIRNOW OZONE SEQUENCE                                    |
+| AOZEVN   | 361102 | AIRNOW OZONE EVENT SEQUENCE                              |
+| APMSEQ   | 361105 | AIRNOW PMFINE (FINE PARTICULATE MATTER) SEQUENCE         |
+| APMEVN   | 361106 | AIRNOW PMFINE (FINE PARTICULATE MATTER) EVENT SEQUENCE   |
+|          |        |                                                          |
+| SID      | 001194 | STATION IDENTIFICATION                                   |
+| TPHR     | 004024 | TIME PERIOD OR DISPLACEMENT                              |
+| RPT      | 004214 | REPORTED OBSERVATION TIME                                |
+| DHR      | 004215 | OBSERVATION TIME MINUS CYCLE TIME                        |
+| YOB      | 005002 | LATITUDE                                                 |
+| XOB      | 006002 | LONGITUDE                                                |
+| TSIG     | 008021 | TIME SIGNIFICANCE                                        |
+| QCIND    | 033020 | QUALITY CONTROL INDICATION OF FOLLOWING DATA             |
+| SQN      | 050001 | REPORT SEQUENCE NUMBER                                   |
+| PROCN    | 050003 | PROCESS NUMBER FOR THIS MPI RUN (OBTAINED FROM SCRIPT)   |
+| TYP      | 055007 | PREPBUFR REPORT TYPE                                     |
+| T29      | 055008 | DATA DUMP REPORT TYPE                                    |
+| CAT      | 008193 | PREPBUFR DATA LEVEL CATEGORY                             |
+| TYPO     | 015025 | TYPE OF POLLUTANT                                        |
+| COPO     | 015026 | CONCENTRATION OF POLLUTANT                               |
+| COPOPM   | 015027 | CONCENTRATION OF POLLUTANT (PARTICULATE MATTER DENSITY)  |
+|          |        |                                                          |
+|------------------------------------------------------------------------------|
+| MNEMONIC | SEQUENCE                                                          |
+|----------|-------------------------------------------------------------------|
+|          |                                                                   |
+| AIRNOW   | HEADR1  CAT  TYPO  TSIG  {AOZSEQ}                                 |
+|          |                                                                   |
+| ANOWPM   | HEADR1  CAT  TYPO  TSIG  APMSEQ                                   |
+|          |                                                                   |
+| HEADR1   | SID  XOB  YOB  DHR  TYP  T29  SQN  PROCN  RPT                     |
+|          |                                                                   |
+| AOZSEQ   | [AOZEVN]                                                          |
+|          |                                                                   |
+| AOZEVN   | TPHR  QCIND  COPO                                                 |
+|          |                                                                   |
+| APMSEQ   | [APMEVN]                                                          |
+|          |                                                                   |
+| APMEVN   | TPHR  QCIND  201131  202129  COPOPM  202000  201000               |
+|          |                                                                   |
+|------------------------------------------------------------------------------|
+| MNEMONIC | SCAL | REFERENCE   | BIT | UNITS                    |-------------|
+|----------|------|-------------|-----|--------------------------|-------------|
+|          |      |             |     |                          |-------------|
+| SID      |    0 |           0 |  64 | CCITT IA5                |-------------|
+| TPHR     |    0 |       -2048 |  12 | HOURS                    |-------------|
+| RPT      |    3 |           0 |  16 | HOURS                    |-------------|
+| DHR      |    3 |      -24000 |  16 | HOURS                    |-------------|
+| YOB      |    2 |       -9000 |  15 | DEG N                    |-------------|
+| XOB      |    2 |      -18000 |  16 | DEG E                    |-------------|
+| TSIG     |    0 |           0 |   5 | CODE TABLE               |-------------|
+| QCIND    |    0 |           0 |   3 | CODE TABLE               |-------------|
+| SQN      |    0 |           0 |  19 | NUMERIC                  |-------------|
+| PROCN    |    0 |           0 |   7 | NUMERIC                  |-------------|
+| TYP      |    0 |           0 |   9 | CODE TABLE               |-------------|
+| T29      |    0 |           0 |  10 | CODE TABLE               |-------------|
+| CAT      |    0 |           0 |   6 | CODE TABLE               |-------------|
+| TYPO     |    0 |           0 |   4 | CODE TABLE               |-------------|
+| COPO     |    9 |           0 |   9 | MOLE/MOLE                |-------------|
+| COPOPM   |    9 |           0 |  10 | KG/(M**3)                |-------------|
+|          |      |             |     |                          |-------------|
+`------------------------------------------------------------------------------'