Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Replace runWcoss.sh with a setup script that get's sourced by the
cmdfile.
  • Loading branch information
EdwardSafford-NOAA committed Jun 26, 2024
1 parent d18e15b commit d82f9d3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
7 changes: 5 additions & 2 deletions scripts/exobsmon_plot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,18 @@ if compgen -G "${DATA}/OM_PLOT*.yaml" > /dev/null; then
;;

wcoss2)
# prepend setup script to $cmdfile
echo -e ". ${USHobsmon}/setup_wcoss2.sh\n $(cat ${cmdfile})" > ${cmdfile}
chmod 775 ${cmdfile}

mem=$((4*${ctr}))
echo "submitting ${jobname} on wcoss2, ctr = $ctr, mem = $mem, cmdfile = ${cmdfile}"
cp ${USHobsmon}/runWcoss.sh .

${SUB} -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} \
-v "PYTHONPATH=${PYTHONPATH}, PATH=${PATH}, HOMEobsmon=${HOMEobsmon}, MODEL=${MODEL}, \
CNTRLobsmon=${CNTRLobsmon}, PARMobsmon=${PARMobsmon}, DATA=${DATA}, \
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}, cmdfile=${cmdfile}, ncpus=${ctr}" \
-l place=vscatter,select=1:ncpus=${ctr}:mem=${mem}gb,walltime=1:30:00 -N ${jobname} ./runWcoss.sh
-l place=vscatter,select=1:ncpus=${ctr}:mem=${mem}gb,walltime=1:30:00 -N ${jobname} ${cmdfile}
;;
esac
fi
Expand Down
7 changes: 0 additions & 7 deletions ush/runWcoss.sh → ush/setup_wcoss2.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash

st=`date`

module reset

module load libfabric/1.11.0.0.
Expand All @@ -18,8 +16,3 @@ export PYTHONPATH=${PYTHONPATH}:/lfs/h2/emc/da/noscrub/edward.safford/eva/opt/

if [ ! -z ${PBS_O_WORKDIR} ]; then cd ${PBS_O_WORKDIR}; fi

./${cmdfile}

end=`date`
echo "start: ${st}"
echo "end: ${end}"

0 comments on commit d82f9d3

Please sign in to comment.