Changeset 17264

Timestamp:

02/12/14 15:17:50 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing oshostname issue, do not use split('.') anymore

Location:

issm/trunk-jpl/src/m

Files:

• classes/clusters/generic.py (modified) (8 diffs)
• enum/EnumDefinitions.py (modified) (1 diff)
• miscellaneous/MatlabFuncs.py (modified) (1 diff)
• solve/waitonlock.py (modified) (1 diff)

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

@@ -37 +37 @@
 
                 #get name
-                self.name=options.getfieldvalue('name',socket.gethostname().lower().split('.')[0])
+                self.name=gethostname()
 
                 #initialize cluster using user settings if provided
@@ -46 +46 @@
                 self=options.AssignObjectFields(self)
         # }}}
-
         def __repr__(self):    # {{{
                 #  display the object
@@ -61 +60 @@
                 return s
         # }}}
-
         def checkconsistency(self,md,solution,analyses):    # {{{
                 if self.np<1:
@@ -70 +68 @@
                 return md
         # }}}
-
         def BuildQueueScript(self,dirname,modelname,solution,io_gather,isvalgrind,isgprof):    # {{{
 
@@ -123 +120 @@
                         fid.close()
         # }}}
-
         def BuildKrigingQueueScript(self,modelname,solution,io_gather,isvalgrind,isgprof):    # {{{
 
@@ -165 +161 @@
                         fid.close()
         # }}}
-
         def LaunchQueueJob(self,modelname,dirname,filelist):    # {{{
 
@@ -184 +179 @@
                 issmssh(self.name,self.login,self.port,launchcommand)
         # }}}
-
         def Download(self,dirname,filelist):     # {{{
 
@@ -195 +189 @@
                 issmscpin(self.name,self.login,self.port,directory,filelist)
         # }}}
-

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -335 +335 @@
 def ExtrudeFromTopAnalysisEnum(): return StringToEnum("ExtrudeFromTopAnalysis")[0]
 def SteadystateSolutionEnum(): return StringToEnum("SteadystateSolution")[0]
-def L2ProjectionTopAnalysisEnum(): return StringToEnum("L2ProjectionTopAnalysis")[0]
 def SurfaceSlopeSolutionEnum(): return StringToEnum("SurfaceSlopeSolution")[0]
 def SmoothedSurfaceSlopeXAnalysisEnum(): return StringToEnum("SmoothedSurfaceSlopeXAnalysis")[0]

issm/trunk-jpl/src/m/miscellaneous/MatlabFuncs.py

@@ -2 +2 @@
         import socket
 
-        return socket.gethostname().lower().split('.')[0]
+        return socket.gethostname()
 
 def ispc():

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

@@ -24 +24 @@
 
         #waitonlock will work if the lock is on the same machine only: 
-        if not strcmpi(socket.gethostname().lower().split('.')[0],cluster):
+        if not strcmpi(socket.gethostname(),cluster):
 
                 print 'solution launched on remote cluster. log in to detect job completion.'