Changeset 24252

Timestamp:

10/17/19 20:43:19 (6 years ago)

Author:

jdquinn

Message:

BUG: Extra spaces (not quite finished, but committing progress)

Location:

issm/trunk-jpl/src/m

Files:

• classes/clusters/generic.py (modified) (1 diff)
• os/issmdir.py (modified) (1 diff)
• os/issmscpin.py (modified) (1 diff)
• os/issmscpout.py (modified) (2 diffs)
• os/issmssh.py (modified) (2 diffs)
• solve/loadresultsfromdisk.py (modified) (2 diffs)

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

@@ -147 +147 @@
                 #Add - -    gen - suppressions = all to get suppression lines
                 #fid.write('LD_PRELOAD={} \\\n'.format(self.valgrindlib))
-                fid.write('mpiexec - np {} {} --leak -check=full --suppressions={} {}/kriging.exe {}/{} {} 2 > {}.errlog > {}.outlog ' .format
+                fid.write('mpiexec -np {} {} --leak -check=full --suppressions={} {}/kriging.exe {}/{} {} 2 > {}.errlog > {}.outlog ' .format
                           (self.np, self.valgrind, self.valgrindsup, self.codepath, self.executionpath, modelname, modelname, modelname, modelname))
             if not io_gather:    #concatenate the output files:

issm/trunk-jpl/src/m/os/issmdir.py

@@ -16 +16 @@
         ISSM_DIR = os.environ['ISSM_DIR_WIN']
         if m.strcmpi(ISSM_DIR[-1], '/') or m.strcmpi(ISSM_DIR[-1], '\\'):
-            ISSM_DIR = ISSM_DIR[: - 1]  #shave off the last '/'
+            ISSM_DIR = ISSM_DIR[:-1]  #shave off the last '/'
 
     if not ISSM_DIR:

issm/trunk-jpl/src/m/os/issmscpin.py

@@ -55 +55 @@
             for package in packages:
                 if not os.path.exists(os.path.join('.', package)):
-                    raise OSError("issmscpin error message: could not call scp on * nix system for file '{}'".format(package))
+                    raise OSError("issmscpin error message: could not call scp on *nix system for file '{}'".format(package))

issm/trunk-jpl/src/m/os/issmscpout.py

@@ -32 +32 @@
             #get ISSM_DIR variable
             if 'ISSM_DIR_WIN' in os.environ:
-                ISSM_DIR = os.environ['ISSM_DIR_WIN'][1: - 2]
+                ISSM_DIR = os.environ['ISSM_DIR_WIN'][1:-2]
             else:
                 raise OSError("issmscpout error message: could not find ISSM_DIR_WIN environment variable.")
@@ -54 +54 @@
 
             if port:
-                subprocess.call('scp - P %d %s %s@localhost:%s' % (port, string, login, path), shell=True)
+                subprocess.call('scp -P %d %s %s@localhost:%s' % (port, string, login, path), shell=True)
             else:
                 subprocess.call('scp %s %s@%s:%s' % (string, login, host, path), shell=True)

issm/trunk-jpl/src/m/os/issmssh.py

@@ -25 +25 @@
             #get ISSM_DIR variable
             if 'ISSM_DIR_WIN' in os.environ:
-                ISSM_DIR = os.environ['ISSM_DIR_WIN'][1: - 2]
+                ISSM_DIR = os.environ['ISSM_DIR_WIN'][1:-2]
             else:
                 raise OSError("issmssh error message: could not find ISSM_DIR_WIN environment variable.")
@@ -44 +44 @@
     # "IOError: [Errno 35] Resource temporarily unavailable"
     # on the Mac when trying to display md after the solution.
-    # (from http: / / code.google.com / p / robotframework / issues / detail?id = 995)
+    # (from http://code.google.com/p/robotframework/issues/detail?id=995)
     if _platform == "darwin":
         # Make FreeBSD use blocking I / O like other platforms

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

@@ -39 +39 @@
         if os.path.exists(md.miscellaneous.name + '.errlog'):
             with open(md.miscellaneous.name + '.errlog', 'r') as f:
-                setattr(getattr(md.results, structure[0].SolutionType)[0], 'errlog', [line[: -1] for line in f])
+                setattr(getattr(md.results, structure[0].SolutionType)[0], 'errlog', [line[:-1] for line in f])
         else:
             setattr(getattr(md.results, structure[0].SolutionType)[0], 'errlog', [])
@@ -45 +45 @@
         if os.path.exists(md.miscellaneous.name + '.outlog'):
             with open(md.miscellaneous.name + '.outlog', 'r') as f:
-                setattr(getattr(md.results, structure[0].SolutionType)[0], 'outlog', [line[: -1] for line in f])
+                setattr(getattr(md.results, structure[0].SolutionType)[0], 'outlog', [line[:-1] for line in f])
         else:
             setattr(getattr(md.results, structure[0].SolutionType)[0], 'outlog', [])