Index: /issm/trunk-jpl/externalpackages/petsc/install-3.6-discover.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.6-discover.sh	(revision 21766)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.6-discover.sh	(revision 21767)
@@ -42,5 +42,5 @@
 #SBATCH -N 1
 #SBATCH -n 1
-#SBATCH -A s1010
+#SBATCH -A s1690
 #SBATCH -t 00:01:00 # Run time (hh:mm:ss) - 1.5 hours
 #SBATCH --qos=debug
@@ -51,4 +51,5 @@
 module load comp/intel-15.0.0.090
 module load mpi/impi-4.0.3.008
+module load other/cmake-3.8.2
 
 export PATH="$PATH:."
Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 21766)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 21767)
@@ -1320,9 +1320,5 @@
 	dnl scalapack headers and libraries
 	if test "x$HAVE_SCALAPACK" == "xyes"; then
-		if test x$VENDOR = xintel-discover; then
-		 SCALAPACKLIB=-L"$SCALAPACK_ROOT/ -lmkl_scalapack_lp64"
-		else
-		 SCALAPACKLIB=-L"$SCALAPACK_ROOT/ -lscalapack"
-		fi
+		SCALAPACKLIB=-L"$SCALAPACK_ROOT/ -lscalapack"
 		AC_DEFINE([_HAVE_SCALAPACK_],[1],[with Scalapack in ISSM src])
 		AC_SUBST([SCALAPACKLIB])
@@ -1349,23 +1345,16 @@
 	if test "x$HAVE_BLASLAPACK" == "xyes"; then
 		BLASLAPACKINCL=""
-		if test x$VENDOR = xintel-discover; then
-		   dnl works for intel 11
-			dnl BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lmkl_lapack -lmkl -lguide -lpthread "
-			dnl dnl works for intel 13
-			BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lmkl_lapack95_lp64 -lmkl_rt " 
-		else
-			dnl: branch on whether we are running on windows or linux.
-			case "${host_os}" in
-				*cygwin*)
-				BLASLAPACKLIB="-L`cygpath -m $BLASLAPACK_ROOT` -Wl,libf2cblas.lib  -Wl,libf2clapack.lib"
-				;;
-				*linux*)
-				BLASLAPACKLIB=-L"$BLASLAPACK_ROOT/lib -lflapack -lfblas " 
-				;;
-				*darwin*)
-				BLASLAPACKLIB=-L"$BLASLAPACK_ROOT/lib -lflapack -lfblas " 
-				;;
-			esac
-		fi
+		dnl: branch on whether we are running on windows or linux.
+		case "${host_os}" in
+		*cygwin*)
+		  BLASLAPACKLIB="-L`cygpath -m $BLASLAPACK_ROOT` -Wl,libf2cblas.lib  -Wl,libf2clapack.lib"
+		  ;;
+		*linux*)
+		  BLASLAPACKLIB=-L"$BLASLAPACK_ROOT/lib -lflapack -lfblas " 
+		  ;;
+		*darwin*)
+		  BLASLAPACKLIB=-L"$BLASLAPACK_ROOT/lib -lflapack -lfblas " 
+		  ;;
+		esac
 		AC_DEFINE([_HAVE_BLASLAPACK_],[1],[with blas lapack in ISSM src])
 		AC_SUBST([BLASLAPACKLIB])
@@ -1472,9 +1461,5 @@
 	if test "x$HAVE_BLACS" == "xyes"; then
 		BLACSINCL=""
-		if test x$VENDOR = xintel-discover; then
-		 BLACSLIB=-L"$BLACS_ROOT/ -lmkl_blacs_intelmpi_lp64"
-		else
-		 BLACSLIB=-L"$BLACS_ROOT/ -lblacs"
-		fi
+		BLACSLIB=-L"$BLACS_ROOT/ -lblacs"
 		AC_DEFINE([_HAVE_BLACS_],[1],[with Blacs in ISSM src])
 		AC_SUBST([BLACSINCL])
Index: /issm/trunk-jpl/src/m/classes/clusters/discover.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/clusters/discover.m	(revision 21766)
+++ /issm/trunk-jpl/src/m/classes/clusters/discover.m	(revision 21767)
@@ -90,5 +90,5 @@
 		 end
 		 %}}}
-		 function BuildQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof,isdakota,ioceancoupling) % {{{
+		 function BuildQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof,isdakota,isoceancoupling) % {{{
 
 			 if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
@@ -116,5 +116,5 @@
 			 fprintf(fid,'#SBATCH -N %i \n',cluster.numnodes);
 			 fprintf(fid,'#SBATCH -t %02i:%02i:00 \n',floor(cluster.time/3600),floor(mod(cluster.time,3600)/60));
-			 fprintf(fid,'#SBATCH -A s1010 \n\n');
+			 fprintf(fid,'#SBATCH -A s1690 \n\n');
 			 for i=1:numel(cluster.modules),
 				 fprintf(fid,['module load ' cluster.modules{i} '\n']);
@@ -127,4 +127,5 @@
 			 fprintf(fid,'module load comp/intel-15.0.0.090\n');
 			 fprintf(fid,'module load mpi/impi-4.0.3.008\n');
+			 fprintf(fid,'module load other/cmake-3.8.2\n');
 			 fprintf(fid,'export PATH="$PATH:."\n\n');
 			 fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME