Changeset 23109

Timestamp:

08/17/18 11:54:33 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not hard code modules

File:

• issm/trunk-jpl/src/m/classes/clusters/pfe.m (modified) (4 diffs)

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

@@ -163 +163 @@
                          fprintf(fid,'#PBS -e %s.errlog \n\n',[cluster.executionpath '/' dirname '/' modelname]);
                          fprintf(fid,'. /usr/share/modules/init/bash\n\n');
-                         fprintf(fid,'module load comp-intel/2016.2.181\n');
-                         fprintf(fid,'module load mpi-sgi/mpt\n');
+                         for i=1:numel(cluster.modules), fprintf(fid,['module load ' cluster.modules{i} '\n']); end
                          fprintf(fid,'export PATH="$PATH:."\n\n');
                          fprintf(fid,'export MPI_GROUP_MAX=64\n\n');
@@ -226 +225 @@
                          fprintf(fid,'#PBS -e %s.errlog \n\n',[cluster.executionpath '/' dirname '/' modelname]);
                          fprintf(fid,'. /usr/share/modules/init/bash\n\n');
-                         fprintf(fid,'module load comp-intel/2016.2.181\n');
-                         fprintf(fid,'module load mpi-sgi/mpt\n');
+                         for i=1:numel(cluster.modules), fprintf(fid,['module load ' cluster.modules{i} '\n']); end
                          fprintf(fid,'export PATH="$PATH:."\n\n');
                          fprintf(fid,'export MPI_GROUP_MAX=64\n\n');
@@ -308 +306 @@
                          fprintf(fid,'#PBS -e %s.errlog \n\n',modelname);
                          fprintf(fid,'. /usr/share/modules/init/bash\n\n');
-                         for i=1:numel(cluster.modules),
-                                 fprintf(fid,['module load ' cluster.modules{i} '\n']);
-                         end
+                         for i=1:numel(cluster.modules), fprintf(fid,['module load ' cluster.modules{i} '\n']); end
                          fprintf(fid,'export PATH="$PATH:."\n');
                          fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME
@@ -353 +349 @@
                          fprintf(fid,'#PBS -e %s.errlog \n\n',modelname);
                          fprintf(fid,'. /usr/share/modules/init/bash\n\n');
+                         %for i=1:numel(cluster.modules), fprintf(fid,['module load ' cluster.modules{i} '\n']); end %FIXME: should use this!
                          fprintf(fid,'module load comp-intel/2016.2.181\n');
                          fprintf(fid,'module load netcdf/4.4.1.1_mpt\n');