source: issm/oecreview/Archive/14312-15392/ISSM-14494-14495.diff

Last change on this file was 15393, checked in by Mathieu Morlighem, 12 years ago

NEW: adding Archive/14312-15392 for oecreview
File size: 2.4 KB
RevLine 
[15393]1Index: ../trunk-jpl/src/m/classes/clusters/pfe.m
2===================================================================
3--- ../trunk-jpl/src/m/classes/clusters/pfe.m (revision 14494)
4+++ ../trunk-jpl/src/m/classes/clusters/pfe.m (revision 14495)
5@@ -18,7 +18,7 @@
6 processor = 'neh';
7 codepath = '';
8 executionpath = '';
9- grouplist = 's1010';
10+ grouplist = 'g26209';
11 interactive = 0;
12 bbftp = 0;
13 numstreams = 8;
14@@ -117,8 +117,10 @@
15 fprintf(fid,'#PBS -o %s.outlog \n',modelname);
16 fprintf(fid,'#PBS -e %s.errlog \n\n',modelname);
17 fprintf(fid,'. /usr/share/modules/init/bash\n\n');
18- fprintf(fid,'module load comp-intel/11.1.046\n');
19- fprintf(fid,'module load mpi/mpt.1.25\n');
20+ %fprintf(fid,'module load comp-intel/11.1.046\n');
21+ %fprintf(fid,'module load mpi/mpt.1.25\n');
22+ fprintf(fid,'module load comp-intel/2011.2\n');
23+ fprintf(fid,'module load mpi-sgi/mpt.2.06rp16\n');
24 fprintf(fid,'module load math/intel_mkl_64_10.0.011\n\n');
25 fprintf(fid,'export PATH="$PATH:."\n\n');
26 fprintf(fid,'export MPI_GROUP_MAX=64\n\n');
27@@ -168,8 +170,8 @@
28 fprintf(fid,'#PBS -o %s.outlog \n',modelname);
29 fprintf(fid,'#PBS -e %s.errlog \n\n',modelname);
30 fprintf(fid,'. /usr/share/modules/init/bash\n\n');
31- fprintf(fid,'module load comp-intel/11.1.046\n');
32- fprintf(fid,'module load mpi/mpt.1.25\n');
33+ fprintf(fid,'module load comp-intel/2011.2\n');
34+ fprintf(fid,'module load mpi-sgi/mpt.2.06rp16\n');
35 fprintf(fid,'module load math/intel_mkl_64_10.0.011\n\n');
36 fprintf(fid,'export PATH="$PATH:."\n');
37 fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME
38Index: ../trunk-jpl/src/m/classes/clusters/discover.m
39===================================================================
40--- ../trunk-jpl/src/m/classes/clusters/discover.m (revision 14494)
41+++ ../trunk-jpl/src/m/classes/clusters/discover.m (revision 14495)
42@@ -64,7 +64,7 @@
43 QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,cluster.time)
44
45 if ( strcmpi(cluster.queue,'general') & cluster.cpuspernode*cluster.numnodes < 17)
46- md = checkmessage(md,'cpus must be great than 17 for general queue');
47+ md = checkmessage(md,'cpus must be greater than 17 for general queue');
48 end
49 %now, check cluster.cpuspernode according to processor type
50 if ( strcmpi(cluster.processor,'neha')),
Note: See TracBrowser for help on using the repository browser.