source: issm/oecreview/Archive/15392-16133/ISSM-15403-15404.diff@ 16134

Index: ../trunk-jpl/src/m/classes/clusters/cloud.m
===================================================================
--- ../trunk-jpl/src/m/classes/clusters/cloud.m (revision 15403)
+++ ../trunk-jpl/src/m/classes/clusters/cloud.m (revision 15404)
@@ -54,7 +54,7 @@
                        fprintf(fid,'#!/bin/bash\n');
                        if cluster.interactive
                                fprintf(fid,'source %s%s\n',cluster.codepath,'/../etc/environment.sh');
-                               fprintf(fid,'mpiexec -np %i -f /home/mpich2.hosts %s/issm.exe %s %s %s ',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                               fprintf(fid,'mpiexec -np %i -f /home/mpich2.hosts %s/issm.exe %s %s %s 2> %s.errlog > /dev/stdout | tee %s.outlog ',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
                        else
                                fprintf(fid,'source %s%s\n',cluster.codepath,'/../etc/environment.sh');
                                fprintf(fid,'mpiexec -np %i -f /home/mpich2.hosts %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
Index: ../trunk-jpl/src/m/classes/clusters/pfe.m
===================================================================
--- ../trunk-jpl/src/m/classes/clusters/pfe.m   (revision 15403)
+++ ../trunk-jpl/src/m/classes/clusters/pfe.m   (revision 15404)
@@ -18,7 +18,7 @@
                 processor      = 'neh';
                 codepath       = '';
                 executionpath  = '';
-                grouplist     = 's1010';
+                grouplist     = 'g26209';
                 interactive    = 0;
                 bbftp          = 0;
                 numstreams     = 8;
@@ -117,7 +117,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/2013.1.117\n');
+                        fprintf(fid,'module load comp-intel/2011.2\n');
+                        %fprintf(fid,'module load comp-intel/2013.1.117\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');