Skip to content

Commit 918f346

Browse files
Ref #28
Still more cleanup.
1 parent 2f3d435 commit 918f346

File tree

5 files changed

+21
-243
lines changed

5 files changed

+21
-243
lines changed

src/Conventional_Monitor/data_extract/ush/find_cycle.pl

-218
This file was deleted.

src/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh

+9-7
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@
5050
rm -f ${errfile}
5151
fi
5252

53-
if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" || $MY_MACHINE = "orion" ]]; then
53+
if [[ $MY_MACHINE == "hera" || $MY_MACHINE == "s4" || \
54+
$MY_MACHINE == "jet" || $MY_MACHINE == "orion" ]]; then
5455
${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:20:00 \
5556
-p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${plot_hist}
5657

57-
elif [[ $MY_MACHINE = "wcoss2" ]]; then
58+
elif [[ $MY_MACHINE == "wcoss2" ]]; then
5859
$SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=30:00 -N ${jobname} \
5960
-l select=1:mem=500M ${plot_hist}
6061
fi
@@ -76,11 +77,12 @@
7677
rm -f ${errfile}
7778
fi
7879

79-
if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" || $MY_MACHINE = "orion" ]]; then
80+
if [[ $MY_MACHINE == "hera" || $MY_MACHINE == "s4" || \
81+
$MY_MACHINE == "jet" || $MY_MACHINE == "orion" ]]; then
8082
${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:20:00 \
8183
-p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${plot_horz}
8284

83-
elif [[ $MY_MACHINE = "wcoss2" ]]; then
85+
elif [[ $MY_MACHINE == "wcoss2" ]]; then
8486
$SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=30:00 -N ${jobname} \
8587
-l select=1:mem=500M ${plot_horz}
8688
fi
@@ -102,12 +104,12 @@
102104
rm -f ${errfile}
103105
fi
104106

105-
if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "s4" || \
106-
${MY_MACHINE} = "jet" || ${MY_MACHINE} = "orion" ]]; then
107+
if [[ ${MY_MACHINE} == "hera" || ${MY_MACHINE} == "s4" || \
108+
${MY_MACHINE} == "jet" || ${MY_MACHINE} == "orion" ]]; then
107109
${SUB} -A ${ACCOUNT} --ntasks=1 --time=01:30:00 \
108110
-p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${plot_horz_uv}
109111

110-
elif [[ ${MY_MACHINE} = "wcoss2" ]]; then
112+
elif [[ ${MY_MACHINE} == "wcoss2" ]]; then
111113
$SUB -V -q ${JOB_QUEUE} -A ${ACCOUNT} -o ${logfile} -e ${logfile} \
112114
-l walltime=30:00 -N ${jobname} \
113115
-l select=1:mem=500M ${plot_horz_uv}

src/Conventional_Monitor/image_gen/ush/mk_time_vert.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ echo "--> mk_time_vert.sh"
3232
${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:15:00 \
3333
-p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${pltfile}
3434

35-
elif [[ ${MY_MACHINE} = "wcoss2" ]]; then
35+
elif [[ ${MY_MACHINE} == "wcoss2" ]]; then
3636
$SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=50:00 -N ${jobname} \
3737
-l select=1:mem=200M ${pltfile}
3838
fi
@@ -66,7 +66,7 @@ echo "--> mk_time_vert.sh"
6666
${SUB} -A ${ACCOUNT} --ntasks=1 --time=${walltime} \
6767
-p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${pltfile}
6868

69-
elif [[ ${MY_MACHINE} = "wcoss2" ]]; then
69+
elif [[ ${MY_MACHINE} == "wcoss2" ]]; then
7070
if [[ ${type} == "uv" || ${type} == "u" || ${type} == "v" ]]; then
7171
walltime="02:00:00"
7272
else

src/Conventional_Monitor/image_gen/ush/plot_time_ps.sh

-6
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66

77
echo "---> plot_time_ps.sh"
88

9-
echo "START_DATE = $START_DATE"
10-
echo "NUM_CYCLES = $NUM_CYCLES"
11-
echo "PDATE = $PDATE"
12-
echo "NDATE = $NDATE"
13-
149
workdir=${C_PLOT_WORKDIR}/plottime_ps
1510
if [[ -d ${workdir} ]]; then
1611
rm -rf ${workdir}
@@ -31,7 +26,6 @@
3126

3227
${NCP} ${C_IG_GSCRIPTS}/plotstas_time_count_ps.gs .
3328
${NCP} ${C_IG_GSCRIPTS}/plotstas_time_bias_ps.gs .
34-
# ${NCP} ${C_IG_GSCRIPTS}/plotstas_time_bias2_ps.gs .
3529

3630
#---------------------------------------------------
3731
# Link in the data files.

src/Conventional_Monitor/parm/ConMon_config

+10-10
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ export C_IMGNDIR=${TANKDIR}/imgn/${CONMON_SUFFIX}/${RUN}/conmon
3636
# MAIL_TO and MAIL_CC specifies the default
3737
# distribution for warning messages.
3838
#
39-
export DO_DATA_RPT=${DO_DATA_RPT:-1}
40-
41-
export MAIL_TO=${MAIL_TO:-"edward.safford@noaa.gov"}
42-
if [[ -e /u/${LOGNAME}/bin/get_cc_list.pl ]]; then
43-
cc_list=`/u/${LOGNAME}/bin/get_cc_list.pl --nr ${CONMON_SUFFIX}_${RUN} --mon ConMon`
44-
else
45-
cc_list=""
46-
fi
47-
MAIL_CC=""
48-
export MAIL_CC=${MAIL_CC:=${cc_list}}
39+
export DO_DATA_RPT=${DO_DATA_RPT:-1}
40+
41+
export MAIL_TO=${MAIL_TO:-"edward.safford@noaa.gov"}
42+
if [[ -e /u/${LOGNAME}/bin/get_cc_list.pl ]]; then
43+
cc_list=`/u/${LOGNAME}/bin/get_cc_list.pl --nr ${CONMON_SUFFIX}_${RUN} --mon ConMon`
44+
else
45+
cc_list=""
46+
fi
47+
MAIL_CC=""
48+
export MAIL_CC=${MAIL_CC:=${cc_list}}
4949

5050

5151
#---------------------------------------------------------------------

0 commit comments

Comments
 (0)