Updates to prep ocean obs task (NOAA-EMC#1870)

KateFriedman-NOAA · Nov 1, 2023 · 241742b · 241742b
1 parent 77be0ec
commit 241742b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/jobs/JGLOBAL_PREP_OCEAN_OBS b/jobs/JGLOBAL_PREP_OCEAN_OBS
@@ -7,15 +7,23 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "prepoceanobs" -c "base prepoceanobs"
 # Set variables used in the script
 ##############################################
 
+export COMIN_OBS="${DATA}"
+
 ##############################################
 # Begin JOB SPECIFIC work
 ##############################################
 
+# Add prep_marine_obs.py to PYTHONPATH
+export PYTHONPATH=${HOMEgfs}/sorc/gdas.cd/ush/soca:${PYTHONPATH}
 
 ###############################################################
 # Run relevant script
 
-# the relevant script goes here
+EXSCRIPT=${GDASPREPPY:-${HOMEgfs}/ush/exglobal_prep_ocean_obs.py}
+${EXSCRIPT}
+status=$?
+[[ ${status} -ne 0 ]] && exit "${status}"
+
 
 ##############################################
 # End JOB SPECIFIC work

diff --git a/parm/config/gfs/config.prepoceanobs b/parm/config/gfs/config.prepoceanobs
@@ -1,9 +1,13 @@
 #!/bin/bash
 
 ########## config.prepoceanobs ##########
-# Pre Ocn Analysis specific
 
-echo "BEGIN: config.config.prepoceanobs"
+echo "BEGIN: config.prepoceanobs"
+
+export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/config
+export OBS_LIST=@SOCA_OBS_LIST@
+[[ -n "${OBS_LIST}" ]] || export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml
+export OBS_YAML=${OBS_LIST}
 
 # Get task specific resources
 . "${EXPDIR}/config.resources" prepoceanobs

diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh
@@ -205,6 +205,7 @@ if [[ -d "${HOMEgfs}/sorc/gdas.cd" ]]; then
   ${LINK_OR_COPY} "${HOMEgfs}/sorc/gdas.cd/ush/jediinc2fv3.py"                     .
   ${LINK_OR_COPY} "${HOMEgfs}/sorc/gdas.cd/ush/ioda/bufr2ioda/run_bufr2ioda.py"    .
   ${LINK_OR_COPY} "${HOMEgfs}/sorc/gdas.cd/build/bin/imsfv3_scf2ioda.py"           .
+  ${LINK_OR_COPY} "${HOMEgfs}/sorc/gdas.cd/scripts/exglobal_prep_ocean_obs.py"           .
 fi