bringing in line with g-w

AndrewEichmann-NOAA · Feb 16, 2024 · 711656d · 711656d
1 parent 62b398c
commit 711656d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN
@@ -13,12 +13,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalecen" -c "base ocnanalecen"
 # Begin JOB SPECIFIC work
 ##############################################
 
-export PYTHONPATH=${HOMEgfs}/sorc/gdas.cd/ush:${PYTHONPATH}
-
 ###############################################################
 # Run relevant script
 
-EXSCRIPT=${GDASOCNRUNSH:-${HOMEgfs}/sorc/gdas.cd/scripts/exgdas_global_marine_analysis_ecen.py}
+EXSCRIPT=${GDASOCNCENPY:-${HOMEgfs}/ush/exgdas_global_marine_analysis_ecen.py}
 ${EXSCRIPT}
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"

diff --git a/jobs/rocoto/ocnanalecen.sh b/jobs/rocoto/ocnanalecen.sh
@@ -11,6 +11,11 @@ status=$?
 export job="ocnanalecen"
 export jobid="${job}.$$"
 
+###############################################################
+# Setup Python path for GDASApp ush
+PYTHONPATH=${HOMEgfs}/sorc/gdas.cd/ush:${PYTHONPATH}
+export PYTHONPATH
+
 ###############################################################
 # Execute the JJOB
 "${HOMEgfs}"/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN