Skip to content

Commit

Permalink
Merge branch 'bug/xfer-94' of https://github.com/EdwardSafford-NOAA/G…
Browse files Browse the repository at this point in the history
…SI-monitor into bug/xfer-94
  • Loading branch information
EdwardSafford-NOAA committed Jul 21, 2023
2 parents 5dd9f14 + 69d7c6c commit 79936d7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 23 deletions.
21 changes: 1 addition & 20 deletions src/Radiance_Monitor/image_gen/ush/RadMon_IG_glb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -350,31 +350,12 @@ if [[ $RUN_TRANSFER -eq 1 ]]; then
echo "${IG_SCRIPTS}/transfer.sh" >$cmdfile
chmod 755 $cmdfile

run_time="$rhr$cmin" # HHMM format for qsub
# $SUB -q $transfer_queue -A $ACCOUNT -o ${transfer_log} -e ${transfer_err} \
# -V -l select=1:mem=500M -l walltime=45:00 -N ${jobname} -a ${run_time} ${cmdfile}


# transfer_queue=dev_transfer
# jobname=transfer_${RADMON_SUFFIX}
# export WEBDIR=${WEBDIR}/${RADMON_SUFFIX}
# echo WEBDIR = $WEBDIR
# echo IMGNDIR = $IMGNDIR
#
# transfer_work_dir=${MON_STMP}/${RADMON_SUFFIX}/${RUN}/radmon/transfer
# if [[ ! -d ${transfer_work_dir} ]]; then
# mkdir -p ${transfer_work_dir}
# fi
#
# cmdfile="${transfer_work_dir}/transfer_cmd"
# echo "${IG_SCRIPTS}/transfer.sh" >$cmdfile
# chmod 755 $cmdfile

if [[ ${MY_MACHINE} = "hera" ]]; then
${SUB} --account ${ACCOUNT} --ntasks=1 --mem=500M --time=45:00 -J ${jobname} \
--partition service -o ${transfer_log} --begin=${rhr}:${cmin} ${IG_SCRIPTS}/transfer.sh

elif [[ ${MY_MACHINE} = "wcoss2" ]]; then
run_time="$rhr$cmin" # HHMM format for qsub
$SUB -q $transfer_queue -A $ACCOUNT -o ${transfer_log} -e ${transfer_err} \
-V -l select=1:mem=500M -l walltime=45:00 -N ${jobname} -a ${run_time} ${cmdfile}
fi
Expand Down
3 changes: 0 additions & 3 deletions src/Radiance_Monitor/image_gen/ush/transfer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ if [[ ${TANKimg} != "/" && -d ${TANKimg} ]]; then
ssh ${WEBUSER}@${WEBSVR} "mkdir -p ${WEBDIR}"
fi

echo "rsync from ${TANKimg}"
echo "rysnc to ${WEBUSER}@${WEBSVR}:${WEBDIR}/"

/usr/bin/rsync -ave ssh --exclude *.ctl.${Z} \
--exclude 'horiz' --exclude '*.png' --delete-during --update ${TANKimg}/ \
${WEBUSER}@${WEBSVR}:${WEBDIR}/
Expand Down

0 comments on commit 79936d7

Please sign in to comment.