Various style cleanups.

gprMax/geometry_views.py

@@ -153,7 +153,7 @@ class GeometryView(object):
             vtk_numpoints = (self.nx + 1) * (self.ny + 1) * (self.nz + 1)
             vtk_numpoint_components = 3
             vtk_numlines = 2 * self.nx * self.ny + 2 * self.ny * self.nz + 2 * self.nx * self.nz + 3 * self.nx * self.ny * self.nz + self.nx + self.ny + self.nz
-            vtk_numline_components  = 2;
+            vtk_numline_components  = 2
 
             vtk_connectivity_offset = round_value((vtk_numpoints * vtk_numpoint_components * np.dtype(np.float32).itemsize) + np.dtype(np.uint32).itemsize)
             vtk_offsets_offset = round_value(vtk_connectivity_offset + (vtk_numlines * vtk_numline_components * np.dtype(np.uint32).itemsize) + np.dtype(np.uint32).itemsize)

gprMax/input_cmd_funcs.py

@@ -61,7 +61,8 @@ def command(cmd, *parameters):
         s = '#{}: {}'.format(cmd, " ".join(filtered_list))
     except TypeError as e:
         # append info about cmd and parameters to the exception:
-        if not e.args: e.args=('', )
+        if not e.args:
+            e.args=('', )
         additional_info = "Creating cmd = #{} with parameters {} -> {} failed".format(cmd, parameters, filtered_list)
         e.args = e.args + (additional_info,)
         raise e
@@ -163,7 +164,7 @@ def snapshot(xs, ys, zs, xf, yf, zf, dx, dy, dz, time, filename):
     f = Coordinate(xf, yf, zf)
     d = Coordinate(dx, dy, dz)
 
-    if  '.' in str(time) or 'e' in str(time):
+    if '.' in str(time) or 'e' in str(time):
         time = '{:g}'.format(float(time))
     else:
         time = '{:d}'.format(int(time))

gprMax/input_cmds_multiuse.py

@@ -609,7 +609,7 @@ def process_multicmds(multicmds, G):
                 material.average = False
                 for pole in range(1, 2 * poles, 2):
                     if float(tmp[pole]) > 0 and float(tmp[pole + 1]) > G.dt:
-                        material.tau.append(float(tmp[pole ]))
+                        material.tau.append(float(tmp[pole]))
                         material.alpha.append(float(tmp[pole + 1]))
                     else:
                         raise CmdInputError("'" + cmdname + ': ' + ' '.join(tmp) + "'" + ' requires positive values for the frequencies, and associated times that are greater than the time step for the model.')

gprMax/utilities.py

@@ -73,7 +73,7 @@ def update_progress(progress):
     # Modify this to change the length of the progress bar
     barLength = 50
     block = round_value(barLength * progress)
-    text = '\r|{}| {:2.1f}%'.format( '#' * block + '-' * (barLength - block), progress * 100)
+    text = '\r|{}| {:2.1f}%'.format('#' * block + '-' * (barLength - block), progress * 100)
     sys.stdout.write(text)
     sys.stdout.flush()
 

gprMax/xdmf.py

@@ -367,6 +367,6 @@ def create_xdmf_markup(options):
 
     # Serialize elements
     xml_doc = etree.tostring(xdmf_el, xml_declaration=True,
-        encoding="utf-8",  doctype=doc_type, pretty_print=True)
+                             encoding="utf-8", doctype=doc_type, pretty_print=True)
 
     return xml_doc