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

Correct GDASApp paths #2435

Merged
merged 6 commits into from
Mar 27, 2024
+24 −4
Merged

Correct GDASApp paths #2435

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
90235d8
generalize specification of path to GDASApp pyiodaconv (#2434)
RussTreadon-NOAA Mar 25, 2024
054ec59
correct gdasappPATH for prepsnowobs.sh (#2434)
RussTreadon-NOAA Mar 25, 2024
4a802f6
generalize pyioda path for JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP (#2434)
RussTreadon-NOAA Mar 25, 2024
6e79354
Merge branch 'develop' into feature/gdasapp_paths
RussTreadon-NOAA Mar 26, 2024
c365e99
add function detect_py_ver to set pyiodaPATH (#2434)
RussTreadon-NOAA Mar 26, 2024
a9fd446
address shellcheck warning (#2434)
RussTreadon-NOAA Mar 26, 2024
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
3 changes: 2 additions & 1 deletion jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@

# Add UFSDA to PYTHONPATH
ufsdaPATH="${HOMEgfs}/sorc/gdas.cd/ush/"
pyiodaPATH="${HOMEgfs}/sorc/gdas.cd/build/lib/python3.7/"
py_ver=$(regex="[0-9]+\.[0-9]+"; if [[ $(python --version) =~ ${regex} ]]; then echo "${BASH_REMATCH[0]}"; fi)
github-advanced-security[bot] marked this conversation as resolved.
Fixed Show resolved Hide resolved
pyiodaPATH="${HOMEgfs}/sorc/gdas.cd/build/lib/python${py_ver}/"
RussTreadon-NOAA marked this conversation as resolved.
Show resolved Hide resolved
PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${ufsdaPATH}:${pyiodaPATH}"
export PYTHONPATH

Expand Down
3 changes: 2 additions & 1 deletion jobs/rocoto/prepatmiodaobs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
###############################################################
# setup python path for workflow and ioda utilities
wxflowPATH="${HOMEgfs}/ush/python:${HOMEgfs}/ush/python/wxflow/src"
PYIODALIB="${HOMEgfs}/sorc/gdas.cd/build/lib/python3.7"
py_ver=$(regex="[0-9]+\.[0-9]+"; if [[ $(python --version) =~ ${regex} ]]; then echo "${BASH_REMATCH[0]}"; fi)
github-advanced-security[bot] marked this conversation as resolved.
Fixed Show resolved Hide resolved
PYIODALIB="${HOMEgfs}/sorc/gdas.cd/build/lib/python${py_ver}"
PYTHONPATH="${PYIODALIB}:${wxflowPATH}:${PYTHONPATH}"
export PYTHONPATH

Expand Down
3 changes: 2 additions & 1 deletion jobs/rocoto/prepsnowobs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
###############################################################
# setup python path for workflow utilities and tasks
wxflowPATH="${HOMEgfs}/ush/python:${HOMEgfs}/ush/python/wxflow/src"
gdasappPATH="${HOMEgfs}/sorc/gdas.cd/iodaconv/src:${HOMEgfs}/sorc/gdas.cd/build/lib/python3.7"
py_ver=$(regex="[0-9]+\.[0-9]+"; if [[ $(python --version) =~ ${regex} ]]; then echo "${BASH_REMATCH[0]}"; fi)
github-advanced-security[bot] marked this conversation as resolved.
Fixed Show resolved Hide resolved
gdasappPATH="${HOMEgfs}/sorc/gdas.cd/sorc/iodaconv/src:${HOMEgfs}/sorc/gdas.cd/build/lib/python${py_ver}"
PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${wxflowPATH}:${gdasappPATH}"
export PYTHONPATH

Expand Down
Loading