Changeset 20500 for issm/trunk/src/m/solve/loadresultsfromcluster.py

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/solve/loadresultsfromcluster.py (modified) (2 diffs)

issm/trunk ¶

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

issm/trunk/src/m/solve/loadresultsfromcluster.py ¶

@@ -1 +1 @@
 import os
 import socket
-import MatlabFuncs as m
+import platform
 from loadresultsfromdisk import loadresultsfromdisk
 
@@ -35 +35 @@
         #erase the log and output files
         if md.qmu.isdakota:
-                os.remove(os.path.join('qmu'+str(os.getpid()),md.miscellaneous.name+'.outlog'))
-                os.remove(os.path.join('qmu'+str(os.getpid()),md.miscellaneous.name+'.errlog'))
+                filename=os.path.join('qmu'+str(os.getpid()),md.miscellaneous.name)
         else:
-                os.remove(md.miscellaneous.name+'.outlog')
-                os.remove(md.miscellaneous.name+'.errlog')
-                os.remove(md.miscellaneous.name+'.outbin')
-                if not m.ispc():
-                        os.remove(md.private.runtimename+'.tar.gz')
+                filename=md.miscellaneous.name
+                TryRem('.outbin',filename)
+                if not platform.system()=='Windows':
+                        TryRem('.tar.gz',md.private.runtimename)
 
+        TryRem('.errlog',filename)
+        TryRem('.outlog',filename)
+        
         #erase input file if run was carried out on same platform.
         hostname=socket.gethostname()
-        if m.strcmpi(hostname,cluster.name):
+        if hostname==cluster.name:
                 if md.qmu.isdakota:
-                        os.remove(os.path.join('qmu'+str(os.getpid()),md.miscellaneous.name+'.bin'))
-                        os.remove(os.path.join('qmu'+str(os.getpid()),md.miscellaneous.name+'.queue'))
+                        filename=os.path.join('qmu'+str(os.getpid()),md.miscellaneous.name)
+                        TryRem('.queue',filename)
                 else:
-                        os.remove(md.miscellaneous.name+'.bin')
-                        os.remove(md.miscellaneous.name+'.toolkits')
-                        if not m.ispc():
-                                os.remove(md.miscellaneous.name+'.queue')
+                        filename=md.miscellaneous.name
+                        TryRem('.toolkits',filename)
+                        if not platform.system()=='Windows':
+                                TryRem('.queue',filename)
                         else:
-                                os.remove(md.miscellaneous.name+'.bat')
+                                TryRem('.bat',filename)
+
+                TryRem('.bin',filename)
 
         return md
 
+def TryRem(extension,filename):
+        try:    
+                os.remove(filename+extension)
+        except OSError:
+                print 'WARNING, no '+extension+'  is present for run '+filename

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad