Skip to content

Commit cdc8972

Browse files
BrianCurtis-NOAABrianCurtis-NOAA
committed
fix bug in c6 adding itself to jobid's
1 parent 4bea902 commit cdc8972

9 files changed

Lines changed: 74 additions & 7 deletions

File tree

‎reg_tests/chgres_cube/driver.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,16 @@ submit_test() {
5959
-A "${PROJECT_CODE}" -q "${QUEUE}" -J "${jobname}" --open-mode=append ${exclusive_flag:+"${exclusive_flag}"} \
6060
${dep_flag_slurm:+"${dep_flag_slurm}"} -o "${logfile}" -e "${logfile}" "./${script}")
6161
jobid=${jobid%.*}
62+
jobid=${jobid%%;*}
6263
else
6364
echo "Error: Unsupported scheduler '${SCHEDULER}'"
6465
exit 1
6566
fi
67+
status=$?
68+
if [ $status -ne 0 ]; then
69+
echo "Error submitting job: $output"
70+
exit 1
71+
fi
6672
if [[ "${jobid}" == "" ]]; then
6773
echo "Error submitting job to slurm scheduler"
6874
exit 1

‎reg_tests/cpld_gridgen/rt.sh‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,11 @@ while read -r line || [ "$line" ]; do
209209
tests[$i]=$(sbatch --parsable --ntasks-per-node=${NTASKS} ${slurmflag:+"${slurmflag}"} --nodes=1 -t 00:${WLCLK}:00 -A $ACCOUNT -q $QUEUE -J $TEST_NAME \
210210
--partition=$PARTITION -o run_${TEST_NAME}.log -e run_${TEST_NAME}.log ./cpld_gridgen.sh "$TEST_NAME" "$ATMLIST")
211211
fi
212-
212+
status=$?
213+
if [ $status -ne 0 ]; then
214+
echo "Error submitting job: $output"
215+
exit 1
216+
fi
213217
all_tests=${all_tests}":"${tests[$i]%.*}
214218

215219
((i=i+1))
@@ -229,7 +233,11 @@ else
229233
--partition=$PARTITION --open-mode=append -q $QUEUE -d afterany${all_tests} ./rt.summary.sh) &
230234

231235
fi
232-
236+
status=$?
237+
if [ $status -ne 0 ]; then
238+
echo "Error submitting summary job: $output"
239+
exit 1
240+
fi
233241
sleep_time=0
234242
echo "Waiting for ${test_name^^} tests to complete..."
235243
while [ ! -f "summary.log" ]; do

‎reg_tests/global_cycle/driver.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,16 @@ submit_test() {
6363
${dep_flag_slurm:+"${dep_flag_slurm}"} -o "${logfile}" -e "${logfile}" "./${script}")
6464

6565
jobid=${jobid%.*}
66+
jobid=${jobid%%;*}
6667
else
6768
echo "Error: Unsupported scheduler '${SCHEDULER}'"
6869
exit 1
6970
fi
71+
status=$?
72+
if [ $status -ne 0 ]; then
73+
echo "Error submitting job: $output"
74+
exit 1
75+
fi
7076
if [[ "${jobid}" == "" ]]; then
7177
echo "Error submitting job to slurm scheduler"
7278
exit 1

‎reg_tests/grid_gen/driver.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ submit_test() {
6565
--export=ALL,OMP_NUM_THREADS=${OMP_NUM_THREADS} ${dep_flag_slurm:+"${dep_flag_slurm}"} \
6666
-o "${logfile}" -e "${logfile}" "./${script}")
6767
jobid=${jobid%.*}
68+
jobid=${jobid%%;*}
6869
else
6970
echo "Error: Unsupported scheduler '${SCHEDULER}'"
7071
exit 1
@@ -190,6 +191,11 @@ else
190191
echo "Error: Unsupported scheduler '${SCHEDULER}'"
191192
exit 1
192193
fi
194+
status=$?
195+
if [ $status -ne 0 ]; then
196+
echo "Error submitting job: $output"
197+
exit 1
198+
fi
193199

194200
sleep_time=0
195201
echo "Waiting for ${test_name^^} tests to complete..."

‎reg_tests/ice_blend/driver.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,16 @@ submit_test() {
6060
-A "${PROJECT_CODE}" -q "${QUEUE}" -J "${jobname}" --open-mode=append ${exclusive_flag:+"${exclusive_flag}"} \
6161
${dep_flag_slurm:+"${dep_flag_slurm}"} -o "${logfile}" -e "${logfile}" "./${script}")
6262
jobid=${jobid%.*}
63+
jobid=${jobid%%;*}
6364
else
6465
echo "Error: Unsupported scheduler '${SCHEDULER}'"
6566
exit 1
6667
fi
68+
status=$?
69+
if [ $status -ne 0 ]; then
70+
echo "Error submitting job: $output"
71+
exit 1
72+
fi
6773
if [[ "${jobid}" == "" ]]; then
6874
echo "Error submitting job to slurm scheduler"
6975
exit 1

‎reg_tests/ocnice_prep/rt.sh‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ case ${MACHINE_ID,,} in
8686
WLCLK=10
8787
export NCCMP=nccmp
8888
PARTITION='batch'
89+
MEM_GAEA=0
8990
;;
9091
hercules)
9192
WLCLK=10
@@ -225,6 +226,9 @@ while read -r line || [ "$line" ]; do
225226

226227
if [[ ${MACHINE_ID} = gaeac6 ]]; then
227228
slurmflag="--clusters=c6"
229+
SLURM_MEM=${MEM_GAEA}
230+
else
231+
SLURM_MEM=24g
228232
fi
229233

230234
if [[ ${MACHINE_ID} = wcoss2 ]]; then
@@ -234,19 +238,28 @@ while read -r line || [ "$line" ]; do
234238

235239
else
236240

237-
tests[$i]=$(sbatch --parsable --ntasks-per-node=1 --nodes=1 ${slurmflag:+"${slurmflag}"} --mem=24g -t 00:${WLCLK}:00 -A $ACCOUNT -q $QUEUE -J $TEST_NAME \
241+
tests[$i]=$(sbatch --parsable --ntasks-per-node=1 --nodes=1 ${slurmflag:+"${slurmflag}"} --mem=${SLURM_MEM} -t 00:${WLCLK}:00 -A $ACCOUNT -q $QUEUE -J $TEST_NAME \
238242
-p $PARTITION -o run_${TEST_NAME}.log -e run_${TEST_NAME}.log ./ocnice_prep.sh "$TEST_NAME")
239243

240244
fi
241-
245+
status=$?
246+
if [ $status -ne 0 ]; then
247+
echo "Error submitting job: $output"
248+
exit 1
249+
fi
242250
all_tests=${all_tests}":"${tests[$i]%.*}
243251

244252
((i=i+1))
245253

246254
done <$TESTS_FILE
247255

248256
export target=${MACHINE_ID,,}
249-
257+
if [[ ${MACHINE_ID} = gaeac6 ]]; then
258+
slurmflag="--clusters=c6"
259+
SLURM_MEM=${MEM_GAEA}
260+
else
261+
SLURM_MEM=25m
262+
fi
250263
if [[ ${MACHINE_ID} = wcoss2 ]]; then
251264

252265
(qsub -V -o /dev/null -e /dev/null -q $QUEUE -A $ACCOUNT -l walltime=00:01:00 \
@@ -255,11 +268,15 @@ if [[ ${MACHINE_ID} = wcoss2 ]]; then
255268

256269
else
257270

258-
(sbatch --ntasks=1 --mem=25m -t 0:01:00 -A $ACCOUNT ${slurmflag:+"${slurmflag}"} -J summary -o /dev/null -e /dev/null \
271+
(sbatch --ntasks=1 --mem=${SLURM_MEM} -t 0:01:00 -A $ACCOUNT ${slurmflag:+"${slurmflag}"} -J summary -o /dev/null -e /dev/null \
259272
-p $PARTITION --open-mode=append -q $QUEUE -d afterok${all_tests} ./rt.summary.sh) &
260273

261274
fi
262-
275+
status=$?
276+
if [ $status -ne 0 ]; then
277+
echo "Error submitting job: $output"
278+
exit 1
279+
fi
263280
sleep_time=0
264281
echo "Waiting for ${test_name^^} testing to complete..."
265282
while [ ! -f "summary.log" ]; do

‎reg_tests/regrid_sfc/driver.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,16 @@ submit_test() {
6363
-A "${PROJECT_CODE}" -q "${QUEUE}" -J "${jobname}" --open-mode=append ${exclusive_flag:+"${exclusive_flag}"} \
6464
${dep_flag_slurm:+"${dep_flag_slurm}"} -o "${logfile}" -e "${logfile}" "./${script}")
6565
jobid=${jobid%.*}
66+
jobid=${jobid%%;*}
6667
else
6768
echo "Error: Unsupported scheduler '${SCHEDULER}'"
6869
exit 1
6970
fi
71+
status=$?
72+
if [ $status -ne 0 ]; then
73+
echo "Error submitting job: $output"
74+
exit 1
75+
fi
7076
if [[ "${jobid}" == "" ]]; then
7177
echo "Error submitting job to slurm scheduler"
7278
exit 1

‎reg_tests/snow2mdl/driver.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,16 @@ submit_test() {
6262
-A "${PROJECT_CODE}" -q "${QUEUE}" -J "${jobname}" --open-mode=append ${exclusive_flag:+"${exclusive_flag}"} \
6363
${dep_flag_slurm:+"${dep_flag_slurm}"} -o "${logfile}" -e "${logfile}" "./${script}")
6464
jobid=${jobid%.*}
65+
jobid=${jobid%%;*}
6566
else
6667
echo "Error: Unsupported scheduler '${SCHEDULER}'"
6768
exit 1
6869
fi
70+
status=$?
71+
if [ $status -ne 0 ]; then
72+
echo "Error submitting job: $output"
73+
exit 1
74+
fi
6975
if [[ "${jobid}" == "" ]]; then
7076
echo "Error submitting job to slurm scheduler"
7177
exit 1

‎reg_tests/weight_gen/driver.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,16 @@ submit_test() {
6262
-A "${PROJECT_CODE}" -q "${QUEUE}" -J "${jobname}" --open-mode=append ${exclusive_flag:+"${exclusive_flag}"} \
6363
${dep_flag_slurm:+"${dep_flag_slurm}"} -o "${logfile}" -e "${logfile}" "./${script}")
6464
jobid=${jobid%.*}
65+
jobid=${jobid%%;*}
6566
else
6667
echo "Error: Unsupported scheduler '${SCHEDULER}'"
6768
exit 1
6869
fi
70+
status=$?
71+
if [ $status -ne 0 ]; then
72+
echo "Error submitting job: $jobid"
73+
exit 1
74+
fi
6975
if [[ "${jobid}" == "" ]]; then
7076
echo "Error submitting job to slurm scheduler"
7177
exit 1

0 commit comments

Comments
 (0)