Changeset 19416

Timestamp:

06/18/15 15:01:31 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: modules are now a dynamic field of pfe

File:

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

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

@@ -11 +11 @@
                  name           = 'pfe'
                  login          = '';
+                 modules        = {'comp-intel/2015.0.090' 'mpi-sgi/mpt.2.12r16'};
                  numnodes       = 20;
                  cpuspernode    = 8;
@@ -44 +45 @@
                          disp(sprintf('    name: %s',cluster.name));
                          disp(sprintf('    login: %s',cluster.login));
+                         disp(sprintf('    modules: %s',cluster.modules));
                          disp(sprintf('    port: %i',cluster.port));
                          disp(sprintf('    numnodes: %i',cluster.numnodes));
@@ -129 +131 @@
                          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/2015.0.090\n');
-                         fprintf(fid,'module load mpi-sgi/mpt.2.11r13\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');
@@ -183 +186 @@
                          fprintf(fid,'#PBS -e %s.errlog \n\n',modelname);
                          fprintf(fid,'. /usr/share/modules/init/bash\n\n');
-                         fprintf(fid,'module load comp-intel/2015.0.090\n');
-                         fprintf(fid,'module load mpi-sgi/mpt.2.11r13\n');
+                         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