Changeset 26923

Timestamp:

03/08/22 21:48:37 (3 years ago)

Author:

adhikari

Message:

CHG: provide the path to external packages in case these are installed elsewhere

Location:

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

Files:

• pfe.m (modified) (3 diffs)
• pfe.py (modified) (3 diffs)

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

@@ -19 +19 @@
                 processor      = 'ivy';
                 srcpath        = '';
+                extpkgpath     = '';
                 codepath       = '';
                 executionpath  = '';
@@ -52 +53 @@
                         disp(sprintf('    processor: %i',cluster.processor));
                         disp(sprintf('    srcpath: %s',cluster.srcpath));
+                        disp(sprintf('    extpkgpath: %s',cluster.extpkgpath));
                         disp(sprintf('    codepath: %s',cluster.codepath));
                         disp(sprintf('    executionpath: %s',cluster.executionpath));
@@ -173 +175 @@
                         fprintf(fid,'export MPI_GROUP_MAX=64\n\n');
                         fprintf(fid,'export ISSM_DIR="%s"\n',cluster.srcpath); %FIXME
+                        if cluster.extpkgpath
+                                fprintf(fid,'export ISSM_EXT_PKG="%s"\n',cluster.extpkgpath); 
+                        end
                         fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
                         fprintf(fid,'cd %s/%s/\n\n',cluster.executionpath,dirname);

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

@@ -36 +36 @@
         self.processor = 'ivy'
         self.srcpath = ''
+        self.extpkgpath = ''
         self.codepath = ''
         self.executionpath = ''
@@ -72 +73 @@
         s += '    processor: {}\n'.format(self.processor)
         s += '    srcpath: {}\n'.format(self.srcpath)
+        s += '    extpkgpath: {}\n'.format(self.extpkgpath)
         s += '    codepath: {}\n'.format(self.codepath)
         s += '    executionpath: {}\n'.format(self.executionpath)
@@ -177 +179 @@
         fid.write('export MPI_GROUP_MAX=64\n\n')
         fid.write('export ISSM_DIR="{}"\n'.format(self.srcpath)) # FIXME
+        if self.extpkgpath:
+            fid.write('export ISSM_EXT_PKG="{}"\n'.format(self.extpkgpath)) 
         fid.write('source $ISSM_DIR/etc/environment.sh\n') # FIXME
         fid.write('cd {}/{}/\n\n'.format(self.executionpath, dirname))