Index: /issm/trunk-jpl/test/NightlyRun/test2001.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test2001.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test2001.py	(revision 26638)
@@ -2,5 +2,5 @@
 #GIA test, based off of test101. Running default GIA Ivins class.
 import numpy as np
-
+from socket import gethostname
 from materials import *
 from MatlabFuncs import *
@@ -56,5 +56,5 @@
 
 #Solve for GIA deflection
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 md.verbose.solver = 0
 md = solve(md, 'Transient')
Index: /issm/trunk-jpl/test/NightlyRun/test2003.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test2003.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test2003.py	(revision 26638)
@@ -1,5 +1,5 @@
 #Test Name: EarthSlc_rotationalFeedback
 import numpy as np
-
+from socket import gethostname
 from gmshplanet import *
 from gmtmask import *
@@ -95,5 +95,5 @@
 md.solidearth.settings.rotation = 0
 md.solidearth.settings.viscous = 0
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 #md.verbose = verbose('111111111')
 md = solve(md, 'Transient')
@@ -108,5 +108,5 @@
 md.solidearth.settings.rotation = 1
 md.solidearth.settings.viscous = 0
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 #md.verbose = verbose('111111111')
 md = solve(md, 'Transient')
Index: /issm/trunk-jpl/test/NightlyRun/test2006.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test2006.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test2006.py	(revision 26638)
@@ -1,5 +1,5 @@
 #Test Name: EarthSlc Dakota Sampling glaciers
 import numpy as np
-
+from socket import gethostname
 from dmeth_params_set import *
 from gmshplanet import *
@@ -17,5 +17,5 @@
 # Mesh earth
 md = model()
-md.cluster = generic('name', oshostname(), 'np', 5)
+md.cluster = generic('name', gethostname(), 'np', 5)
 md.mesh = gmshplanet('radius', 6.371012 * 1e3, 'resolution', 700.) #700 km resolution mesh
 
@@ -56,5 +56,5 @@
 
 icemask = np.ones((md.mesh.numberofvertices, 1))
-# NOTE: Need to be careful here: when addressing with multidimensional array in 
+# NOTE: Need to be careful here: when addressing with multidimensional array in
 # MATLAB, only first column of values are used as indices
 #
Index: /issm/trunk-jpl/test/NightlyRun/test2010.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test2010.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test2010.py	(revision 26638)
@@ -1,9 +1,8 @@
 #Test Name: MomentOfIntertia
 import numpy as np
-
+from socket import gethostname
 from gmshplanet import *
 from gmtmask import *
 from lovenumbers import *
-from MatlabFuncs import *
 from model import *
 from paterson import *
@@ -105,5 +104,5 @@
 md.solidearth.settings.rotation = 1
 md.solidearth.settings.viscous = 0
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 md = solve(md, 'Transient')
 
Index: /issm/trunk-jpl/test/NightlyRun/test2084.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test2084.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test2084.py	(revision 26638)
@@ -1,7 +1,7 @@
 #Test Name: GiaCaron
-# Forward Love number solution for a viscoelastic earth, model M3-L70-V01 from 
-# Spada, G., Barletta, V. R., Klemann, V., Riva, R. E. M., Martinec, Z., 
-# Gasperini, P., Lund, B., Wolf, D., Vermeersen, L. L. A. and King, M. A. 
-# (2011), A benchmark study for glacial isostatic adjustment codes. Geophysical 
+# Forward Love number solution for a viscoelastic earth, model M3-L70-V01 from
+# Spada, G., Barletta, V. R., Klemann, V., Riva, R. E. M., Martinec, Z.,
+# Gasperini, P., Lund, B., Wolf, D., Vermeersen, L. L. A. and King, M. A.
+# (2011), A benchmark study for glacial isostatic adjustment codes. Geophysical
 # Journal International, 185: 106--132. doi:10.1111/j.1365-246X.2011.04952.x
 
@@ -10,10 +10,10 @@
 from generic import generic
 from materials import *
-from MatlabFuncs import *
+from socket import gethostname
 from model import *
 from solve import *
 
 md = model()
-md.cluster = generic('name', oshostname(), 'np', 1)
+md.cluster = generic('name', gethostname(), 'np', 1)
 
 # Set validation=1 for comparing against the Spada benchark
Index: /issm/trunk-jpl/test/NightlyRun/test257.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test257.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test257.py	(revision 26638)
@@ -1,15 +1,13 @@
 #Test Name: SquareShelfSMBautoregression
-from __future__ import division # TODO: Remove this import after ISSM is updated to use Python 3 by default
-
+from __future__ import division  # TODO: Remove this import after ISSM is updated to use Python 3 by default
 import numpy as np
-
-from MatlabFuncs import *
 from model import *
-from parameterize import *
-from setflowequation import *
-from setmask import *
-from SMBautoregression import *
-from solve import *
-from triangle import *
+from socket import gethostname
+from parameterize import parameterize
+from setflowequation import setflowequation
+from setmask import setmask
+from SMBautoregression import SMBautoregression
+from solve import solve
+from triangle import triangle
 
 
@@ -18,5 +16,5 @@
 md = parameterize(md, '../Par/SquareShelfConstrained.py')
 md = setflowequation(md, 'SSA', 'all')
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 md.transient.requested_outputs = ['default', 'IceVolume', 'SmbMassBalance']
 
@@ -56,6 +54,6 @@
 md.stochasticforcing.isstochasticforcing = 1
 md.stochasticforcing.fields = ['SMBautoregression']
-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.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
 
 
Index: /issm/trunk-jpl/test/NightlyRun/test350.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test350.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test350.py	(revision 26638)
@@ -3,5 +3,5 @@
 
 from frictionshakti import frictionshakti
-from MatlabFuncs import oshostname
+from socket import gethostname
 from model import *
 from operator import itemgetter
@@ -21,5 +21,5 @@
 md.transient.ishydrology = 1
 md = setflowequation(md, 'SSA', 'all')
-md.cluster = generic('name', oshostname(), 'np', 2)
+md.cluster = generic('name', gethostname(), 'np', 2)
 
 #Use hydrology coupled friction law
Index: /issm/trunk-jpl/test/NightlyRun/test356.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test356.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test356.py	(revision 26638)
@@ -3,5 +3,5 @@
 
 from frictionschoof import frictionschoof
-from MatlabFuncs import oshostname
+from socket import gethostname
 from model import *
 from parameterize import parameterize
@@ -40,5 +40,5 @@
 md.inversion.vy_obs= md.initialization.vy
 
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 md = solve(md, 'Stressbalance')
 
Index: /issm/trunk-jpl/test/NightlyRun/test440.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test440.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test440.py	(revision 26638)
@@ -1,4 +1,5 @@
 #Test Name: SquareSheetShelfDakotaScaledResponseLinearPart
 import numpy as np
+from socket import gethostname
 from model import *
 from triangle import *
@@ -15,5 +16,5 @@
 md = parameterize(md, '../Par/SquareSheetShelf.py')
 md = setflowequation(md, 'SSA', 'all')
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 
 #partitioning
Index: /issm/trunk-jpl/test/NightlyRun/test444.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test444.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test444.py	(revision 26638)
@@ -2,5 +2,5 @@
 
 # TODO:
-# - Figure out why test fails intermittently on Mac with "IndexError: list 
+# - Figure out why test fails intermittently on Mac with "IndexError: list
 # index out of range"
 #
@@ -10,5 +10,5 @@
 from ContourToMesh import *
 from dmeth_params_set import *
-from MatlabFuncs import oshostname
+from socket import gethostname
 from model import *
 from parameterize import *
@@ -37,5 +37,5 @@
 md.settings.output_frequency = 3
 md = setflowequation(md, 'SSA', 'all')
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 
 regionalmask = np.zeros((md.mesh.numberofvertices, ))
Index: /issm/trunk-jpl/test/NightlyRun/test481.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test481.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test481.py	(revision 26638)
@@ -3,5 +3,5 @@
 
 from frictionschoof import frictionschoof
-from MatlabFuncs import oshostname
+from socket import gethostname
 from model import *
 from parameterize import parameterize
@@ -22,5 +22,5 @@
 md.friction.Cmax = 0.5 * np.ones((md.mesh.numberofvertices, 1))
 md.friction.m    = 1./3.* np.ones((md.mesh.numberofelements, 1))
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 md = solve(md, 'Transient')
 
Index: /issm/trunk-jpl/test/NightlyRun/test540.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test540.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test540.py	(revision 26638)
@@ -2,5 +2,5 @@
 import numpy as np
 from calvingvonmises import *
-from MatlabFuncs import oshostname
+from socket import gethostname
 from model import *
 from parameterize import *
@@ -30,5 +30,5 @@
 #Force MUMPS sequential analysis
 md.toolkits.DefaultAnalysis.mat_mumps_icntl_28 = 1
-md.cluster = generic('name', oshostname(), 'np', 2)
+md.cluster = generic('name', gethostname(), 'np', 2)
 md = solve(md, 'Transient')
 
Index: /issm/trunk-jpl/test/NightlyRun/test541.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test541.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test541.py	(revision 26638)
@@ -2,5 +2,5 @@
 import numpy as np
 from calvingvonmises import *
-from MatlabFuncs import oshostname
+from socket import gethostname
 from model import *
 from parameterize import *
@@ -30,5 +30,5 @@
 #Force MUMPS sequential analysis
 md.toolkits.DefaultAnalysis.mat_mumps_icntl_28 = 1
-md.cluster = generic('name', oshostname(), 'np', 2)
+md.cluster = generic('name', gethostname(), 'np', 2)
 md = solve(md, 'Transient')
 
Index: /issm/trunk-jpl/test/NightlyRun/test542.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test542.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test542.py	(revision 26638)
@@ -4,5 +4,5 @@
 from calvingvonmises import *
 from frontalforcingsrignot import *
-from MatlabFuncs import *
+from socket import gethostname
 from model import *
 from parameterize import *
@@ -47,5 +47,5 @@
 
 md.transient.requested_outputs = ['default', 'CalvingMeltingrate']
-md.cluster = generic('name', oshostname(), 'np', 2)
+md.cluster = generic('name', gethostname(), 'np', 2)
 md = solve(md, 'Transient')
 
Index: /issm/trunk-jpl/test/NightlyRun/test543.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test543.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test543.py	(revision 26638)
@@ -4,5 +4,5 @@
 from calvingvonmises import *
 from frontalforcingsrignotautoregression import *
-from MatlabFuncs import *
+from socket import gethostname
 from model import *
 from parameterize import *
@@ -59,5 +59,5 @@
 
 md.transient.requested_outputs = ['default', 'CalvingMeltingrate']
-md.cluster = generic('name', oshostname(), 'np', 2)
+md.cluster = generic('name', gethostname(), 'np', 2)
 md = solve(md, 'Transient')
 
Index: /issm/trunk-jpl/test/NightlyRun/test804.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test804.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test804.py	(revision 26638)
@@ -1,5 +1,5 @@
 #Test Name: ValleyGlacierLevelsetCalvingSIA2d
 import numpy as np
-from MatlabFuncs import oshostname
+from socket import gethostname
 from model import *
 from parameterize import *
@@ -14,5 +14,5 @@
 md = parameterize(md, '../Par/ValleyGlacierShelf.py')
 md = setflowequation(md, 'SIA', 'all')
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 
 #Transient
Index: /issm/trunk-jpl/test/NightlyRun/test805.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test805.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test805.py	(revision 26638)
@@ -1,5 +1,5 @@
 #Test Name: ValleyGlacierLevelsetEnthCalvingHO3d
 import numpy as np
-from MatlabFuncs import oshostname
+from socket import gethostname
 from model import *
 from parameterize import *
@@ -15,5 +15,5 @@
 md.extrude(3, 2.)
 md = setflowequation(md, 'HO', 'all')
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 
 #Thermal model
Index: /issm/trunk-jpl/test/NightlyRun/test806.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test806.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test806.py	(revision 26638)
@@ -1,5 +1,5 @@
 #Test Name: SquareShelfLevelsetCalvingSSA2dLevermann
 import numpy as np
-from MatlabFuncs import oshostname
+from socket import gethostname
 from model import *
 from parameterize import *
@@ -13,5 +13,5 @@
 md = parameterize(md, '../Par/SquareShelf.py')
 md = setflowequation(md, 'SSA', 'all')
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 
 x = md.mesh.x
Index: /issm/trunk-jpl/test/NightlyRun/test808.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test808.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test808.py	(revision 26638)
@@ -2,5 +2,5 @@
 import numpy as np
 from calvingminthickness import *
-from MatlabFuncs import oshostname
+from socket import gethostname
 from model import *
 from parameterize import *
@@ -14,5 +14,5 @@
 md = parameterize(md, '../Par/SquareShelf.py')
 md = setflowequation(md, 'SSA', 'all')
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 
 #Do not kill ice bergs as all is floating
Index: /issm/trunk-jpl/test/NightlyRun/test809.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test809.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test809.py	(revision 26638)
@@ -2,5 +2,5 @@
 import numpy as np
 from calvingcrevassedepth import *
-from MatlabFuncs import oshostname
+from socket import gethostname
 from model import *
 from parameterize import *
@@ -16,5 +16,5 @@
 md.timestepping.time_step = 2
 md.timestepping.final_time = 50
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 
 #Transient
Index: /issm/trunk-jpl/test/NightlyRun/test812.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test812.py	(revision 26637)
+++ /issm/trunk-jpl/test/NightlyRun/test812.py	(revision 26638)
@@ -1,5 +1,5 @@
 #Test Name: SquareShelfLevelsetCalvingMLHO2dLevermann
 import numpy as np
-from MatlabFuncs import oshostname
+from socket import gethostname
 from model import *
 from parameterize import *
@@ -13,5 +13,5 @@
 md = parameterize(md, '../Par/SquareShelf.py')
 md = setflowequation(md, 'MLHO', 'all')
-md.cluster = generic('name', oshostname(), 'np', 3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 
 x = md.mesh.x