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

Bugfix/pythonpath change #519

Merged
merged 4 commits into from
Jun 30, 2023
Merged

Bugfix/pythonpath change #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06ad9f6
changing to match ioda
AndrewEichmann-NOAA Jun 30, 2023
b45a9a6
Merge branch 'develop' into bugfix/pythonpath-change
AndrewEichmann-NOAA Jun 30, 2023
a0a8eb3
adding pythonpath change to task ctests
AndrewEichmann-NOAA Jun 30, 2023
3a0631a
saber exec name change (#520)
guillaumevernieres Jun 30, 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
6 changes: 3 additions & 3 deletions scripts/exgdas_global_marine_analysis_bmat.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 5 additions & 1 deletion test/soca/gw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
CoryMartin-NOAA marked this conversation as resolved.
Show resolved Hide resolved

# Clean-up
add_test(NAME test_gdasapp_soca_run_clean
Expand Down Expand Up @@ -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
Expand Down