Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
more orion changes.
  • Loading branch information
EdwardSafford-NOAA committed Aug 9, 2022
1 parent 97fbac4 commit 34d5331
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
14 changes: 2 additions & 12 deletions src/Radiance_Monitor/image_gen/ush/RadMon_IG_glb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,7 @@ fi
# If option 2 has been used the last_plot_time file will be
# updated with ${PDATE} if the plot is able to run.
#--------------------------------------------------------------------

echo "TANKimg = ${TANKimg}"
last_plot_time=${TANKimg}/last_plot_time
echo "last_plot_time file = ${last_plot_time}"

latest_data=`${IG_SCRIPTS}/nu_find_cycle.pl --cyc 1 \
--dir ${TANKverf} --run ${RUN}`
Expand Down Expand Up @@ -165,7 +162,6 @@ echo "PDATE = ${PDATE}"
#--------------------------------------------------------------------
# Make sure $R_LOGDIR exists
#--------------------------------------------------------------------
echo "R_LOGDIR = ${R_LOGDIR}"
if [[ ! -e ${R_LOGDIR} ]]; then
mkdir -p $R_LOGDIR
fi
Expand All @@ -175,7 +171,6 @@ fi
# PDATE is the latest/last cycle in the plots.
#--------------------------------------------------------------------
hrs=`expr ${NUM_CYCLES} \\* -6`
echo "hrs = $hrs"

export START_DATE=`${NDATE} ${hrs} ${PDATE}`
echo "span is start_date to pdate = ${START_DATE}, ${PDATE}"
Expand Down Expand Up @@ -259,7 +254,6 @@ fi
#

list_array=($test_list)
echo "Number of elements in the list_array: ${#list_array[@]}"

for test in "${list_array[@]}"; do

Expand All @@ -268,7 +262,7 @@ for test in "${list_array[@]}"; do

if [[ $satype != *${tmp}* ]]; then
echo "$tmp IS NOT in satype"
satype="$satype $tmp"
satype="$satype $tmp"
fi

fi
Expand All @@ -281,7 +275,6 @@ echo $SATYPE
#------------------------------------------------------------------
# Start plot scripts.
#------------------------------------------------------------------
echo "starting plot scripts"
${IG_SCRIPTS}/mk_time_plots.sh

${IG_SCRIPTS}/mk_bcoef_plots.sh
Expand Down Expand Up @@ -348,10 +341,7 @@ if [[ $RUN_TRANSFER -eq 1 ]]; then
rm ${transfer_err}
fi

transfer_queue=transfer
if [[ $MY_MACHINE = "wcoss_d" || $MY_MACHINE = "wcoss2" ]]; then
transfer_queue=dev_transfer
fi
transfer_queue=dev_transfer

jobname=transfer_${RADMON_SUFFIX}
job="${IG_SCRIPTS}/Transfer.sh --nosrc ${RADMON_SUFFIX}"
Expand Down
16 changes: 13 additions & 3 deletions src/Radiance_Monitor/image_gen/ush/mk_bcor_plots.sh
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,8 @@ rm -f ${logfile}

ctr=0
for sat in ${SATLIST}; do
if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "jet" || $MY_MACHINE = "s4" ]]; then
if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "jet" ||
$MY_MACHINE = "s4" || $MY_MACHINE = "orion" ]]; then
echo "${ctr} $IG_SCRIPTS/plot_bcor.sh $sat $suffix '$plot_list'" >> $cmdfile
else
echo "$IG_SCRIPTS/plot_bcor.sh $sat $suffix '$plot_list'" >> $cmdfile
Expand All @@ -212,9 +213,13 @@ if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" ]]; then
$SUB --account ${ACCOUNT} -n $ctr -o ${logfile} -D . -J ${jobname} \
--time=2:00:00 --wrap "srun -l --multi-prog ${cmdfile}"

elif [[ $MY_MACHINE = "orion" ]]; then
$SUB --account ${ACCOUNT} -n $ctr -o ${logfile} -D . -J ${jobname} --time=2:00:00 \
-p ${SERVICE_PARTITION} --wrap "srun -l --multi-prog ${cmdfile}"

elif [[ $MY_MACHINE = "jet" ]]; then
$SUB --account ${ACCOUNT} -n $ctr -o ${logfile} -D . -J ${jobname} \
-p ${RADMON_PARTITION} --time=2:00:00 --wrap "srun -l --multi-prog ${cmdfile}"
-p ${SERVICE_PARTITION} --time=2:00:00 --wrap "srun -l --multi-prog ${cmdfile}"

elif [[ $MY_MACHINE = "wcoss2" ]]; then
$SUB -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${R_LOGDIR}/plot_bcor_${suffix}.err \
Expand Down Expand Up @@ -244,7 +249,8 @@ for sat in ${bigSATLIST}; do

ctr=0
for var in $plot_list; do
if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "jet" || $MY_MACHINE = "s4" ]]; then
if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "jet" ||
$MY_MACHINE = "s4" || $MY_MACHINE = "orion" ]]; then
echo "$ctr $IG_SCRIPTS/plot_bcor.sh $sat $var $var" >> $cmdfile
else
echo "$IG_SCRIPTS/plot_bcor.sh $sat $var $var" >> $cmdfile
Expand All @@ -264,6 +270,10 @@ for sat in ${bigSATLIST}; do
$SUB --account ${ACCOUNT} -n $ctr -o ${logfile} -D . -J ${jobname} \
--time=1:00:00 --wrap "srun -l --multi-prog ${cmdfile}"

elif [[ $MY_MACHINE = "orion" ]]; then
$SUB --account ${ACCOUNT} -n $ctr -o ${logfile} -D . -J ${jobname} --time=1:00:00 \
-p ${SERVICE_PARTITION} --wrap "srun -l --multi-prog ${cmdfile}"

elif [[ $MY_MACHINE = "jet" ]]; then
$SUB --account ${ACCOUNT} -n $ctr -o ${logfile} -D . -J ${jobname} \
-p ${RADMON_PARTITION} --time=1:00:00 --wrap "srun -l --multi-prog ${cmdfile}"
Expand Down

0 comments on commit 34d5331

Please sign in to comment.