Changeset 19164

Timestamp:

02/26/15 12:05:43 (10 years ago)

Author:

bdef

Message:

BUG:fix for pleiade launch

Location:

issm/trunk-jpl/src/m

Files:

• classes/clusters/pfe.py (modified) (3 diffs)
• solve/solve.py (modified) (1 diff)

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

@@ -44 +44 @@
                 self.hyperthreading = 0
 
-                self.np=self.numnodes*self.cpuspernode;
-                
                 #use provided options to change fields
                 options=pairoptions(*args)
@@ -51 +49 @@
                 #initialize cluster using user settings if provided
                 self=pfe_settings(self)
-
+                self.np=20*8
                 #OK get other fields
                 self=options.AssignObjectFields(self)
@@ -134 +132 @@
                 # {{{
 
+                self.np=self.numnodes*self.cpuspernode;
                 #write queuing script 
                 fid=open(modelname+'.queue','w')

issm/trunk-jpl/src/m/solve/solve.py

@@ -61 +61 @@
 
         #First, build a runtime name that is unique
-        c=datetime.datetime.now()
-        md.private.runtimename="%s-%02i-%02i-%04i-%02i-%02i-%02i-%i" % (md.miscellaneous.name,c.month,c.day,c.year,c.hour,c.minute,c.second,os.getpid())
-
+        if options.getfieldvalue('runtimename',True):
+                c=datetime.datetime.now()
+                md.private.runtimename="%s-%02i-%02i-%04i-%02i-%02i-%02i-%i" % (md.miscellaneous.name,c.month,c.day,c.year,c.hour,c.minute,c.second,os.getpid())
+        else:
+                md.private.runtimename=md.miscellaneous.name
+                
         #if running qmu analysis, some preprocessing of dakota files using models
         #fields needs to be carried out.