Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add some Hera items.
  • Loading branch information
EdwardSafford-NOAA committed Jun 24, 2024
1 parent 982f3c4 commit 95e8521
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion parm/OM_config
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export JOBSobsmon=${om_dir_root}/jobs
# Export job submission vars per MACHINE_ID
#
source ${om_dir_root}/ush/detect_machine.sh
MACHINE_ID=`echo "${MACHINE_ID%%.*}"`
export MACHINE_ID=`echo "${MACHINE_ID%%.*}"`

case ${MACHINE_ID} in

Expand Down
22 changes: 12 additions & 10 deletions scripts/exobsmon_plot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,27 @@ if [[ ! -e ${chan_yaml} ]]; then
exit 2
fi

#-----------------------------------------------------------
# split $plot_yaml into sat/instr[/plot], minimization, obs
#---------------------------------------------------------------
# split $plot_yaml into sat/instr[/plot], minimization, and obs
# in order to reduce the plot jobs to a more managable size
#
${APRUN_PY} ${USHobsmon}/splitPlotYaml.py -i ${plot_yaml} -c ${chan_yaml}

#--------------------------------------------------------------
# Submit OM_sat_plots job if split yields any sat_*.yaml files
#-------------------------------------------------------
# Submit OM_plots job if split yielded any *.yaml files
#
if compgen -G "${DATA}/sat_*.yaml" > /dev/null; then
if compgen -G "${DATA}/*.yaml" > /dev/null; then

jobname="OM_plot_all"
jobname="OM_plots"
export logfile="${OM_LOGS}/${MODEL}/OM_plot.log"
if [[ -e ${logfile} ]]; then rm ${logfile}; fi

cmdfile="OM_sat_jobscript"
cmdfile="OM_jobscript"
>$cmdfile

ctr=0
for yaml in ${DATA}/*.yaml; do
echo "processing yaml: $ctr $yaml"
case ${MACHINE_ID} in
hera)
echo "${ctr} ${APRUN_PY} ${USHobsmon}/plotObsMon.py -i ${yaml} -p ${PDATE}" >> $cmdfile
Expand All @@ -51,11 +53,11 @@ if compgen -G "${DATA}/sat_*.yaml" > /dev/null; then
done


if compgen -G "${DATA}/sat*.yaml" > /dev/null; then
if [[ ${ctr} > 0 ]]; then
case ${MACHINE_ID} in
hera)
${SUB} --account ${ACCOUNT} --ntasks=1 --mem=80000M --time=0:50:00 \
-J ${jobname} --partition service -o ${logfile} ${cmdfile}
${SUB} --account ${ACCOUNT} -n ${ctr} -o ${logfile} -D . -J ${jobname} --time=1:00:00 \
--mem=80000M --wrap "srun -l --multi-prog ${cmdfile}"
;;

wcoss2)
Expand Down

0 comments on commit 95e8521

Please sign in to comment.