diff --git a/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh b/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh index 46e56e11..e02b9387 100755 --- a/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh +++ b/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh @@ -230,7 +230,7 @@ if [ -s $cnvstat -a -s $pgrbf00 -a -s $pgrbf06 ]; then rm -f ${logfile} fi - if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" ]]; then + if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" || $MY_MACHINE = "orion" ]]; then $SUB -A $ACCOUNT --ntasks=1 --time=00:30:00 \ -p ${SERVICE_PARTITION} -J ${jobname} -o $C_LOGDIR/DE.${PDY}.${CYC}.log \ ${HOMEgdas_conmon}/jobs/JGDAS_ATMOS_CONMON diff --git a/src/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh b/src/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh index c6053882..3c255c74 100755 --- a/src/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh +++ b/src/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh @@ -50,7 +50,7 @@ rm -f ${errfile} fi - if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" ]]; then + if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" || $MY_MACHINE = "orion" ]]; then ${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:20:00 \ -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${plot_hist} @@ -76,7 +76,7 @@ rm -f ${errfile} fi - if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" ]]; then + if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" || $MY_MACHINE = "orion" ]]; then ${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:20:00 \ -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${plot_horz} @@ -102,12 +102,14 @@ rm -f ${errfile} fi - if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" ]]; then + if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "s4" || \ + ${MY_MACHINE} = "jet" || ${MY_MACHINE} = "orion" ]]; then ${SUB} -A ${ACCOUNT} --ntasks=1 --time=01:30:00 \ -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${plot_horz_uv} - elif [[ $MY_MACHINE = "wcoss2" ]]; then - $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=30:00 -N ${jobname} \ + elif [[ ${MY_MACHINE} = "wcoss2" ]]; then + $SUB -V -q ${JOB_QUEUE} -A ${ACCOUNT} -o ${logfile} -e ${logfile} \ + -l walltime=30:00 -N ${jobname} \ -l select=1:mem=500M ${plot_horz_uv} fi diff --git a/src/Conventional_Monitor/image_gen/ush/mk_time_vert.sh b/src/Conventional_Monitor/image_gen/ush/mk_time_vert.sh index a233a9cb..691f6d1e 100755 --- a/src/Conventional_Monitor/image_gen/ush/mk_time_vert.sh +++ b/src/Conventional_Monitor/image_gen/ush/mk_time_vert.sh @@ -27,11 +27,12 @@ echo "--> mk_time_vert.sh" rm -f $errfile fi - if [[ $MY_MACHINE == "hera" || $MY_MACHINE == "s4" || $MY_MACHINE == "jet" ]]; then + if [[ ${MY_MACHINE} == "hera" || ${MY_MACHINE} == "s4" || \ + ${MY_MACHINE} == "jet" || ${MY_MACHINE} == "orion" ]]; then ${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:15:00 \ -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${pltfile} - elif [[ $MY_MACHINE = "wcoss2" ]]; then + elif [[ ${MY_MACHINE} = "wcoss2" ]]; then echo "submitting $jobname" $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=50:00 -N ${jobname} \ -l select=1:mem=200M ${pltfile} @@ -55,7 +56,8 @@ echo "--> mk_time_vert.sh" rm -f $errfile fi - if [[ $MY_MACHINE == "hera" || $MY_MACHINE == "s4" || $MY_MACHINE == "jet" ]]; then + if [[ ${MY_MACHINE} == "hera" || ${MY_MACHINE} == "s4" || \ + ${MY_MACHINE} == "jet" || ${MY_MACHINE} = "orion" ]]; then if [[ ${type} == "uv" || ${type} == "u" || ${type} == "v" ]]; then walltime="02:30:00" else @@ -65,7 +67,7 @@ echo "--> mk_time_vert.sh" ${SUB} -A ${ACCOUNT} --ntasks=1 --time=${walltime} \ -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${pltfile} - elif [[ $MY_MACHINE = "wcoss2" ]]; then + elif [[ ${MY_MACHINE} = "wcoss2" ]]; then if [[ ${type} == "uv" || ${type} == "u" || ${type} == "v" ]]; then walltime="01:30:00" else @@ -73,7 +75,7 @@ echo "--> mk_time_vert.sh" fi echo "submitting $jobname" - $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=${walltime}\ + $SUB -V -q ${JOB_QUEUE} -A ${ACCOUNT} -o ${logfile} -e ${logfile} -l walltime=${walltime}\ -N ${jobname} -l select=1:mem=200M ${pltfile} fi @@ -99,7 +101,8 @@ echo "--> mk_time_vert.sh" rm -f $errfile fi - if [[ $MY_MACHINE == "hera" || $MY_MACHINE == "s4" || $MY_MACHINE == "jet" ]]; then + if [[ ${MY_MACHINE} == "hera" || ${MY_MACHINE} == "s4" || \ + ${MY_MACHINE} == "jet" || ${MY_MACHINE} = "orion" ]]; then if [[ ${type} == "uv" || ${type} == "u" || ${type} == "v" ]]; then walltime="00:50:00" else @@ -109,9 +112,9 @@ echo "--> mk_time_vert.sh" ${SUB} -A ${ACCOUNT} --ntasks=1 --time=${walltime} \ -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${pltfile} - elif [[ $MY_MACHINE == "wcoss2" ]]; then + elif [[ ${MY_MACHINE} == "wcoss2" ]]; then echo "submitting $jobname" - $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=50:00 \ + ${SUB} -V -q ${JOB_QUEUE} -A ${ACCOUNT} -o ${logfile} -e ${logfile} -l walltime=50:00 \ -N ${jobname} -l select=1:mem=500M ${pltfile} fi