Index: /issm/trunk-jpl/test/NightlyRun/test254.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test254.py	(revision 26636)
+++ /issm/trunk-jpl/test/NightlyRun/test254.py	(revision 26637)
@@ -3,10 +3,11 @@
 from socket import gethostname
 import numpy as np
-from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from paterson import *
-from solve import *
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from paterson import paterson
+from solve import solve
+from SetMLHOBC import SetMLHOBC
 from generic import generic
 
@@ -70,5 +71,5 @@
 
 md.stressbalance.requested_outputs = ['default', 'VySurface', 'VyShear', 'VyBase']
-md = SetMLHOBC(md);
+md = SetMLHOBC(md)
 md = solve(md, 'Stressbalance')
 
Index: /issm/trunk-jpl/test/NightlyRun/test255.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test255.py	(revision 26636)
+++ /issm/trunk-jpl/test/NightlyRun/test255.py	(revision 26637)
@@ -2,10 +2,10 @@
 from model import *
 from socket import gethostname
-from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
-
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from solve import solve
+from SetMLHOBC import SetMLHOBC
 
 md = triangle(model(), '../Exp/Square.exp', 150000.)
@@ -15,5 +15,5 @@
 md.cluster = generic('name', gethostname(), 'np', 3)
 md.masstransport.hydrostatic_adjustment = 'Incremental'
-md = SetMLHOBC(md);
+md = SetMLHOBC(md)
 md = solve(md, 'Transient')
 
Index: /issm/trunk-jpl/test/NightlyRun/test257.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test257.py	(revision 26636)
+++ /issm/trunk-jpl/test/NightlyRun/test257.py	(revision 26637)
@@ -25,30 +25,30 @@
 # Generate basin IDs for 3 basins
 idbasin = np.zeros((md.mesh.numberofelements,))
-iid1 = np.where(md.mesh.y >= 2/3 * ymax)[0]
-iid2 = intersect(np.where(md.mesh.y < 2/3 * ymax)[0], np.where(md.mesh.x >= 1/3 * xmax)[0])
-iid3 = intersect(np.where(md.mesh.y < 2/3 * ymax)[0], np.where(md.mesh.x < 1/3 * xmax)[0])
+iid1 = np.where(md.mesh.y >= 2. / 3. * ymax)[0]
+iid2 = intersect(np.where(md.mesh.y < 2. / 3. * ymax)[0], np.where(md.mesh.x >= 1. / 3. * xmax)[0])
+iid3 = intersect(np.where(md.mesh.y < 2. / 3. * ymax)[0], np.where(md.mesh.x < 1. / 3. * xmax)[0])
 for ii in range(md.mesh.numberofelements):
     for vertex in range(3):
-        if md.mesh.elements[ii][vertex] - 1 in iid1: # one vertex in basin 1; NOTE: offset because of 1-based vertex indexing
+        if md.mesh.elements[ii][vertex] - 1 in iid1:  # one vertex in basin 1; NOTE: offset because of 1-based vertex indexing
             idbasin[ii] = 1
-    if idbasin[ii] == 0: # no vertex was found in basin 1
+    if idbasin[ii] == 0:  # no vertex was found in basin 1
         for vertex in range(3):
-            if md.mesh.elements[ii][vertex] - 1 in iid2: # one vertex in basin 2; NOTE: offset because of 1-based vertex indexing
+            if md.mesh.elements[ii][vertex] - 1 in iid2:  # one vertex in basin 2; NOTE: offset because of 1-based vertex indexing
                 idbasin[ii] = 2
-    if idbasin[ii] == 0: # no vertex was found in basin 1 and 2
+    if idbasin[ii] == 0:  # no vertex was found in basin 1 and 2
         idbasin[ii] = 3
 
 # SMB parameters
 md.timestepping.start_time = 0
-md.timestepping.time_step  = 1
+md.timestepping.time_step = 1
 md.timestepping.final_time = 5
 md.smb = SMBautoregression()
-md.smb.num_basins = 3 # number of basins
-md.smb.basin_id = idbasin - 1 # prescribe basin ID number to elements; # NOTE: offset because of 1-based vertex indexing
-md.smb.beta0 = np.array([[0.5, 1.2, 1.5]]) # intercept values of SMB in basins [m ice eq./yr]
-md.smb.beta1 = np.array([[0.0, 0.01, -0.01]]) # trend values of SMB in basins [m ice eq./yr^2]
+md.smb.num_basins = 3  # number of basins
+md.smb.basin_id = idbasin - 1  # prescribe basin ID number to elements; # NOTE: offset because of 1-based vertex indexing
+md.smb.beta0 = np.array([[0.5, 1.2, 1.5]])  # intercept values of SMB in basins [m ice eq./yr]
+md.smb.beta1 = np.array([[0.0, 0.01, -0.01]])  # trend values of SMB in basins [m ice eq./yr^2]
 md.smb.ar_initialtime = md.timestepping.start_time
 md.smb.ar_order = 4
-md.smb.ar_timestep = 2.0 #timestep of the autoregressive model [yr]
+md.smb.ar_timestep = 2.0  #timestep of the autoregressive model [yr]
 md.smb.phi = np.array([[0.2, 0.1, 0.05, 0.01], [0.4, 0.2, -0.2, 0.1], [0.4, -0.4, 0.1, -0.1]])
 
@@ -58,4 +58,5 @@
 md.stochasticforcing.covariance = np.array([[0.15, 0.08, -0.02], [0.08, 0.12, -0.05], [-0.02, -0.05, 0.1]]) # global covariance among- and between-fields
 md.stochasticforcing.randomflag = 0 # fixed random seeds
+
 
 md = solve(md, 'Transient')
Index: /issm/trunk-jpl/test/NightlyRun/test330.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test330.py	(revision 26636)
+++ /issm/trunk-jpl/test/NightlyRun/test330.py	(revision 26637)
@@ -2,9 +2,10 @@
 from model import *
 from socket import gethostname
-from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from solve import solve
+from SetMLHOBC import SetMLHOBC
 
 
@@ -15,5 +16,5 @@
 md.cluster = generic('name', gethostname(), 'np', 3)
 md.stressbalance.requested_outputs = ['default', 'VxSurface', 'VySurface', 'VxShear', 'VyShear', 'VxBase', 'VyBase']
-md = SetMLHOBC(md);
+md = SetMLHOBC(md)
 md = solve(md, 'Stressbalance')
 
Index: /issm/trunk-jpl/test/NightlyRun/test332.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test332.py	(revision 26636)
+++ /issm/trunk-jpl/test/NightlyRun/test332.py	(revision 26637)
@@ -2,10 +2,10 @@
 from model import *
 from socket import gethostname
-from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
-
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from solve import solve
+from SetMLHOBC import SetMLHOBC
 
 md = triangle(model(), '../Exp/Square.exp', 150000.)
@@ -14,5 +14,5 @@
 md = setflowequation(md, 'MLHO', 'all')
 md.cluster = generic('name', gethostname(), 'np', 3)
-md = SetMLHOBC(md);
+md = SetMLHOBC(md)
 md = solve(md, 'Transient')
 
Index: /issm/trunk-jpl/test/NightlyRun/test335.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test335.py	(revision 26636)
+++ /issm/trunk-jpl/test/NightlyRun/test335.py	(revision 26637)
@@ -2,9 +2,10 @@
 from model import *
 from socket import gethostname
-from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from solve import solve
+from SetMLHOBC import SetMLHOBC
 
 
@@ -13,5 +14,5 @@
 md = parameterize(md, '../Par/SquareSheetConstrained.py')
 md = setflowequation(md, 'MLHO', 'all')
-md = SetMLHOBC(md);
+md = SetMLHOBC(md)
 md.extrude(5, 1.)
 md.cluster = generic('name', gethostname(), 'np', 3)
Index: /issm/trunk-jpl/test/NightlyRun/test447.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test447.py	(revision 26636)
+++ /issm/trunk-jpl/test/NightlyRun/test447.py	(revision 26637)
@@ -3,11 +3,12 @@
 from model import *
 from socket import gethostname
-
-from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from solve import solve
+from SetMLHOBC import SetMLHOBC
 from frictioncoulomb import frictioncoulomb
+from generic import generic
 
 md = triangle(model(), '../Exp/Square.exp', 150000.)
@@ -27,17 +28,17 @@
 md.cluster = generic('name', gethostname(), 'np', 3)
 md.transient.requested_outputs = ['default', 'GroundedArea', 'FloatingArea', 'TotalFloatingBmb', 'TotalGroundedBmb', 'TotalSmb']
-md = SetMLHOBC(md);
+md = SetMLHOBC(md)
 md = solve(md, 'Transient')
 
 #Fields and tolerances to track changes
 field_names = [
-    'Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'GroundedArea1', 'FloatingArea1', 'TotalFloatingBmb1', 'TotalGroundedBmb1', 'TotalSmb1', 
-    'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'GroundedArea2', 'FloatingArea2', 'TotalFloatingBmb2', 'TotalGroundedBmb2', 'TotalSmb2', 
+    'Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'GroundedArea1', 'FloatingArea1', 'TotalFloatingBmb1', 'TotalGroundedBmb1', 'TotalSmb1',
+    'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'GroundedArea2', 'FloatingArea2', 'TotalFloatingBmb2', 'TotalGroundedBmb2', 'TotalSmb2',
     'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'GroundedArea3', 'FloatingArea3', 'TotalFloatingBmb3', 'TotalGroundedBmb3', 'TotalSmb3'
 ]
 field_tolerances = [
-    2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 
-    2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 
-    2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 
+    2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
+    2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
+    2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
 ]
 field_values = [
Index: /issm/trunk-jpl/test/NightlyRun/test449.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test449.py	(revision 26636)
+++ /issm/trunk-jpl/test/NightlyRun/test449.py	(revision 26637)
@@ -3,9 +3,12 @@
 from model import *
 from socket import gethostname
-from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from solve import solve
+from SetMLHOBC import SetMLHOBC
+from generic import generic
+
 
 md = triangle(model(), '../Exp/Square.exp', 100000.)
@@ -56,5 +59,5 @@
 
 md.cluster = generic('name', gethostname(), 'np', 3)
-md = SetMLHOBC(md);
+md = SetMLHOBC(md)
 md = solve(md, 'Transient')
 #print md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate
Index: /issm/trunk-jpl/test/NightlyRun/test519.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test519.py	(revision 26636)
+++ /issm/trunk-jpl/test/NightlyRun/test519.py	(revision 26637)
@@ -1,11 +1,13 @@
 #Test Name: PigTranMLHO2d
+import numpy as np
 from model import *
 from socket import gethostname
-from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
-
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from solve import solve
+from SetMLHOBC import SetMLHOBC
+from generic import generic
 
 md = triangle(model(), '../Exp/Pig.exp', 20000.)
@@ -16,5 +18,5 @@
 md.transient.requested_outputs = ['default', 'IceVolume', 'IceVolumeScaled', 'GroundedArea', 'GroundedAreaScaled', 'FloatingArea', 'FloatingAreaScaled', 'TotalSmb', 'TotalSmbScaled', 'TotalFloatingBmb', 'TotalFloatingBmbScaled']
 md.cluster = generic('name', gethostname(), 'np', 3)
-md = SetMLHOBC(md);
+md = SetMLHOBC(md)
 md = solve(md, 'Transient')
 
Index: /issm/trunk-jpl/test/NightlyRun/test542.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test542.py	(revision 26636)
+++ /issm/trunk-jpl/test/NightlyRun/test542.py	(revision 26637)
@@ -17,5 +17,5 @@
 md = parameterize(md, '../Par/Pig.py')
 md = setflowequation(md, 'SSA', 'all')
-md.timestepping.time_step  = 2
+md.timestepping.time_step = 2
 md.timestepping.final_time = 50
 
@@ -25,7 +25,7 @@
 for ii in range(md.mesh.numberofelements):
     for vertex in range(3):
-        if md.mesh.elements[ii][vertex] - 1 in iid1: # one vertex in basin 1; NOTE: offset because of 1-based vertex indexing
+        if md.mesh.elements[ii][vertex] - 1 in iid1:  # one vertex in basin 1; NOTE: offset because of 1-based vertex indexing
             idbasin[ii] = 1
-    if idbasin[ii] == 0: # no vertex was found in basin 1
+    if idbasin[ii] == 0:  # no vertex was found in basin 1
         idbasin[ii] = 2
 
@@ -35,10 +35,10 @@
 md.frontalforcings = frontalforcingsrignot()
 md.frontalforcings.num_basins = 2
-md.frontalforcings.basin_id = idbasin - 1 # NOTE: offset because of 1-based vertex indexing
+md.frontalforcings.basin_id = idbasin - 1  # NOTE: offset because of 1-based vertex indexing
 md.frontalforcings.subglacial_discharge = 0.1 * np.ones((md.mesh.numberofvertices,))
 md.frontalforcings.thermalforcing = 0.5 * np.ones((md.mesh.numberofvertices,))
 for elem in range(md.mesh.numberofelements):
     if idbasin[elem] == 2:
-        md.frontalforcings.thermalforcing[md.mesh.elements[elem, 0:3] - 1] = 1.5 # NOTE: offset because of 1-based vertex indexing
+        md.frontalforcings.thermalforcing[md.mesh.elements[elem, 0:3] - 1] = 1.5  # NOTE: offset because of 1-based vertex indexing
 
 md.transient.ismovingfront = 1
Index: /issm/trunk-jpl/test/NightlyRun/test543.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test543.py	(revision 26636)
+++ /issm/trunk-jpl/test/NightlyRun/test543.py	(revision 26637)
@@ -18,5 +18,5 @@
 md = setflowequation(md, 'SSA', 'all')
 md.timestepping.start_time = 0
-md.timestepping.time_step  = 1
+md.timestepping.time_step = 1
 md.timestepping.final_time = 25
 
@@ -26,7 +26,7 @@
 for ii in range(md.mesh.numberofelements):
     for vertex in range(3):
-        if md.mesh.elements[ii][vertex] - 1 in iid1: # one vertex in basin 1; NOTE: offset because of 1-based vertex indexing
+        if md.mesh.elements[ii][vertex] - 1 in iid1:  # one vertex in basin 1; NOTE: offset because of 1-based vertex indexing
             idbasin[ii] = 1
-    if idbasin[ii] == 0: # no vertex was found in basin 1
+    if idbasin[ii] == 0:  # no vertex was found in basin 1
         for vertex in range(3):
             idbasin[ii] = 2
@@ -37,18 +37,20 @@
 md.frontalforcings = frontalforcingsrignotautoregression()
 md.frontalforcings.num_basins = 2
-md.frontalforcings.basin_id = idbasin - 1 # NOTE: offset because of 1-based vertex indexing
+md.frontalforcings.basin_id = idbasin - 1  # NOTE: offset because of 1-based vertex indexing
 md.frontalforcings.subglacial_discharge = 0.1 * np.ones((md.mesh.numberofvertices,))
-md.frontalforcings.beta0 = np.array([[0.05, 0.01]]) # intercept values of TF in basins [C]
-md.frontalforcings.beta1 = np.array([[0.001, 0.0001]]) # trend values of TF in basins [C/yr]
-md.frontalforcings.ar_initialtime = md.timestepping.start_time # initial time in the AR model parameterization [yr]
+md.frontalforcings.beta0 = np.array([[0.05, 0.01]])  # intercept values of TF in basins [C]
+md.frontalforcings.beta1 = np.array([[0.001, 0.0001]])  # trend values of TF in basins [C/yr]
+md.frontalforcings.ar_initialtime = md.timestepping.start_time  # initial time in the AR model parameterization [yr]
 md.frontalforcings.ar_order = 4
-md.frontalforcings.ar_timestep = 2 # timestep of the autoregressive model [yr]
-md.frontalforcings.phi = np.array([[0.1, -0.1, 0.01, -0.01], [0.2, -0.2, 0.1, 0.0]]) # autoregressive parameters
+md.frontalforcings.ar_timestep = 2  # timestep of the autoregressive model [yr]
+md.frontalforcings.phi = np.array([[0.1, -0.1, 0.01, -0.01], [0.2, -0.2, 0.1, 0.0]])  # autoregressive parameters
 
 # Stochastic forcing
 md.stochasticforcing.isstochasticforcing = 1
 md.stochasticforcing.fields = ['FrontalForcingsRignotAutoregression']
+
 md.stochasticforcing.covariance = 1e-4 * np.array([[1.5, 0.5], [0.5, 0.4]]) # global covariance among- and between-fields
 md.stochasticforcing.randomflag = 0 # determines true/false randomness
+
 
 md.transient.ismovingfront = 1
Index: /issm/trunk-jpl/test/NightlyRun/test811.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test811.py	(revision 26636)
+++ /issm/trunk-jpl/test/NightlyRun/test811.py	(revision 26637)
@@ -1,12 +1,13 @@
 #Test Name: ValleyGlacierLevelsetCalvingMLHO2d
 import numpy as np
-from MatlabFuncs import oshostname
 from model import *
-from parameterize import *
-from setflowequation import *
-from setmask import *
-from solve import *
-from triangle import *
-
+from socket import gethostname
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from solve import solve
+from SetMLHOBC import SetMLHOBC
+from generic import generic
 
 md = triangle(model(), '../Exp/Square.exp', 50000)
@@ -14,5 +15,5 @@
 md = parameterize(md, '../Par/ValleyGlacierShelf.py')
 md = setflowequation(md, 'MLHO', 'all')
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 
 #Transient
@@ -28,5 +29,5 @@
 md.levelset.migration_max = 1e10
 
-md = SetMLHOBC(md);
+md = SetMLHOBC(md)
 md = solve(md, 'Transient')