Merge branch 'develop' into feature/remove_cdump

.gitmodules

@@ -81,3 +81,7 @@
   path = parm/jcb-algorithms
   url = https://github.com/noaa-emc/jcb-algorithms
   branch = develop
+[submodule "sorc/bufr-query"]
+  path = sorc/bufr-query
+  url = https://github.com/noaa-emc/bufr-query.git
+  branch = develop

build.sh

@@ -126,7 +126,7 @@ set -x
 if [[ $BUILD_JCSDA == 'YES' ]]; then
   make -j ${BUILD_JOBS:-6} VERBOSE=$BUILD_VERBOSE
 else
-  builddirs="gdas iodaconv land-imsproc land-jediincr gdas-utils"
+  builddirs="gdas iodaconv land-imsproc land-jediincr gdas-utils bufr-query"
   for b in $builddirs; do
     cd $b
     make -j ${BUILD_JOBS:-6} VERBOSE=$BUILD_VERBOSE

bundle/CMakeLists.txt

@@ -88,6 +88,9 @@ if(BUILD_GDASBUNDLE)
 # Gibbs seawater
   ecbuild_bundle( PROJECT gsw SOURCE "../sorc/gsw" )
 
+# EMC BUFR-query library
+  ecbuild_bundle( PROJECT bufr-query SOURCE "../sorc/bufr-query" )
+
 # Core JEDI repositories
   ecbuild_bundle( PROJECT oops SOURCE "../sorc/oops" )
   ecbuild_bundle( PROJECT vader SOURCE "../sorc/vader" )

modulefiles/GDAS/hercules.intel.lua

@@ -61,7 +61,7 @@ load("py-pybind11/2.11.0")
 --load("crtm/v2.4_jedi")
 load("contrib/0.1")
 load("noaatools/3.1")
-load("rocoto/1.3.5")
+load("rocoto/1.3.7")
 
 load("hpc/1.2.0")
 unload("python/3.10.13")

modulefiles/GDAS/orion.intel.lua

@@ -61,7 +61,7 @@ load("py-pybind11/2.11.0")
 --load("crtm/v2.4_jedi")
 load("contrib/0.1")
 load("noaatools/3.1")
-load("rocoto/1.3.5")
+load("rocoto/1.3.7")
 
 load("hpc/1.2.0")
 unload("python/3.10.13")

parm/snow/obs/lists/gdas_snow.yaml.j2

@@ -3,7 +3,7 @@ observers:
 {% include 'snow/obs/config/adpsfc_snow.yaml.j2' %}
 {% include 'snow/obs/config/snocvr_snow.yaml.j2' %}
 {% set cycle = current_cycle | strftime("t%Hz") %}
-{% if cycle in ['t18z'] %}
+{% if cycle in ['t00z'] %}
 {% include 'snow/obs/config/ims_snow.yaml.j2' %}
 {% endif %}
 {% endfilter %}

parm/snow/prep/fims.nml.j2

@@ -4,7 +4,7 @@
   otype = "{{ CASE }}_oro_data",
   jdate = "{{ current_cycle | to_julian }}",
   yyyymmddhh = "{{ current_cycle | to_YMD }}.{{ current_cycle.strftime('%H') }}",
-  imsformat = 2,
+  imsformat = 1,
   imsversion = "1.3",
   fcst_path = "{{ DATA }}/bkg/"
   IMS_OBS_PATH = "{{ DATA }}/obs/",

parm/snow/prep/prep_ims.yaml.j2

@@ -2,7 +2,7 @@ calcfims:
   mkdir:
     - '{{ DATA }}/obs'
   copy:
-    - ['{{ COM_OBS }}/{{ OPREFIX }}ims{{ current_cycle | to_julian }}_4km_v1.3.nc', '{{ DATA }}/obs/ims{{ current_cycle | to_julian }}_4km_v1.3.nc']
+    - ['{{ COM_OBS }}/{{ OPREFIX }}imssnow96.asc', '{{ DATA }}/obs/ims{{ current_cycle | to_julian }}_4km_v1.3.asc']
     - ['{{ FIXgfs }}/gdas/obs/ims/IMS_4km_to_{{ CASE }}.mx{{ OCNRES }}.nc', '{{ DATA }}/obs/IMS4km_to_FV3_mapping.{{ CASE }}_oro_data.nc']
 ims2ioda:
   copy: