Changeset 25836 for issm/trunk/src/m/classes/clusters/pfe.py

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/clusters/pfe.py (modified) (5 diffs)

issm/trunk/src/m/classes/clusters/pfe.py ¶

@@ -31 +31 @@
         self.queue = 'long'
         self.time = 12 * 60
-        self.processor = 'wes'
+        self.processor = 'bro'
+        self.srcpath = ''
         self.codepath = ''
         self.executionpath = ''
@@ -61 +62 @@
         s = "%s\n%s" % (s, fielddisplay(self, 'np', 'number of CPUs'))
         s = "%s\n%s" % (s, fielddisplay(self, 'port', 'machine access port'))
-        s = "%s\n%s" % (s, fielddisplay(self, 'codepath', 'code path on the cluster'))
-        s = "%s\n%s" % (s, fielddisplay(self, 'executionpath', 'execution path on the cluster'))
         s = "%s\n%s" % (s, fielddisplay(self, 'queue', 'name of the queue'))
         s = "%s\n%s" % (s, fielddisplay(self, 'time', 'walltime requested'))
         s = "%s\n%s" % (s, fielddisplay(self, 'processor', 'type of processor'))
+        s = "%s\n%s" % (s, fielddisplay(self, 'codepath', '$ISSM_DIR on pfe'))
+        s = "%s\n%s" % (s, fielddisplay(self, 'executionpath', 'directory containing issm.exe on pfe'))
         s = "%s\n%s" % (s, fielddisplay(self, 'grouplist', 'name of the group'))
         s = "%s\n%s" % (s, fielddisplay(self, 'interactive', ''))
@@ -95 +96 @@
                     md = md.checkmessage('cpuspernode should be between 1 and 8 for ''neh'' and ''har'' processors')
 
-        elif self.processor == 'wes':
+        elif self.processor == 'bro':
             if self.hyperthreading:
-                if not 0 < self.cpuspernode < 25:
-                    md = md.checkmessage('cpuspernode should be between 1 and 24 for ''wes'' processors in hyperthreading mode')
+                if not 0 < self.cpuspernode < 57:
+                    md = md.checkmessage('cpuspernode should be between 1 and 56 for ''bro'' processors in hyperthreading mode')
             else:
-                if not 0 < self.cpuspernode < 13:
-                    md = md.checkmessage('cpuspernode should be between 1 and 12 for ''wes'' processors')
+                if not 0 < self.cpuspernode < 29:
+                    md = md.checkmessage('cpuspernode should be between 1 and 28 for ''bro'' processors')
 
         elif self.processor == 'ivy':
@@ -111 +112 @@
                     md = md.checkmessage('cpuspernode should be between 1 and 20 for ''ivy'' processors')
         else:
-            md = md.checkmessage('unknown processor type, should be ''neh'', ''wes'' or ''har'' or ''ivy''')
+            md = md.checkmessage('unknown processor type, should be ''neh'', ''bro'' or ''har'' or ''ivy''')
 
-    #Miscelaneous
+        #Miscellaneous
         if not self.login:
             md = md.checkmessage('login empty')
+        if not self.srcpath:
+            md = md.checkmessage('srcpath empty')
         if not self.codepath:
             md = md.checkmessage('codepath empty')
@@ -153 +156 @@
         fid.write('export PATH="$PATH:."\n\n')
         fid.write('export MPI_GROUP_MAX=64\n\n')
-        fid.write('export ISSM_DIR="%s/../ "\n' % self.codepath)
+        fid.write('export ISSM_DIR="%s"\n' % self.srcpath)
         fid.write('source $ISSM_DIR/etc/environment.sh\n')
+        fid.write('export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ISSM_DIR/externalpackages/petsc/install/lib"\n')
         fid.write('cd %s/%s/ \n\n' % (self.executionpath, dirname))
         fid.write('mpiexec - np %i %s/%s %s %s/%s %s\n' % (self.nprocs(), self.codepath, executable, str(solution), self.executionpath, dirname, modelname))