Index: ../trunk-jpl/externalpackages/gslib/install.sh
===================================================================
--- ../trunk-jpl/externalpackages/gslib/install.sh	(revision 18977)
+++ ../trunk-jpl/externalpackages/gslib/install.sh	(revision 18978)
@@ -17,8 +17,8 @@
 
 #Change compiler to gfortran
 cd install
-cat Makefile | sed -e "s/FC=g95/FC=gfortran/g" > Makefile.bak
+cat Makefile | sed -e "s/FC=g95/FC=ifort/g" > Makefile.bak
 mv Makefile.bak Makefile
-cat gslib/Makefile | sed -e "s/FC=g95/FC=gfortran/g" > Makefile.bak
+cat gslib/Makefile | sed -e "s/FC=g95/FC=ifort/g" > Makefile.bak
 mv Makefile.bak gslib/Makefile
 make 
Index: ../trunk-jpl/src/c/solutionsequences/solutionsequence_fct.cpp
===================================================================
--- ../trunk-jpl/src/c/solutionsequences/solutionsequence_fct.cpp	(revision 18977)
+++ ../trunk-jpl/src/c/solutionsequences/solutionsequence_fct.cpp	(revision 18978)
@@ -43,10 +43,10 @@
 		for(int j=0; j<ncols; j++) {
 			_assert_(cols[j]==cols2[j]);
 			d = max(max(-vals[j],-vals2[j]),0.);
-			MatSetValue(D,row,cols[j],(const double)d,INSERT_VALUES);
+			MatSetValue(D,row,cols[j],d,INSERT_VALUES);
 			if(cols[j]!=row) diagD -= d;
 		}
-		MatSetValue(D,row,row,(const double)diagD,INSERT_VALUES);
+		MatSetValue(D,row,row,diagD,INSERT_VALUES);
 		MatRestoreRow(K       ,row,&ncols, (const int**)&cols, (const double**)&vals);
 		MatRestoreRow(K_transp,row,&ncols2,(const int**)&cols2,(const double**)&vals2);
 	}
@@ -87,7 +87,7 @@
 				d += mi;
 			}
 			if(fabs(d)>dmax) dmax = fabs(d);
-			MatSetValue(LHS,row,cols[j],(const double)d,INSERT_VALUES);
+			MatSetValue(LHS,row,cols[j],d,INSERT_VALUES);
 		}
 		MatRestoreRow(K,row,&ncols, (const int**)&cols, (const double**)&vals);
 		MatRestoreRow(D,row,&ncols2,(const int**)&cols2,(const double**)&vals2);
@@ -106,7 +106,7 @@
 		if(constraint->InAnalysis(configuration_type)){
 			constraint->PenaltyDofAndValue(&dof,&d,femmodel->nodes,femmodel->parameters);
 			if(dof!=-1){
-				MatSetValue(LHS,dof,dof,(const double)dmax,INSERT_VALUES);
+				MatSetValue(LHS,dof,dof,dmax,INSERT_VALUES);
 			}
 		}
 	}
@@ -255,10 +255,10 @@
 		_assert_(Qi_minus <= 0.);
 		d = 1.;
 		if(Pi_plus!=0.) d = min(1.,Qi_plus/Pi_plus);
-		VecSetValue(Ri_plus,row,(const double)d,INSERT_VALUES);
+		VecSetValue(Ri_plus,row,d,INSERT_VALUES);
 		d = 1.;
 		if(Pi_minus!=0.) d = min(1.,Qi_minus/Pi_minus);
-		VecSetValue(Ri_minus,row,(const double)d,INSERT_VALUES);
+		VecSetValue(Ri_minus,row,d,INSERT_VALUES);
 
 		MatRestoreRow(Mc,row,&ncols, (const int**)&cols, (const double**)&vals);
 		MatRestoreRow(D ,row,&ncols2,(const int**)&cols2,(const double**)&vals2);
@@ -310,7 +310,7 @@
 				d += min(Ri_minus[row],Ri_plus[cols[j]]) * f_ij;
 			}
 		}
-		VecSetValue(Fbar,row,(const double)d,INSERT_VALUES);
+		VecSetValue(Fbar,row,d,INSERT_VALUES);
 		MatRestoreRow(Mc,row,&ncols, (const int**)&cols, (const double**)&vals);
 		MatRestoreRow(D ,row,&ncols2,(const int**)&cols2,(const double**)&vals2);
 	}
Index: ../trunk-jpl/configs/config-linux64-pleiades-intel2015.0.090-mpt.2.11r13.sh
===================================================================
--- ../trunk-jpl/configs/config-linux64-pleiades-intel2015.0.090-mpt.2.11r13.sh	(revision 18977)
+++ ../trunk-jpl/configs/config-linux64-pleiades-intel2015.0.090-mpt.2.11r13.sh	(revision 18978)
@@ -2,7 +2,7 @@
 ./configure \
 	--prefix=$ISSM_DIR \
 	--without-kriging \
-	--with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \
+	--with-wrappers=no \
 	--with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
 	--with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
 	--with-mpi-include="/nasa/sgi/mpt/2.11r13/include" \
@@ -11,7 +11,5 @@
 	--with-metis-dir="$ISSM_DIR/externalpackages/petsc/install" \
 	--with-mumps-dir="$ISSM_DIR/externalpackages/petsc/install" \
 	--with-scalapack-dir="$ISSM_DIR/externalpackages/petsc/install" \
-	--with-hypre-dir="$ISSM_DIR/externalpackages/petsc/install" \
-	--with-graphics-lib="/usr/lib64/libX11.so" \
-	--with-cxxoptflags="-g -O2" \
+	--with-cxxoptflags="-O3 -axAVX" \
 	--with-vendor="intel-pleiades"
