User: knarf Date: 2011/03/28 03:10 PM

Modified: /release-info/ run_tests

Log: update runscript

File Changes:

Directory: /release-info/ =========================

File [modified]: run_tests Delta lines: +17 -8 =================================================================== --- release-info/run_tests 2011-03-28 20:05:57 UTC (rev 466) +++ release-info/run_tests 2011-03-28 20:10:29 UTC (rev 467) @@ -1,11 +1,11 @@ #!/bin/bash # -# philip qsub -I -l nodes=1:ppn=8 -l walltime=01:00:00 -q workq -# queenbee qsub -I -l walltime=01:00:00 -l nodes=1:ppn=8 -A loni_numrel04 -q workq +# philip qsub -I -l nodes=1:ppn=8 -l walltime=02:00:00 -q workq +# queenbee qsub -I -l walltime=02:00:00 -l nodes=1:ppn=8 -A loni_numrel05 -q workq

set -e # Abort on errors

-cd ET_2010_11 +cd ET_2011_05

export CCTK_TESTSUITE_RUN_COMMAND="mpirun -np $nprocs $exe $parfile" hostname | grep ^philip && @@ -15,9 +15,18 @@ hostname | grep macbook-pro.local && export CCTK_TESTSUITE_RUN_COMMAND="openmpirun -np $nprocs $exe $parfile"

-export OMP_NUM_THREADS=1 -for i in 1 2; do - export CCTK_TESTSUITE_RUN_PROCESSORS=$i - make sim-testsuite PROMPT=no - mv TEST/sim/summary.log ../${HOSTNAME}__${i}.log +for i in 1 2 3; do + case $i in + 1 ) + export CCTK_TESTSUITE_RUN_PROCESSORS=1 + export OMP_NUM_THREADS=1;; + 2 ) + export CCTK_TESTSUITE_RUN_PROCESSORS=2 + export OMP_NUM_THREADS=1;; + 3 ) + export CCTK_TESTSUITE_RUN_PROCESSORS=1 + export OMP_NUM_THREADS=2;; + esac + echo make sim-testsuite PROMPT=no + echo mv TEST/sim/summary.log ../${HOSTNAME}__${CCTK_TESTSUITE_RUN_PROCESSORS}_${OMP_NUM_THREADS}.log done