Index: sm/trunk-jpl/jenkins/macosx_pine-island_dakota
===================================================================
--- /issm/trunk-jpl/jenkins/macosx_pine-island_dakota	(revision 24659)
+++ 	(revision )
@@ -1,78 +1,0 @@
-#-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-# MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2015b.app"
-
-# ISSM CONFIGURATION
-ISSM_CONFIG='\
-	--prefix=$ISSM_DIR \
-	--with-matlab-dir=$MATLAB_PATH \
-	--with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \
-	--with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \
-	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-	--with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
-	--with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
-	--with-semic-dir=$ISSM_DIR/externalpackages/semic/install \
-	--with-boost-dir=$ISSM_DIR/externalpackages/boost/install \
-	--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
-	--with-cxxoptflags="-std=c++11" \
-	--with-numthreads=4 \
-	--enable-debugging \
-	--enable-development'
-
-# Test suites
-MATLAB_TEST=1
-PYTHON_TEST=1
-JAVASCRIPT_TEST=0
-EXAMPLES_TEST=0
-
-#-----------------------------------#
-# 3: External packages installation #
-#-----------------------------------#
-
-#List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="
-	autotools	install.sh
-	cmake		install.sh
-	mpich		install-3.3.sh
-	petsc		install-3.7-mac.sh
-	triangle	install-mac.sh
-	chaco		install.sh
-	m1qn3		install.sh
-	semic		install.sh
-	boost		install-1.55-macosx-el_capitan.sh
-	dakota		install-6.2-macosx64.sh
-	shell2junit	install.sh
-"
-
-#-----------------#
-# 4: test options #
-#-----------------#
-
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-# 		compilation
-#
-NUMCPUS_INSTALL=4
-
-# Number of CPUs used in the nightly runs
-NUMCPUS_RUN=2
-
-# Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information
-#
-# NOTE:
-#	- Errors are large for 418, 420
-#
-PYTHON_NROPTIONS="--exclude 119 243 514 701 702 703 234 235 418 420 --include_name 'Dakota'"
-MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,703,234,235,418,420],'id',[IdFromString('Dakota')]"
Index: /issm/trunk-jpl/jenkins/pine_island-mac-dakota
===================================================================
--- /issm/trunk-jpl/jenkins/pine_island-mac-dakota	(revision 24659)
+++ /issm/trunk-jpl/jenkins/pine_island-mac-dakota	(revision 24660)
@@ -68,13 +68,14 @@
 
 # Number of CPUs used in the nightly runs
-NUMCPUS_RUN=2
+NUMCPUS_RUN=1
 
 # Nightly run options
 #
-# See documentation in test/NightlyRun/runme.* for more information
+# See documentation in test/NightlyRun/runme.* for more information.
 #
 # NOTE:
-#	- Errors are large for 418, 420
+# - See test418.py for reason why it is excluded for now.
+# - Error is large for test420.
 #
-PYTHON_NROPTIONS="--exclude 119 243 514 701 702 703 234 235 418 420 --include_name 'Dakota'"
-MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,703,234,235,418,420],'id',[IdFromString('Dakota')]"
+MATLAB_NROPTIONS="'exclude',[243,420,435,701,702],'id',[IdFromString('Dakota')]"
+PYTHON_NROPTIONS="--exclude 243 418 420 435 701 702 --include_name 'Dakota'"