Index: ../trunk-jpl/src/m/classes/clusters/pfe.m =================================================================== --- ../trunk-jpl/src/m/classes/clusters/pfe.m (revision 14494) +++ ../trunk-jpl/src/m/classes/clusters/pfe.m (revision 14495) @@ -18,7 +18,7 @@ processor = 'neh'; codepath = ''; executionpath = ''; - grouplist = 's1010'; + grouplist = 'g26209'; interactive = 0; bbftp = 0; numstreams = 8; @@ -117,8 +117,10 @@ fprintf(fid,'#PBS -o %s.outlog \n',modelname); fprintf(fid,'#PBS -e %s.errlog \n\n',modelname); fprintf(fid,'. /usr/share/modules/init/bash\n\n'); - fprintf(fid,'module load comp-intel/11.1.046\n'); - fprintf(fid,'module load mpi/mpt.1.25\n'); + %fprintf(fid,'module load comp-intel/11.1.046\n'); + %fprintf(fid,'module load mpi/mpt.1.25\n'); + fprintf(fid,'module load comp-intel/2011.2\n'); + fprintf(fid,'module load mpi-sgi/mpt.2.06rp16\n'); fprintf(fid,'module load math/intel_mkl_64_10.0.011\n\n'); fprintf(fid,'export PATH="$PATH:."\n\n'); fprintf(fid,'export MPI_GROUP_MAX=64\n\n'); @@ -168,8 +170,8 @@ fprintf(fid,'#PBS -o %s.outlog \n',modelname); fprintf(fid,'#PBS -e %s.errlog \n\n',modelname); fprintf(fid,'. /usr/share/modules/init/bash\n\n'); - fprintf(fid,'module load comp-intel/11.1.046\n'); - fprintf(fid,'module load mpi/mpt.1.25\n'); + fprintf(fid,'module load comp-intel/2011.2\n'); + fprintf(fid,'module load mpi-sgi/mpt.2.06rp16\n'); fprintf(fid,'module load math/intel_mkl_64_10.0.011\n\n'); fprintf(fid,'export PATH="$PATH:."\n'); fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME Index: ../trunk-jpl/src/m/classes/clusters/discover.m =================================================================== --- ../trunk-jpl/src/m/classes/clusters/discover.m (revision 14494) +++ ../trunk-jpl/src/m/classes/clusters/discover.m (revision 14495) @@ -64,7 +64,7 @@ QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,cluster.time) if ( strcmpi(cluster.queue,'general') & cluster.cpuspernode*cluster.numnodes < 17) - md = checkmessage(md,'cpus must be great than 17 for general queue'); + md = checkmessage(md,'cpus must be greater than 17 for general queue'); end %now, check cluster.cpuspernode according to processor type if ( strcmpi(cluster.processor,'neha')),