Auto GitFlow - develop → MAPL-v3 - VIIRS and x55 settings

components.yaml

@@ -19,11 +19,11 @@ ecbuild:
   remote: ../ecbuild.git
   tag: geos/v1.4.0
 
-crtm:
-  local: ./src/Shared/JCSDA_crtm/@crtm
-  remote: ../crtm.git
-  tag: geos/v2.4.1-jedi.1+1.1.0
-  develop: master
+CRTMv3:
+  local: ./src/Shared/JCSDA_crtm/@CRTMv3
+  remote: ../CRTMv3.git
+  tag: v3.1.4
+  develop: develop
 
 NCEP_Shared:
   local: ./src/Shared/@NCEP_Shared
@@ -35,7 +35,7 @@ NCEP_Shared:
 GMAO_Shared:
   local: ./src/Shared/@GMAO_Shared
   remote: ../GMAO_Shared.git
-  tag: g5.42.4.2
+  tag: g5.45.1
   sparse: ./config/GMAO_Shared.sparse
   develop: main
 
@@ -86,13 +86,13 @@ FMS:
 GEOSana_GridComp:
   local: ./src/Components/@GEOSana_GridComp
   remote: ../GEOSana_GridComp.git
-  tag: v5.45.5
+  tag: v5.46.0
   develop: develop
 
 mksi:
    local: ./src/Components/@GEOSana_GridComp/GEOSaana_GridComp/GSI_GridComp/@mksi
    remote: ../GEOS_mksi.git
-   tag: v5.44.2
+   tag: v5.45.0
    develop: develop
 
 GEOSgcm_GridComp:

src/Applications/GEOSdas_App/jedi/etc/diag2ioda.yaml

@@ -58,6 +58,7 @@ models:
     observations:
     - abi_g16
     - abi_g18
+    - abi_g19
     - aircraft
     - airs_aqua
     - amsr2_gcom-w1

src/Applications/GEOSdas_App/jedi/jedi_run.csh

@@ -358,7 +358,7 @@ foreach fn (`ls *tlapse.txt`)
   /bin/mv $fn $pfx.$BYYYYYMMDDTHH0000Z.tlapse.txt # time tag as current as
                                                   # if JEDI output these
 end
-tar cvf $FVWORK/$EXPID.jedi_vbc.${nymdb}_${hhb}z.tar *satbias*nc4 *aircraft*csv *.txt
+tar cvf $FVWORK/$EXPID.jedi_vbc.${nymdb}_${hhb}z.tar *satbias*nc4 *aircraft*cov *.txt *.acftbias
 cd -
 
 # If here, likely successful

src/Applications/GEOSdas_App/jedi/jedi_set.csh

@@ -183,8 +183,8 @@ end
 # If so, retrieve IODA files from existig ru
 # In adjoint case, IODA files are from same exp
 if ( $JEDI_RUN_ANASA || $JEDI_RUN_ADANA || $JEDI_OBS_OPT == 1 ) then
-  setenv NYMD  $nymdb # initial date of current cycle
-  setenv NHMS  $nhmsb # initial time of current cycle
+  setenv NYMDB  $nymdb # initial date of current cycle
+  setenv NHMSB  $nhmsb # initial time of current cycle
   setenv ACQWORK $FVWORK
   vED -env $FVHOME/run/jedi/jedi_acquire_ioda.j -o jedi_acquire_ioda.j
   if ( $BATCH_SUBCMD == "sbatch" ) then
@@ -320,6 +320,8 @@ if ( $acft ) then
        echo "WARNING: No aircraft bias files where found ..."
     endif
   else
+    set acftbias_in = `ls aircraft_temperature.*.acftbias`
+    set ttag = `echo $acftbias_in | cut -d. -f2`
     if (   -e aircraft_temperature.$ttag.acftbias  && \
          ! -e aircraft_temperature.$ttag.acftbias_cov ) then
       ln -sf aircraft_temperature.$ttag.acftbias aircraft_temperature.$ttag.acftbias_cov

src/Applications/GEOSdas_App/testsuites/x0054RPY.input → src/Applications/GEOSdas_App/testsuites/x0055RPY.input

@@ -1,9 +1,9 @@
 #------------
-# x0054RPY.input
+# x0055RPY.input
 #------------
 
 codeID: 523f29e
-description: x0054RPY__GEOSadas-5_44_4__agrid_C360__ogrid_C
+description: x0055RPY__GEOSadas-5_45_4__agrid_C360__ogrid_C
 fvsetupID: f7aaa973c7
 
 ---ENDHEADERS---
@@ -29,7 +29,7 @@ EXPID? [u000_C360]
 Check for previous use of expid (y/n)? [y]
 > n
 
-EXPDSC? [x0054RPY__GEOSadas-5_44_4__agrid_C360__ogrid_C]
+EXPDSC? [x0055RPY__GEOSadas-5_45_4__agrid_C360__ogrid_C]
 > 
 
 Land Boundary Conditions? [Icarus_Updated]
@@ -38,10 +38,10 @@ Land Boundary Conditions? [Icarus_Updated]
 Catchment Model choice? [1]
 > 
 
-FVHOME? [/discover/nobackup/rtodling/x0054RPY]
-> /discover/nobackup/projects/gmao/dadev/rtodling/544/$expid
+FVHOME? [/discover/nobackup/rtodling/x0055RPY]
+> /discover/nobackup/projects/gmao/dadev/rtodling/545/$expid
 
-The directory /discover/nobackup/projects/gmao/dadev/rtodling/544/x0054RPY already exists. Clean it? [y]
+The directory /discover/nobackup/projects/gmao/dadev/rtodling/545/x0055RPY already exists. Clean it? [y]
 > 
 
 Processing nodes (1:Haswell, 2:Skylake, 3:Cascase, 4:Milan)? [2]
@@ -81,7 +81,7 @@ AeroCom? [/discover/nobackup/projects/gmao/share/gmao_ops/fvInput_4dvar/AeroCom]
 > 
 
 FVICS? [/archive/u/jstassi/restarts/GEOSadas-5_24_0]
-> /discover/nobackup/projects/gmao/dadev/rtodling/archive/Restarts/5_44/c360/rs/Y2025/M11/c360.rst.20251128_21z.tar
+> /discover/nobackup/projects/gmao/dadev/rtodling/archive/Restarts/5_45/c360/rs/Y2026/M08/c360.rst.20280828_21z.tar
 
 Run model-adjoint-related applications (0=no,1=yes)? [0]
 > 1
@@ -98,7 +98,7 @@ Run singular vector experiments (0=n,1=yes)? [0]
 Run analysis-sensitivity applications (0=no,1=yes)? [0]
 > 1
 
-Verifying experiment id: [x0054RPY]
+Verifying experiment id: [x0055RPY]
 > 
 
 Ending year-month-day? [20191121]
@@ -117,7 +117,7 @@ Number of PEs in the meridional direction (NY)? [36]
 > 48
 
 Job nickname? [g5das]
-> x54
+> x55
 
 Run in split executable mode (1=yes;0=no)? [1]
 > 
@@ -228,10 +228,10 @@ Replayed Ensemble (from OPS)?  [yes]
 > 
 
 Replay exp name? [x0046d]
-> f5421_fpp
+> f5430_fp
 
 Replay archive directory? [/discover/nobackup/projects/gmao/dadev/rtodling/archive/x0046d]
-> /home/dao_ops/f5421_fpp/run/.../archive/
+> /home/dao_ops/f5430_fp/run/.../archive/
 
 Edit COLLECTIONS list in run/HISTORY.rc.tmpl (y/n)? [n]
 > 

src/Applications/GSI_App/CMakeLists.txt

@@ -9,14 +9,14 @@ endif ()
 #   TARGET gsi.x                                                               #
 #   SOURCES gsimain.F90                                                        #
 #   LIBS GEOSaana_GridComp GSI_GridComp GEOSgsi_Coupler                        #
-#        crtm NCEP_sfcio NCEP_bufr_r8i4 NCEP_nemsio NCEP_bacio_r4i4 NCEP_gfsio #
+#        CRTMv3 NCEP_sfcio NCEP_bufr_r8i4 NCEP_nemsio NCEP_bacio_r4i4 NCEP_gfsio #
 #        NCEP_sp_r8i4 NCEP_w3_r8i4 nc_diag_read nc_diag_write)                 #
 ################################################################################
 
 ecbuild_add_executable (
   TARGET GSIsa.x
   SOURCES GSIsa.F90
-  LIBS GEOSaana_GridComp GSI_GridComp GEOSgsi_Coupler NCEP_sigio fvgcm crtm
+  LIBS GEOSaana_GridComp GSI_GridComp GEOSgsi_Coupler NCEP_sigio fvgcm CRTMv3
        GMAO_hermes GMAO_gfio_r8 GEOSagcmPert_GridComp
        GEOS_PertShared GEOSphysicsPert_GridComp GEOSradiationPert_GridComp GEOSgwdPert_GridComp
        GEOSmoistPert_GridComp GEOSturbulencePert_GridComp GEOSsurfacePert_GridComp GEOSchemPert_GridComp

src/Applications/NCEP_Etc/NCEP_bias/sac.nl.tmpl

@@ -1,5 +1,5 @@
  &SETUP
-  jpch=4507,nstep=90,nsize=20,wgtang=0.008333333,wgtlap=0.0,
+  jpch=4516,nstep=90,nsize=20,wgtang=0.008333333,wgtlap=0.0,
   iuseqc=1,dtmax=1.0,
   iyy1=>>>YYYY<<<,
   imm1=>>>MM<<<,
@@ -99,6 +99,9 @@
   dtype(84)='abi',       dplat(84)='g16',       dsis(84)='abi_g16',
   dtype(85)='abi',       dplat(85)='g18',       dsis(85)='abi_g18',
   dtype(86)='abi',       dplat(86)='g19',       dsis(86)='abi_g19',
+  dtype(87)='viirs-m',   dplat(87)='npp',       dsis(87)='viirs-m_npp',
+  dtype(88)='viirs-m',   dplat(88)='j1',        dsis(88)='viirs-m_j1',
+  dtype(89)='viirs-m',   dplat(89)='j2',        dsis(89)='viirs-m_j2',
 /
   dtype(46)='ssu',       dplat(46)='n14',       dsis(46)='ssu_n14',
   dtype(47)='hsb',       dplat(47)='aqua',      dsis(47)='hsb_aqua',

src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/atmos_enkf.nml.tmpl

@@ -110,6 +110,9 @@
   sattypes_rad(70)= 'abi_g16',       dsis(70)= 'abi_g16',
   sattypes_rad(71)= 'abi_g18',       dsis(71)= 'abi_g18',
   sattypes_rad(72)= 'abi_g19',       dsis(72)= 'abi_g19',
+  sattypes_rad(73)= 'viirs-m_npp',   dsis(73)= 'viirs-m_npp',
+  sattypes_rad(74)= 'viirs-m_j1',    dsis(74)= 'viirs-m_j1',
+  sattypes_rad(75)= 'viirs-m_j2',    dsis(75)= 'viirs-m_j2',
 /
 &ozobs_enkf
  sattypes_oz(1) = 'sbuv2_n16',

src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/obs1gsi_mean.rc

@@ -198,6 +198,9 @@ OBS_INPUT::
    abibufr        abi         g16         abi_g16               0.0     1      0        ncep_goescsr_bufr
    abibufr        abi         g18         abi_g18               0.0     1      0        ncep_goescsr_bufr
    abibufr        abi         g19         abi_g19               0.0     1      0        ncep_goescsr_bufr
+   sstvcwbufr     viirs-m     npp         viirs-m_npp           0.0     1      0        ncep_sstvcw_bufr
+   sstvcwbufr     viirs-m     j1          viirs-m_j1            0.0     1      0        ncep_sstvcw_bufr
+   sstvcwbufr     viirs-m     j2          viirs-m_j2            0.0     1      0        ncep_sstvcw_bufr
 ! The following needs to be set for oneob-test:
 !  prepqc         dummy       dummy       dummy                 1.0     1      0        test
 ::

src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/obs1gsi_member.rc

@@ -198,6 +198,9 @@ OBS_INPUT::
    abibufr        abi         g16         abi_g16               0.0     1      0        ncep_goescsr_bufr
    abibufr        abi         g18         abi_g18               0.0     1      0        ncep_goescsr_bufr
    abibufr        abi         g19         abi_g19               0.0     1      0        ncep_goescsr_bufr
+   sstvcwbufr     viirs-m     npp         viirs-m_npp           0.0     1      0        ncep_sstvcw_bufr
+   sstvcwbufr     viirs-m     j1          viirs-m_j1            0.0     1      0        ncep_sstvcw_bufr
+   sstvcwbufr     viirs-m     j2          viirs-m_j2            0.0     1      0        ncep_sstvcw_bufr
 ! The following needs to be set for oneob-test:
 !  prepqc         dummy       dummy       dummy                 1.0     1      0        test
 ::

src/Shared/JCSDA_crtm/.gitignore

@@ -1,3 +1,7 @@
 @crtm/
 crtm/
 crtm@/
+
+@CRTMv3/
+CRTMv3/
+CRTMv3@/

src/Shared/JCSDA_crtm/crtm_cmake/CMakeLists.txt

@@ -1,4 +1,4 @@
-esma_set_this (OVERRIDE crtm)
+esma_set_this (OVERRIDE CRTMv3)
 
 # got below list by copying the srcs list from
 # the JSCDA_crtm src/CMakeLists.txt
@@ -30,6 +30,7 @@ list( APPEND CRTM_SRCS
   src/Atmosphere/Cloud/CRTM_Cloud_Define.f90
   src/Atmosphere/CRTM_Atmosphere_Define.f90
   src/Atmosphere/CRTM_Hypsometric.f90
+  src/Atmosphere/CRTM_Relative_Humidity.f90
   src/Atmosphere/CRTM_Atmosphere.f90
   src/Atmosphere/CRTM_Model_Profiles.f90
   src/Atmosphere/iAtm_Define.f90
@@ -47,11 +48,16 @@ list( APPEND CRTM_SRCS
   src/Coefficients/AerosolCoeff/AerosolCoeff_Define.f90
   src/Coefficients/AerosolCoeff/AerosolCoeff_netCDF_IO.f90
   src/Coefficients/AerosolCoeff/AerosolCoeff_IO.f90
+  src/Coefficients/BeCoeff/BeCoeff_Binary_IO.f90
+  src/Coefficients/BeCoeff/BeCoeff_Define.f90
+  src/Coefficients/BeCoeff/BeCoeff_netCDF_IO.f90
+  src/Coefficients/BeCoeff/BeCoeff_IO.f90
   src/Coefficients/CloudCoeff/CloudCoeff_Binary_IO.f90
   src/Coefficients/CloudCoeff/CloudCoeff_Define.f90
   src/Coefficients/CloudCoeff/CloudCoeff_netCDF_IO.f90
   src/Coefficients/CloudCoeff/CloudCoeff_IO.f90
   src/Coefficients/CRTM_AerosolCoeff.f90
+  src/Coefficients/CRTM_BeCoeff.f90
   src/Coefficients/CRTM_CloudCoeff.f90
   src/Coefficients/CRTM_IRiceCoeff.f90
   src/Coefficients/CRTM_IRlandCoeff.f90
@@ -74,6 +80,8 @@ list( APPEND CRTM_SRCS
   src/Coefficients/EmisCoeff/IR_Snow/IRsnowCoeff_netCDF_IO.f90
   src/Coefficients/EmisCoeff/MW_Water/MWwaterCoeff_Define.f90
   src/Coefficients/EmisCoeff/MW_Water/MWwaterLUT/MWwaterLUT_Define.f90
+  src/Coefficients/EmisCoeff/MW_Water/MWwaterCoeff_CreateFile/MWwaterCoeff_FASTEM6.f90
+  src/Coefficients/EmisCoeff/MW_Water/MWwaterCoeff_CreateFile/MWwaterCoeff_FASTEM4.f90
   src/Coefficients/EmisCoeff/SEcategory/SEcategory_Define.f90
   src/Coefficients/EmisCoeff/SEcategory/SEcategory_IO.f90
   src/Coefficients/EmisCoeff/SEcategory/SEcategory_netCDF_IO.f90
@@ -211,7 +219,7 @@ list( APPEND CRTM_SRCS
   src/Zeeman/Zeeman_Utility.f90
   )
 
-esma_mepo_style(crtm CRTM_rel_path REL_PATH ..)
+esma_mepo_style(CRTMv3 CRTM_rel_path REL_PATH ..)
 set (CRTM_path ${CMAKE_CURRENT_SOURCE_DIR}/${CRTM_rel_path})
 
 set (SRCS)