From 06ad9f67da0d64d0fb91cfbeca007a4585f7c97a Mon Sep 17 00:00:00 2001
From: AndrewEichmann-NOAA <andrew.eichmann@noaa.gov>
Date: Fri, 30 Jun 2023 13:04:37 +0000
Subject: [PATCH 1/3] changing to match ioda

---
 test/soca/gw/CMakeLists.txt | 2 +-
 ush/ufsda/soca_utils.py     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/soca/gw/CMakeLists.txt b/test/soca/gw/CMakeLists.txt
index bf4b77155..c46c7595b 100644
--- a/test/soca/gw/CMakeLists.txt
+++ b/test/soca/gw/CMakeLists.txt
@@ -27,7 +27,7 @@ add_test(NAME test_gdasapp_soca_concatioda
          WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/soca/gw/concatioda)
        set_tests_properties(test_gdasapp_soca_concatioda
       PROPERTIES
-      ENVIRONMENT "PYTHONPATH=${PROJECT_BINARY_DIR}/ush:$ENV{PYTHONPATH}")
+      ENVIRONMENT "PYTHONPATH=${PROJECT_BINARY_DIR}/ush:${PROJECT_BINARY_DIR}/lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}:$ENV{PYTHONPATH}")
 
 # Clean-up
 add_test(NAME test_gdasapp_soca_run_clean
diff --git a/ush/ufsda/soca_utils.py b/ush/ufsda/soca_utils.py
index f46d497ee..0d3c3c0e1 100644
--- a/ush/ufsda/soca_utils.py
+++ b/ush/ufsda/soca_utils.py
@@ -18,8 +18,8 @@
 pyiodaconv_lib = Path(os.path.join(jedilib, 'pyiodaconv')).resolve()
 sys.path.append(str(pyioda_lib))
 sys.path.append(str(pyiodaconv_lib))
-import ioda_conv_engines as iconv
-from orddicts import DefaultOrderedDict
+import pyiodaconv.ioda_conv_engines as iconv
+from pyiodaconv.orddicts import DefaultOrderedDict
 
 __all__ = ['concatenate_ioda']
 

From a0a8eb3df110347e0de565b6a137fdf9666e2e06 Mon Sep 17 00:00:00 2001
From: AndrewEichmann-NOAA <andrew.eichmann@noaa.gov>
Date: Fri, 30 Jun 2023 13:39:11 +0000
Subject: [PATCH 2/3] adding pythonpath change to task ctests

---
 test/soca/gw/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/soca/gw/CMakeLists.txt b/test/soca/gw/CMakeLists.txt
index c46c7595b..1ba787f8b 100644
--- a/test/soca/gw/CMakeLists.txt
+++ b/test/soca/gw/CMakeLists.txt
@@ -58,6 +58,10 @@ foreach(jjob ${jjob_list})
          -y ${PROJECT_BINARY_DIR}/test/soca/gw/testrun/run_jjobs_${jjob}.yaml
          ${setup}
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/soca/gw/testrun)
+  set_tests_properties(${test_name}
+    PROPERTIES
+    ENVIRONMENT "PYTHONPATH=${PROJECT_BINARY_DIR}/lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}:$ENV{PYTHONPATH}")
+
 
   set(setup "--skip") # Only run the setup of the first test, if not, it will hang
                       # waiting for standard input from setup_expt.py

From 3a0631a6c17cccdfb33d8bcaa9336c5bec7a0e1c Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
Date: Fri, 30 Jun 2023 13:52:33 -0400
Subject: [PATCH 3/3] saber exec name change (#520)

---
 scripts/exgdas_global_marine_analysis_bmat.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/exgdas_global_marine_analysis_bmat.sh b/scripts/exgdas_global_marine_analysis_bmat.sh
index 83e286b37..caf9af092 100755
--- a/scripts/exgdas_global_marine_analysis_bmat.sh
+++ b/scripts/exgdas_global_marine_analysis_bmat.sh
@@ -134,7 +134,7 @@ if false; then
     # TODO: resurect this section when making use of bump 3D in the static B, skip for now
     yaml_bump2d=soca_bump2d.yaml
     clean_yaml $yaml_bump2d
-    $APRUN_OCNANAL $JEDI_BIN/soca_error_covariance_training.x $yaml_bump2d 2>$yaml_bump2d.err
+    $APRUN_OCNANAL $JEDI_BIN/soca_error_covariance_toolbox.x $yaml_bump2d 2>$yaml_bump2d.err
     export err=$?; err_chk
     if [ $err -gt 0  ]; then
         exit $err
@@ -144,7 +144,7 @@ if false; then
     yaml_list=`ls soca_bump3d_*.yaml`
     for yaml in $yaml_list; do
         clean_yaml $yaml
-        $APRUN_OCNANAL $JEDI_BIN/soca_error_covariance_training.x $yaml 2>$yaml.err
+        $APRUN_OCNANAL $JEDI_BIN/soca_error_covariance_toolbox.x $yaml 2>$yaml.err
         export err=$?; err_chk
         if [ $err -gt 0  ]; then
             exit $err
@@ -156,7 +156,7 @@ fi
 ################################################################################
 # Compute convolution coefs for L
 clean_yaml soca_bump_loc.yaml
-$APRUN_OCNANAL $JEDI_BIN/soca_error_covariance_training.x soca_bump_loc.yaml
+$APRUN_OCNANAL $JEDI_BIN/soca_error_covariance_toolbox.x soca_bump_loc.yaml
 export err=$?; err_chk
 if [ $err -gt 0  ]; then
     exit $err