From 4f0f7730dc2af0351a34263a6bbb80bd32aa2cc6 Mon Sep 17 00:00:00 2001
From: Andrew Collard <40322596+ADCollard@users.noreply.github.com>
Date: Fri, 5 Apr 2024 19:39:17 -0400
Subject: [PATCH] Add new data sources used in GFS v16.3.12 (#2283)

Changes to `scripts/exglobal_atmos_analysis.sh` to include new data that
are being operationally assimilated in GFS v16.3.12.

**Note that this requires CRTM v2.4.0.1 **
---
 scripts/exglobal_atmos_analysis.sh | 9 ++++++---
 versions/build.wcoss2.ver          | 2 +-
 versions/run.wcoss2.ver            | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/scripts/exglobal_atmos_analysis.sh b/scripts/exglobal_atmos_analysis.sh
index a74a702379..27f65d3370 100755
--- a/scripts/exglobal_atmos_analysis.sh
+++ b/scripts/exglobal_atmos_analysis.sh
@@ -103,10 +103,10 @@ OSCATBF=${OSCATBF:-${COM_OBS}/${OPREFIX}oscatw.tm00.bufr_d${OSUFFIX}}
 RAPIDSCATBF=${RAPIDSCATBF:-${COM_OBS}/${OPREFIX}rapidscatw.tm00.bufr_d${OSUFFIX}}
 GSNDBF=${GSNDBF:-${COM_OBS}/${OPREFIX}goesnd.tm00.bufr_d${OSUFFIX}}
 GSNDBF1=${GSNDBF1:-${COM_OBS}/${OPREFIX}goesfv.tm00.bufr_d${OSUFFIX}}
-B1HRS2=${B1HRS2:-${COM_OBS}/${OPREFIX}1bhrs2.tm00.bufr_d${OSUFFIX}}
+#B1HRS2=${B1HRS2:-${COM_OBS}/${OPREFIX}1bhrs2.tm00.bufr_d${OSUFFIX}} # HIRS temporarily disabled due to CRTM versioning issues
 B1MSU=${B1MSU:-${COM_OBS}/${OPREFIX}1bmsu.tm00.bufr_d${OSUFFIX}}
-B1HRS3=${B1HRS3:-${COM_OBS}/${OPREFIX}1bhrs3.tm00.bufr_d${OSUFFIX}}
-B1HRS4=${B1HRS4:-${COM_OBS}/${OPREFIX}1bhrs4.tm00.bufr_d${OSUFFIX}}
+#B1HRS3=${B1HRS3:-${COM_OBS}/${OPREFIX}1bhrs3.tm00.bufr_d${OSUFFIX}} # HIRS temporarily disabled due to CRTM versioning issues
+#B1HRS4=${B1HRS4:-${COM_OBS}/${OPREFIX}1bhrs4.tm00.bufr_d${OSUFFIX}} # HIRS temporarily disabled due to CRTM versioning issues
 B1AMUA=${B1AMUA:-${COM_OBS}/${OPREFIX}1bamua.tm00.bufr_d${OSUFFIX}}
 B1AMUB=${B1AMUB:-${COM_OBS}/${OPREFIX}1bamub.tm00.bufr_d${OSUFFIX}}
 B1MHS=${B1MHS:-${COM_OBS}/${OPREFIX}1bmhs.tm00.bufr_d${OSUFFIX}}
@@ -824,9 +824,11 @@ OBS_INPUT::
    gomebufr       gome        metop-b     gome_metop-b        0.0     2     0
    atmsbufr       atms        npp         atms_npp            0.0     1     1
    atmsbufr       atms        n20         atms_n20            0.0     1     1
+   atmsbufr       atms        n21         atms_n21            0.0     1     1
    crisbufr       cris        npp         cris_npp            0.0     1     0
    crisfsbufr     cris-fsr    npp         cris-fsr_npp        0.0     1     0
    crisfsbufr     cris-fsr    n20         cris-fsr_n20        0.0     1     0
+   crisfsbufr     cris-fsr    n21         cris-fsr_n21        0.0     1     0
    gsnd1bufr      sndrd1      g14         sndrD1_g14          0.0     1     0
    gsnd1bufr      sndrd2      g14         sndrD2_g14          0.0     1     0
    gsnd1bufr      sndrd3      g14         sndrD3_g14          0.0     1     0
@@ -848,6 +850,7 @@ OBS_INPUT::
    ahibufr        ahi         himawari8   ahi_himawari8       0.0     1     0
    abibufr        abi         g16         abi_g16             0.0     1     0
    abibufr        abi         g17         abi_g17             0.0     1     0
+   abibufr        abi         g18         abi_g18             0.0     1     0
    rapidscatbufr  uv          null        uv                  0.0     0     0
    ompsnpbufr     ompsnp      npp         ompsnp_npp          0.0     0     0
    ompslpbufr     ompslp      npp         ompslp_npp          0.0     0     0
diff --git a/versions/build.wcoss2.ver b/versions/build.wcoss2.ver
index 046ff5c64e..3ae0b3a1cc 100644
--- a/versions/build.wcoss2.ver
+++ b/versions/build.wcoss2.ver
@@ -28,6 +28,6 @@ export wrf_io_ver=1.2.0
 export ncio_ver=1.1.2
 export ncdiag_ver=1.0.0
 export g2tmpl_ver=1.10.2
-export crtm_ver=2.4.0
+export crtm_ver=2.4.0.1
 
 export upp_ver=10.0.8
diff --git a/versions/run.wcoss2.ver b/versions/run.wcoss2.ver
index 0aaad3ec3d..18599222bf 100644
--- a/versions/run.wcoss2.ver
+++ b/versions/run.wcoss2.ver
@@ -37,7 +37,7 @@ export bufr_dump_ver=1.0.0
 export util_shared_ver=1.4.0
 export g2tmpl_ver=1.10.2
 export ncdiag_ver=1.0.0
-export crtm_ver=2.4.0
+export crtm_ver=2.4.0.1
 export wgrib2_ver=2.0.8
 export met_ver=9.1.3
 export metplus_ver=3.1.1