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.

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

Incorporating changes made by NCO SPA #35

Merged
merged 1 commit into from
Apr 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion jobs/JOBSPROC_CDAS_DUMP
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export FIXbufr=${FIXbufr:-$HOMEbufr_dump/fix}
# TANK is root directory path to observational database used in dumpjb
# and engice, sst & snowdepth grib files used in model script
# --------------------------------------------------------------------
export DCOMROOT=${DCOMROOT:-/lfs/h1/ops/${envir}/dcom}
export DCOMROOT=${DCOMROOT:-/lfs/h1/ops/prod/dcom}
ilianagenkova marked this conversation as resolved.
Show resolved Hide resolved
export TANK=${TANK:-${DCOMROOT}}

# directory paths to engice, sst & snowdepth grib files used in model script
Expand Down
4 changes: 2 additions & 2 deletions jobs/JOBSPROC_GLOBAL_PREP
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ export DICTPREP=${DICTPREP:-${OPSROOT}/decoders/decod_shared/dictionaries_${dict
# prepobsp_prevents.sh.
# ---------------------------------------------------------------------------
#export HOMEgfs=${HOMEgfs:-${PACKAGEROOT:?}/gfs.${gfs_ver:?"###FATAL ERROR \"gfs_ver\" is not set"}}
#export HOMEgfs=${HOMEgfs:-$(compath.py ${envir}/gfs/${gfs_ver})}
export HOMEgfs=${HOMEgfs:-$HOMEobsproc} #Temporary place to let job run. change it to above layer when gfs run in realtime
export HOMEgfs=${HOMEgfs:-$(compath.py gfs/${gfs_ver})}
#export HOMEgfs=${HOMEgfs:-$HOMEobsproc} #Temporary place to let job run. change it to above layer when gfs run in realtime

#########################################################################
# Add some prod utilities to working directory
Expand Down
11 changes: 7 additions & 4 deletions jobs/JOBSPROC_MODS
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,17 @@ cp $UTILROOT/ush/setpdy.sh .; chmod +x setpdy.sh
##############################
# Run setpdy and initialize PDY variables
##############################
setpdy.sh
setpdy.sh 9
ilianagenkova marked this conversation as resolved.
Show resolved Hide resolved
. PDY

export YYYY=`echo $PDYm9 | cut -c1-4` #mods doing $PDYm9 data

##################################################
# Define COMOUT directory (no COMIN for this job)
##################################################

#export COMOUT=${COMOUT:-$(compath.py -o ${obsNET}/$obsproc_ver/${NET}.${PDY})}
export COMOUT=${COMOUT:-$(compath.py -o ${obsNET}/$obsproc_ver/${NET}.${PDY})}
export COMOUT=${COMOUT:-$(compath.py -o ${obsNET}/$obsproc_ver/${NET}.${PDY})}
export MODSDIR=${MODSDIR:-$(compath.py -o ${obsNET}/$obsproc_ver)/mods.$YYYY}
mkdir -m 775 -p $COMOUT

##############################################
Expand All @@ -187,7 +189,8 @@ mkdir -m 775 -p $COMOUT

export DCOMROOT=${DCOMROOT:-/lfs/h1/ops/${envir}/dcom}
echo $DCOMROOT
export MODSDIR=${MODSDIR:-${DCOMROOT}/mods}
#export MODSDIR=${MODSDIR:-${DCOMROOT}/mods}
#export MODSDIR=${MODSDIR:-${COM_OUT}/mods.$YYYY}


env ; echo "JMODS: end of env listing" ; echo
Expand Down
3 changes: 2 additions & 1 deletion ush/bufr_prepmods.sh
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ for dtyp in $dtypes ; do

# make and/or move to directory for this data for this day
# --------------------------------------------------------
DBASE=$MODSDIR/$year/$mnth/$dtyp
#DBASE=$MODSDIR/$year/$mnth/$dtyp
DBASE=$MODSDIR/$mnth/$dtyp
mkdir -p $DBASE

if [ ".$dtyp" = '.ships' -o \
Expand Down