Merge pull request #93 from Katetc/master

Changes required for nightly cdash to work with new Hobart and Nag 6.1
ESMCI · Aug 12, 2016 · 1fe2631 · 1fe2631
2 parents 81f373f + 4d798ad
commit 1fe2631
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ctest/runcdash-cgd-nag.sh b/ctest/runcdash-cgd-nag.sh
@@ -8,16 +8,16 @@ else
 fi
 
 module purge
-module load compiler/nag/6.0
-module load tool/parallel-netcdf/1.6.1/nag/openmpi
+module load compiler/nag/6.1
+module load tool/parallel-netcdf/1.7.0/nag/mvapich2
 
 export CC=mpicc
 export FC=mpif90
 export PIO_DASHBOARD_SITE="cgd"
 export PIO_DASHBOARD_ROOT=/scratch/cluster/katec/dashboard
 export CTEST_SCRIPT_DIRECTORY=${PIO_DASHBOARD_ROOT}/src
 export PIO_DASHBOARD_SOURCE_DIR=${CTEST_SCRIPT_DIRECTORY}
-export PIO_COMPILER_ID=Nag-6.0-gcc-`gcc --version | head -n 1 | cut -d' ' -f3`
+export PIO_COMPILER_ID=Nag-6.1-gcc-`gcc --version | head -n 1 | cut -d' ' -f3`
 
 if [ ! -d "$PIO_DASHBOARD_ROOT" ]; then
   mkdir "$PIO_DASHBOARD_ROOT"

diff --git a/ctest/runctest-cgd.sh b/ctest/runctest-cgd.sh
@@ -29,7 +29,7 @@ echo "\$CTESTCMD -S ${scrdir}/CTestScript-Test.cmake,${model} -V" >> runctest.sh
 chmod +x runctest.sh
 
 # Submit the job to the queue
-jobid=`/usr/local/bin/qsub -l nodes=1:ppn=4 runctest.sh`
+jobid=`/usr/local/bin/qsub -l nodes=1:ppn=4 runctest.sh -q short`
 
 # Wait for the job to complete before exiting
 while true; do