Fix non-SOCA tests (#518)

* Fix tests that are not in the ocean * bug fix
NOAA-EMC · Jun 30, 2023 · 4345ecd · 4345ecd
1 parent 8e9d132
commit 4345ecd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/test/atm/global-workflow/CMakeLists.txt b/test/atm/global-workflow/CMakeLists.txt
@@ -59,3 +59,14 @@ add_test(NAME test_gdasapp_atm_jjob_ens_final
   COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_final.sh
           ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
+
+# python fix
+  set_tests_properties(
+      test_gdasapp_run_jedi_exe_3dhofx
+      test_gdasapp_run_jedi_exe_3dvar
+      test_gdasapp_run_jedi_exe_3denvar
+      test_gdasapp_run_jedi_exe_letkf
+      PROPERTIES
+          ENVIRONMENT "PYTHONPATH=${PROJECT_BINARY_DIR}/lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}:$ENV{PYTHONPATH}"
+  )
+
diff --git a/test/land/test_imsproc.sh b/test/land/test_imsproc.sh
@@ -56,7 +56,7 @@ done
 ulimit -Ss unlimited
 ${EXECDIR}/calcfIMS.exe
 
-export PYTHONPATH=$PYTHONPATH:${project_source_dir}/iodaconv/src/:${project_source_dir}/build/lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/pyioda/
+export PYTHONPATH=$PYTHONPATH:${project_source_dir}/iodaconv/src/:${project_source_dir}/build/lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}
 IMS_IODA=${EXECDIR}/imsfv3_scf2ioda.py
 
 echo 'do_landDA: calling ioda converter'

diff --git 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']