Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix non-SOCA tests #518

Merged
merged 2 commits into from
Jun 30, 2023
Merged

Fix non-SOCA tests #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
926a908
Fix tests that are not in the ocean
CoryMartin-NOAA Jun 29, 2023
bcaedde
bug fix
CoryMartin-NOAA Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions test/atm/global-workflow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
)

2 changes: 1 addition & 1 deletion test/land/test_imsproc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions ush/ufsda/soca_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down