Changeset 18305

Timestamp:

07/30/14 15:22:36 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: typo

Location:

issm/trunk-jpl/src/m/classes

Files:

• clusters/greenplanet.m (modified) (1 diff)
• clusters/pfe.m (modified) (1 diff)
• groundingline.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/clusters/greenplanet.m

@@ -87 +87 @@
                          fprintf(fid,'#PBS -o %s.outlog \n',modelname);
                          fprintf(fid,'#PBS -e %s.errlog \n\n',modelname);
-                         %fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
+                         fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME
+                         fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
+                         fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,modelname);
                          fprintf(fid,'mpiexec -np %i %s/kriging.exe %s %s\n',cluster.np,cluster.codepath,[cluster.executionpath '/' modelname],modelname);
                          if ~io_gather, %concatenate the output files:

issm/trunk-jpl/src/m/classes/clusters/pfe.m

@@ -129 +129 @@
                          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/11.1.046\n');
+                         fprintf(fid,'module load math/intel_mkl_64_10.0.011\n');
                          fprintf(fid,'module load mpi-sgi/mpt.2.06rp16\n');
                          fprintf(fid,'export PATH="$PATH:."\n\n');

issm/trunk-jpl/src/m/classes/groundingline.m

@@ -48 +48 @@
                                 pos=find(md.mask.groundedice_levelset>0.);
                                 if any(abs(md.geometry.base(pos)-md.geometry.bed(pos))>10^-10),
-                                        md = checkmessage(md,['baase not equal to bed on grounded ice!']);
+                                        md = checkmessage(md,['base not equal to bed on grounded ice!']);
                                 end
                                 if any(md.geometry.bed - md.geometry.base > 10^-9),