From 31e3badd94139933fee0a4c72ea7da40e98fa11a Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Thu, 18 Apr 2024 13:28:09 +0000 Subject: [PATCH 1/5] path tweaks --- jobs/JGLOBAL_PREP_OCEAN_OBS | 4 ++-- sorc/link_workflow.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jobs/JGLOBAL_PREP_OCEAN_OBS b/jobs/JGLOBAL_PREP_OCEAN_OBS index c3a0035ac67..e0b3d12104f 100755 --- a/jobs/JGLOBAL_PREP_OCEAN_OBS +++ b/jobs/JGLOBAL_PREP_OCEAN_OBS @@ -15,12 +15,12 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMOUT_OBS:COM_OBS_TMPL ############################################## # Add prep_marine_obs.py to PYTHONPATH -export PYTHONPATH=${HOMEgfs}/sorc/gdas.cd/ush:${PYTHONPATH} +export PYTHONPATH=${HOMEgfs}/ush:${PYTHONPATH} ############################################################### # Run relevant script -EXSCRIPT=${GDASPREPOCNOBSPY:-${USHgfs}/exglobal_prep_ocean_obs.py} +EXSCRIPT=${GDASPREPOCNOBSPY:-${HOMEgfs}/scripts/exglobal_prep_ocean_obs.py} ${EXSCRIPT} status=$? [[ ${status} -ne 0 ]] && exit "${status}" diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh index 45645aac9ba..b51c2345299 100755 --- a/sorc/link_workflow.sh +++ b/sorc/link_workflow.sh @@ -231,6 +231,7 @@ fi #------------------------------ if [[ -d "${HOMEgfs}/sorc/gdas.cd/build" ]]; then cd "${HOMEgfs}/ush" || exit 1 + ${LINK_OR_COPY} "${HOMEgfs}/sorc/gdas.cd/ush/soca" . ${LINK_OR_COPY} "${HOMEgfs}/sorc/gdas.cd/ush/ufsda" . ${LINK_OR_COPY} "${HOMEgfs}/sorc/gdas.cd/ush/jediinc2fv3.py" . ${LINK_OR_COPY} "${HOMEgfs}/sorc/gdas.cd/ush/ioda/bufr2ioda/gen_bufr2ioda_json.py" . From 76b0d5b9834d035a460f36d6930ce2960733f63f Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Thu, 18 Apr 2024 16:01:33 +0000 Subject: [PATCH 2/5] comment correction --- jobs/JGLOBAL_PREP_OCEAN_OBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGLOBAL_PREP_OCEAN_OBS b/jobs/JGLOBAL_PREP_OCEAN_OBS index e0b3d12104f..2a1b4cfadfb 100755 --- a/jobs/JGLOBAL_PREP_OCEAN_OBS +++ b/jobs/JGLOBAL_PREP_OCEAN_OBS @@ -14,7 +14,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMOUT_OBS:COM_OBS_TMPL # Begin JOB SPECIFIC work ############################################## -# Add prep_marine_obs.py to PYTHONPATH +# Add prep_ocean_obs.py to PYTHONPATH export PYTHONPATH=${HOMEgfs}/ush:${PYTHONPATH} ############################################################### From d382416cf47395e3df2ecae899067b89a9bc0a07 Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA <58948505+AndrewEichmann-NOAA@users.noreply.github.com> Date: Thu, 18 Apr 2024 13:39:14 -0400 Subject: [PATCH 3/5] Update jobs/JGLOBAL_PREP_OCEAN_OBS Co-authored-by: Rahul Mahajan --- jobs/JGLOBAL_PREP_OCEAN_OBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGLOBAL_PREP_OCEAN_OBS b/jobs/JGLOBAL_PREP_OCEAN_OBS index 2a1b4cfadfb..dbbab898fd3 100755 --- a/jobs/JGLOBAL_PREP_OCEAN_OBS +++ b/jobs/JGLOBAL_PREP_OCEAN_OBS @@ -20,7 +20,7 @@ export PYTHONPATH=${HOMEgfs}/ush:${PYTHONPATH} ############################################################### # Run relevant script -EXSCRIPT=${GDASPREPOCNOBSPY:-${HOMEgfs}/scripts/exglobal_prep_ocean_obs.py} +EXSCRIPT=${GDASPREPOCNOBSPY:-${SCRgfs}/exglobal_prep_ocean_obs.py} ${EXSCRIPT} status=$? [[ ${status} -ne 0 ]] && exit "${status}" From 3405a4417a2329661d38937c7228b785d5c6ac84 Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Thu, 18 Apr 2024 18:35:30 +0000 Subject: [PATCH 4/5] review suggestions --- jobs/JGLOBAL_PREP_OCEAN_OBS | 3 --- jobs/rocoto/prepoceanobs.sh | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jobs/JGLOBAL_PREP_OCEAN_OBS b/jobs/JGLOBAL_PREP_OCEAN_OBS index dbbab898fd3..339d90567ea 100755 --- a/jobs/JGLOBAL_PREP_OCEAN_OBS +++ b/jobs/JGLOBAL_PREP_OCEAN_OBS @@ -14,9 +14,6 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMOUT_OBS:COM_OBS_TMPL # Begin JOB SPECIFIC work ############################################## -# Add prep_ocean_obs.py to PYTHONPATH -export PYTHONPATH=${HOMEgfs}/ush:${PYTHONPATH} - ############################################################### # Run relevant script diff --git a/jobs/rocoto/prepoceanobs.sh b/jobs/rocoto/prepoceanobs.sh index d7ae87851f4..3fa4dcf0832 100755 --- a/jobs/rocoto/prepoceanobs.sh +++ b/jobs/rocoto/prepoceanobs.sh @@ -12,6 +12,11 @@ status=$? export job="prepoceanobs" export jobid="${job}.$$" +############################################################### +# setup python path for class defs and utils + +export PYTHONPATH=${HOMEgfs}/ush:${PYTHONPATH} + ############################################################### # Execute the JJOB "${HOMEgfs}"/jobs/JGLOBAL_PREP_OCEAN_OBS From 1abeb4f74ed850c06186cc9abcd80797c22aad6f Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA <58948505+AndrewEichmann-NOAA@users.noreply.github.com> Date: Thu, 18 Apr 2024 16:31:35 -0400 Subject: [PATCH 5/5] Update jobs/rocoto/prepoceanobs.sh Co-authored-by: Rahul Mahajan --- jobs/rocoto/prepoceanobs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/rocoto/prepoceanobs.sh b/jobs/rocoto/prepoceanobs.sh index 3fa4dcf0832..d8626f55186 100755 --- a/jobs/rocoto/prepoceanobs.sh +++ b/jobs/rocoto/prepoceanobs.sh @@ -15,7 +15,7 @@ export jobid="${job}.$$" ############################################################### # setup python path for class defs and utils -export PYTHONPATH=${HOMEgfs}/ush:${PYTHONPATH} +PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${HOMEgfs}/ush" ############################################################### # Execute the JJOB