Ref NOAA-EMC#310

More cleanup
EdwardSafford-NOAA · Apr 25, 2022 · 9054e3b · 9054e3b
1 parent f6a7705
commit 9054e3b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/util/Radiance_Monitor/image_gen/ush/RadMon_IG_glb.sh b/util/Radiance_Monitor/image_gen/ush/RadMon_IG_glb.sh
@@ -352,8 +352,7 @@ if [[ $RUN_TRANSFER -eq 1 ]]; then
          chmod 755 $cmdfile
 
          run_time="$rhr$cmin"	# HHMM format for qsub
-         $SUB -q $transfer_queue -A $ACCOUNT -o ${transfer_log} \
-              -e ${LOGdir}/Transfer_${RADMON_SUFFIX}.err \
+         $SUB -q $transfer_queue -A $ACCOUNT -o ${transfer_log} -e ${LOGdir}/Transfer_${RADMON_SUFFIX}.err \
 	      -V -l select=1:mem=500M -l walltime=45:00 -N ${jobname} -a ${run_time} ${cmdfile}
       else
          $SUB -P $PROJECT -q $transfer_queue -o ${transfer_log} -M 80 -W 0:45 \

diff --git a/util/Radiance_Monitor/image_gen/ush/mk_time_plots.sh b/util/Radiance_Monitor/image_gen/ush/mk_time_plots.sh
@@ -329,16 +329,10 @@ for sat in ${bigSATLIST}; do
       $SUB --account ${ACCOUNT} -n ${ctr}  -o ${logfile} -D . -J ${jobname} --time=4:00:00 \
            -p ${RADMON_PARTITION} --wrap "srun -l --multi-prog ${cmdfile}"
 
-<<<<<<< HEAD
-      elif [[ $MY_MACHINE = "wcoss2" ]]; then
-         $SUB -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${LOGdir}/plot_time_${sat}.err -V \
-              -l select=1:mem=1g -l walltime=1:30:00 -N ${jobname} ${cmdfile}
-=======
    elif [[ $MY_MACHINE = "wcoss2" ]]; then
       logfile=${LOGdir}/plot_time_${sat}.log
       if [[ -e ${logfile} ]]; then
          rm ${logfile}
->>>>>>> master
       fi
 
       $SUB -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${LOGdir}/plot_time_${sat}.err -V \