Index: /issm/trunk-jpl/src/m/classes/clusters/discover.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/clusters/discover.m	(revision 22002)
+++ /issm/trunk-jpl/src/m/classes/clusters/discover.m	(revision 22003)
@@ -125,7 +125,9 @@
 			 end
 			 fprintf(fid,'. /usr/share/modules/init/bash\n\n');
-			 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 comp/intel-16.0.2.181\n');
+			 fprintf(fid,'module load mpi/impi-5.1.3.181\n');
 			 fprintf(fid,'module load other/cmake-3.8.2\n');
+			 fprintf(fid,'export MPI_GROUP_MAX=64\n\n');
+			 fprintf(fid,'export MPI_UNBUFFERED_STDIO=true\n\n');
 			 fprintf(fid,'export PATH="$PATH:."\n\n');
 			 fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME