From 801d64c4f573bfb730ecb4afdc5a736f3ecf9b2f Mon Sep 17 00:00:00 2001
From: Cory Martin <cory.r.martin@noaa.gov>
Date: Tue, 23 Jul 2024 16:41:03 +0000
Subject: [PATCH 1/2] add bufr_query to GDASApp (#1225)

Add in the bufr_query repository to GDASApp to support direct ingest of
BUFR files into JEDI-based applications.

---------

Co-authored-by: RussTreadon-NOAA <russ.treadon@noaa.gov>
---
 .gitmodules           | 4 ++++
 build.sh              | 2 +-
 bundle/CMakeLists.txt | 3 +++
 sorc/bufr-query       | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 160000 sorc/bufr-query

diff --git a/.gitmodules b/.gitmodules
index 80b3fdb68..2a931e564 100644
--- a/.gitmodules
+++ b/.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
diff --git a/build.sh b/build.sh
index 06efa7595..801f3c8bc 100755
--- a/build.sh
+++ b/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
diff --git a/bundle/CMakeLists.txt b/bundle/CMakeLists.txt
index 7481aa95e..c7282f6c2 100644
--- a/bundle/CMakeLists.txt
+++ b/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" )
diff --git a/sorc/bufr-query b/sorc/bufr-query
new file mode 160000
index 000000000..97367fcd5
--- /dev/null
+++ b/sorc/bufr-query
@@ -0,0 +1 @@
+Subproject commit 97367fcd59adf4863aba1a52189e20f9f66451af

From 5583fbb6884a9b98fb3df76058ea2f51414299a2 Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
Date: Wed, 24 Jul 2024 16:29:15 -0400
Subject: [PATCH 2/2] Arctic soca to cice variable change (#1235)

Not sure how I missed this, but the "shuffle" option has been broken for
quite some time, this PR turns it off
---
 parm/soca/varchange/soca_2cice_arctic.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parm/soca/varchange/soca_2cice_arctic.yaml b/parm/soca/varchange/soca_2cice_arctic.yaml
index fa3b86439..075ee018c 100644
--- a/parm/soca/varchange/soca_2cice_arctic.yaml
+++ b/parm/soca/varchange/soca_2cice_arctic.yaml
@@ -10,7 +10,7 @@ variable change:
   variable change name: Soca2Cice
   do inverse: false
   seaice edge: 0.8
-  shuffle: true
+  shuffle: false
   rescale prior:
     min hice: 0.5
     min hsno: 0.1