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

Update to obsproc.v1.0.2 and prepobs.v1.0.1 #1049

Merged
Merged
Show file tree
Hide file tree
Changes from 12 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
1 change: 1 addition & 0 deletions env/HERA.env
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
export POE="NO"
export BACK="NO"
export sys_tp="HERA"
export launcher_PREP="srun"

elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostbndpntbll" -o $step = "wavepostpnt" ]; then

Expand Down
1 change: 1 addition & 0 deletions env/ORION.env
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
export POE="NO"
export BACK=${BACK:-"YES"}
export sys_tp="ORION"
export launcher_PREP="srun"

elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt" ]; then

Expand Down
4 changes: 2 additions & 2 deletions jobs/rocoto/prep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ status=$?

###############################################################
# Source relevant configs
configs="base prep prepbufr"
configs="base prep"
for config in $configs; do
. $EXPDIR/config.${config}
status=$?
Expand Down Expand Up @@ -109,7 +109,7 @@ if [ $DO_MAKEPREPBUFR = "YES" ]; then
export MAKE_NSSTBUFR="NO"
fi

$HOMEobsproc_network/jobs/JGLOBAL_PREP
$HOMEobsproc/jobs/JOBSPROC_GLOBAL_PREP
status=$?
[[ $status -ne 0 ]] && exit $status

Expand Down
3 changes: 3 additions & 0 deletions modulefiles/module_base.hera.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ load(pathJoin("cdo", "1.9.5"))

load(pathJoin("R", "3.5.0"))

prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/v1.0.1/modulefiles"))
load(pathJoin("prepobs", "1.0.1"))

-- Temporary until official hpc-stack is updated
prepend_path("MODULEPATH", "/scratch2/NCEPDEV/ensemble/save/Walter.Kolczynski/hpc-stack/modulefiles/stack")
load(pathJoin("hpc", "1.2.0"))
Expand Down
3 changes: 3 additions & 0 deletions modulefiles/module_base.orion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ load(pathJoin("slurm", "19.05.3-2"))

load(pathJoin("cdo", "1.9.5"))

prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/v1.0.1/modulefiles"))
load(pathJoin("prepobs", "1.0.1"))

-- Temporary until official hpc-stack is updated
prepend_path("MODULEPATH", "/work2/noaa/global/wkolczyn/save/hpc-stack/modulefiles/stack")
load(pathJoin("hpc", "1.2.0"))
Expand Down
4 changes: 1 addition & 3 deletions parm/config/config.base.emc.dyn
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ export MODE="@MODE@" # cycled/forecast-only
export FIXgsi="$HOMEgfs/fix/gsi"
export HOMEfv3gfs="$HOMEgfs/sorc/fv3gfs.fd"
export HOMEpost="$HOMEgfs"
export HOMEobsproc_prep="$BASE_GIT/obsproc/obsproc_prep.v5.5.0_hpc-stack"
export HOMEobsproc_network="$BASE_GIT/obsproc/obsproc_global.v3.4.2_hpc-stack"
export HOMEobsproc_global=$HOMEobsproc_network
export HOMEobsproc="$BASE_GIT/obsproc/v1.0.2"

# CONVENIENT utility scripts and other environment parameters
export NCP="/bin/cp -p"
Expand Down
4 changes: 1 addition & 3 deletions parm/config/config.base.nco.static
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ export REALTIME="YES"
export FIXgsi="$HOMEgfs/fix/gsi"
export HOMEfv3gfs="$HOMEgfs/sorc/fv3gfs.fd"
export HOMEpost="$HOMEgfs"
export HOMEobsproc_prep="$NWPROD/obsproc_prep.v5.5.0"
export HOMEobsproc_network="$NWPROD/obsproc_global.v3.4.2"
export HOMEobsproc_global=$HOMEobsproc_network
export HOMEobsproc="/lfs/h1/ops/prod/packages/obsproc.v1.0.2"

# CONVENIENT utility scripts and other environment parameters
export NCP="/bin/cp -p"
Expand Down
3 changes: 3 additions & 0 deletions parm/config/config.prep
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ echo "BEGIN: config.prep"
. $EXPDIR/config.resources prep

export DO_MAKEPREPBUFR="YES" # if NO, will copy prepbufr from globaldump
export cdate10=${PDY}${cyc}
KateFriedman-NOAA marked this conversation as resolved.
Show resolved Hide resolved

# Relocation and syndata QC
export PROCESS_TROPCY=${PROCESS_TROPCY:-NO}
Expand All @@ -17,6 +18,8 @@ export DO_RELOCATE="NO"
export TROPCYQCRELOSH="$HOMEgfs/scripts/exglobal_atmos_tropcy_qc_reloc.sh"
export SENDCOM=YES

export COMPONENT=${COMPONENT:-atmos}
KateFriedman-NOAA marked this conversation as resolved.
Show resolved Hide resolved
export COMINtcvital=${COMINtcvital:-${DMPDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}}
export COMINsyn=${COMINsyn:-$(compath.py ${envir}/com/gfs/${gfs_ver})/syndat}

export HOMERELO=$HOMEgfs
Expand Down
19 changes: 0 additions & 19 deletions parm/config/config.prepbufr

This file was deleted.

12 changes: 6 additions & 6 deletions parm/config/config.resources
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ elif [[ "$machine" = "ORION" ]]; then
export npe_node_max=40
fi

if [ $step = "prep" -o $step = "prepbufr" ]; then
eval "export wtime_$step='00:45:00'"
eval "export npe_$step=4"
eval "export npe_node_$step=2"
eval "export nth_$step=1"
eval "export memory_$step=40G"
if [ $step = "prep" ]; then
export wtime_prep='00:45:00'
export npe_prep=4
export npe_node_prep=2
export nth_prep=1
export memory_prep="40G"

elif [ $step = "aerosol_init" ]; then
export wtime_aerosol_init="00:05:00"
Expand Down