Index: /issm/trunk-jpl/jenkins/windows-par
===================================================================
--- /issm/trunk-jpl/jenkins/windows-par	(revision 19397)
+++ /issm/trunk-jpl/jenkins/windows-par	(revision 19397)
@@ -0,0 +1,86 @@
+
+#-------------------------------#
+# 1: ISSM general configuration #
+#-------------------------------#
+
+#ISSM CONFIGURATION 
+ISSM_CONFIG='--prefix=$ISSM_DIR \
+	--with-vendor=MSVC-Win64  \
+   --disable-static \
+	--enable-standalone-libraries \
+	--with-fortran=no  \
+	--without-Gia \
+	--without-kriging \
+	--with-matlab-dir=""$ISSM_DIR/externalpackages/matlab/install"" \
+	--with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
+	--with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
+	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib/  \
+	--with-mpi-include="C:/Programs/MPICH2/include" \
+	--with-mpi-libflags="-Wl,mpi.lib -Wl,-L/cygdrive/c/Programs/MPICH2/lib" \
+	--enable-development \
+	--enable-debugging '
+
+#MATLAB path
+MATLAB_PATH="C:/MATLAB/R2013a/"
+
+#PYTHON and MATLAB testing
+MATLAB_TEST=1
+PYTHON_TEST=0
+
+#execution path used for parallel runs
+EXECUTION_PATH=$ISSM_DIR/execution
+
+#repo:
+REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
+
+#-----------------------------------#
+# 3: External packages installation #
+#-----------------------------------#
+
+#ISSM_EXTERNALPACKAGES can have 3 values:
+# - "install" install all external packages listed below
+# - "copy"    copy existing directories (EXTERNALPACKAGESDIR)
+# - "none"    leave external packages as is
+#             ->skip to section 4
+ISSM_EXTERNALPACKAGES="install"
+EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages
+
+#List of external pakages to be installed and their installation scripts
+EXTERNALPACKAGES="cccl        install-win7.sh
+						autotools   install-win.sh
+						cmake       install.sh                
+						petsc       install-3.5-win-par.sh
+						metis       install-4.0-win7.sh
+						triangle    install-win7.sh        
+						matlab      install.sh
+						shell2junit install.sh"
+
+#---------------------#
+# 4: ISSM Compilation #
+#---------------------#
+
+#ISSM_COMPILATION can have 2 values:
+# - "yes" compile ISSM
+# - "no"  do not compile ISSM
+ISSM_COMPILATION="yes"
+
+#------------------------#
+# 5: Nightly run options #
+#------------------------#
+
+#number of cpus used in ISSM installation and compilation (one is usually
+#safer as some packages are very sensitive to parallel compilation)
+NUMCPUS_INSTALL=8
+
+#number of cpus used in the nightly runs.
+NUMCPUS_RUN=1
+
+#Nightly run options. The matlab routine runme.m will be called
+#as follows: runme($MATLAB_NROPTIONS). The options must be understandable
+#by Matlab and runme.m
+#ex: "'id',[101 102 103]"
+
+#In Windows, we don't yet have MUMPS, can't do full stokes, so exclude all FS runs. Also exclude all runs with Dakota. And exclude higher order runs that have penalties. And 800+ tests because we don't want to have --with-development since we do the binaries with this version
+MATLAB_NROPTIONS="'exclude',[104, 124, 204, 211, 215, 220, 221, 285, 290, 308, 322, 404, 421, 422, 503, 507, 510, 511, 513, 701, 702, 703, 218, 234, 235, 412, 413, 414, 417, 418, 420, 205, 274, 331, 405, 409, 455, 612, 514, 435, 280,801,802,803,804,805,291,340,341]"
+PYTHON_NROPTIONS=""
Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 19396)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 19397)
@@ -293,5 +293,5 @@
                MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/export:mexFunction -Wl,/LD" 
 					MEXEXT=".mexw64"
-  				elif test $VENDOR = MSVC-Win64; then
+  				elif test $VENDOR = MSVC-Win64 || test $VENDOR = MSVC-Win64-par; then
   					MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
                MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/export:mexFunction -Wl,/LD" 
@@ -915,5 +915,5 @@
 			MPI_LIBDIR=`cygpath -m $MPI_LIBDIR`
 			MPI_INCLUDE=`cygpath -m $MPI_INCLUDE`
-		elif test x$VENDOR = xMSVC-Win64; then
+		elif test x$VENDOR = xMSVC-Win64 || test x$VENDOR = xMSVC-Win64-par; then
 			MPI_LIBDIR=`cygpath -m $MPI_LIBDIR`
 			MPI_INCLUDE=`cygpath -m $MPI_INCLUDE`
@@ -1026,5 +1026,5 @@
 	dnl }}}
 	dnl metis{{{
-	if test "$HAVE_PETSC" = "yes" && test "x$PETSC_MAJOR" = "x3" && test $PETSC_MINOR -ge 3 && test "x$VENDOR" != "xMSVC-Win64"; then
+	if test "$HAVE_PETSC" = "yes" && test "x$PETSC_MAJOR" = "x3" && test $PETSC_MINOR -ge 3 && test "x$VENDOR" != "xMSVC-Win64" && test "x$VENDOR" != "xMSVC-Win64-par"; then
 		dnl in petsc >=3.3, metis is provided
 		HAVE_METIS="yes"
