Changeset 19196

Timestamp:

03/16/15 10:22:03 (10 years ago)

Author:

bdef

Message:

BUG: fixing file removal

File:

• issm/trunk-jpl/src/m/solve/loadresultsfromcluster.py (modified) (3 diffs)

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

@@ -1 +1 @@
 import os
 import socket
-import MatlabFuncs as m
+import platform
 from loadresultsfromdisk import loadresultsfromdisk
 
@@ -38 +38 @@
         else:
                 filename=md.miscellaneous.name
+                TryRem('.outbin',filename)
+                if not platform.system()=='Windows':
+                        TryRem('.tar.gz',md.private.runtimename)
 
         TryRem('.errlog',filename)
         TryRem('.outlog',filename)
         
-        if not m.ispc():
-                TryRem('.tar.gz',md.private.runtimename)
-                if not md.qmu.isdakota:
-                        TryRem('.outbin',filename)
-
-                        #erase input file if run was carried out on same platform.
+        #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:
                         filename=os.path.join('qmu'+str(os.getpid()),md.miscellaneous.name)
@@ -56 +54 @@
                         filename=md.miscellaneous.name
                         TryRem('.toolkits',filename)
-                        if not m.ispc():
+                        if not platform.system()=='Windows':
                                 TryRem('.queue',filename)
                         else: