Index: /issm/trunk-jpl/src/m/classes/SMB.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/SMB.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/SMB.py	(revision 17497)
@@ -1,7 +1,8 @@
+import numpy
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from project3d import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
+from project3d import project3d
 
 class SMB(object):
Index: /issm/trunk-jpl/src/m/classes/SMBgradients.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/SMBgradients.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/SMBgradients.py	(revision 17497)
@@ -1,7 +1,7 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from project3d import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
+from project3d import project3d
 
 class SMBgradients(object):
Index: /issm/trunk-jpl/src/m/classes/SMBpdd.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/SMBpdd.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/SMBpdd.py	(revision 17497)
@@ -1,7 +1,7 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from project3d import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
+from project3d import project3d
 
 class SMBpdd(object):
Index: /issm/trunk-jpl/src/m/classes/autodiff.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/autodiff.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/autodiff.py	(revision 17497)
@@ -1,9 +1,9 @@
 import numpy
-from dependent import *
-from independent import *
+from dependent import dependent
+from independent import independent
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class autodiff(object):
Index: /issm/trunk-jpl/src/m/classes/balancethickness.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/balancethickness.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/balancethickness.py	(revision 17497)
@@ -1,6 +1,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class balancethickness(object):
Index: /issm/trunk-jpl/src/m/classes/basalforcings.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/basalforcings.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/basalforcings.py	(revision 17497)
@@ -1,6 +1,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 import numpy
 
Index: /issm/trunk-jpl/src/m/classes/constants.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/constants.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/constants.py	(revision 17497)
@@ -1,6 +1,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class constants(object):
Index: /issm/trunk-jpl/src/m/classes/flaim.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/flaim.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/flaim.py	(revision 17497)
@@ -3,6 +3,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class flaim(object):
Index: /issm/trunk-jpl/src/m/classes/friction.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/friction.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/friction.py	(revision 17497)
@@ -1,6 +1,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class friction(object):
Index: /issm/trunk-jpl/src/m/classes/geometry.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/geometry.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/geometry.py	(revision 17497)
@@ -1,6 +1,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class geometry(object):
Index: /issm/trunk-jpl/src/m/classes/gia.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/gia.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/gia.py	(revision 17497)
@@ -1,6 +1,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class gia(object):
Index: /issm/trunk-jpl/src/m/classes/hydrologydc.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/hydrologydc.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/hydrologydc.py	(revision 17497)
@@ -1,6 +1,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class hydrologydc(object):
Index: /issm/trunk-jpl/src/m/classes/hydrologyshreve.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/hydrologyshreve.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/hydrologyshreve.py	(revision 17497)
@@ -1,6 +1,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class hydrologyshreve(object):
Index: /issm/trunk-jpl/src/m/classes/inversion.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/inversion.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/inversion.py	(revision 17497)
@@ -4,6 +4,6 @@
 from EnumDefinitions import *
 from StringToEnum import StringToEnum
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class inversion(object):
Index: /issm/trunk-jpl/src/m/classes/mask.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/mask.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/mask.py	(revision 17497)
@@ -2,6 +2,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class mask(object):
Index: /issm/trunk-jpl/src/m/classes/massfluxatgate.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/massfluxatgate.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/massfluxatgate.py	(revision 17497)
@@ -1,7 +1,7 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
-from MeshProfileIntersection import *
+from checkfield import checkfield
+from WriteData import WriteData
+from MeshProfileIntersection import MeshProfileIntersection
 import os
 
Index: /issm/trunk-jpl/src/m/classes/masstransport.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/masstransport.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/masstransport.py	(revision 17497)
@@ -2,6 +2,6 @@
 from EnumDefinitions import *
 from StringToEnum import StringToEnum
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class masstransport(object):
Index: /issm/trunk-jpl/src/m/classes/matice.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/matice.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/matice.py	(revision 17497)
@@ -2,6 +2,6 @@
 from EnumDefinitions import *
 from StringToEnum import StringToEnum
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class matice(object):
Index: /issm/trunk-jpl/src/m/classes/miscellaneous.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/miscellaneous.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/miscellaneous.py	(revision 17497)
@@ -2,6 +2,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class miscellaneous(object):
Index: /issm/trunk-jpl/src/m/classes/organizer.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/organizer.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/organizer.py	(revision 17497)
@@ -1,8 +1,8 @@
 import os.path
 from collections import OrderedDict
-from pairoptions import *
-from loadvars import *
-from loadmodel import *
-from savevars import *
+import pairoptions
+from loadvars import loadvars
+from loadmodel import loadmodel
+from savevars import savevars
 from model import model
 from whichdb import whichdb
@@ -34,5 +34,5 @@
 
 		#process options
-		options=pairoptions(*args)
+		options=pairoptions.pairoptions(*args)
 
 		#Get prefix
Index: /issm/trunk-jpl/src/m/classes/outputdefinition.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/outputdefinition.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/outputdefinition.py	(revision 17497)
@@ -2,6 +2,6 @@
 from EnumDefinitions import *
 from StringToEnum import StringToEnum
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 import numpy as npy
 
Index: /issm/trunk-jpl/src/m/classes/private.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/private.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/private.py	(revision 17497)
@@ -2,5 +2,5 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
+from checkfield import checkfield
 
 class private(object):
Index: /issm/trunk-jpl/src/m/classes/rifts.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/rifts.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/rifts.py	(revision 17497)
@@ -2,7 +2,7 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
-from isnans import *
+from checkfield import checkfield
+from WriteData import WriteData
+from isnans import isnans
 
 class rifts(object):
Index: /issm/trunk-jpl/src/m/classes/settings.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/settings.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/settings.py	(revision 17497)
@@ -1,6 +1,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class settings(object):
Index: /issm/trunk-jpl/src/m/classes/steadystate.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/steadystate.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/steadystate.py	(revision 17497)
@@ -2,6 +2,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class steadystate(object):
Index: /issm/trunk-jpl/src/m/classes/thermal.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/thermal.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/thermal.py	(revision 17497)
@@ -2,6 +2,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class thermal(object):
Index: /issm/trunk-jpl/src/m/classes/timestepping.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/timestepping.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/timestepping.py	(revision 17497)
@@ -1,6 +1,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class timestepping(object):
Index: /issm/trunk-jpl/src/m/classes/transient.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/transient.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/classes/transient.py	(revision 17497)
@@ -1,6 +1,6 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
 
 class transient(object):
Index: /issm/trunk-jpl/src/m/io/loadmodel.py
===================================================================
--- /issm/trunk-jpl/src/m/io/loadmodel.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/io/loadmodel.py	(revision 17497)
@@ -1,4 +1,3 @@
-import os.path
-from loadvars import *
+from loadvars import loadvars
 from whichdb import whichdb
 
Index: /issm/trunk-jpl/src/m/mesh/ElementsFromEdge.py
===================================================================
--- /issm/trunk-jpl/src/m/mesh/ElementsFromEdge.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/mesh/ElementsFromEdge.py	(revision 17497)
@@ -1,4 +1,4 @@
 import numpy
-from PythonFuncs import *
+import PythonFuncs as p
 
 def ElementsFromEdge(elements,A,B):
@@ -13,5 +13,5 @@
 
 	edgeelements=numpy.nonzero(\
-		logical_or_n(numpy.logical_and(elements[:,0]==A,elements[:,1]==B), \
+		p.logical_or_n(numpy.logical_and(elements[:,0]==A,elements[:,1]==B), \
 					 numpy.logical_and(elements[:,0]==A,elements[:,2]==B), \
 					 numpy.logical_and(elements[:,1]==A,elements[:,2]==B), \
Index: /issm/trunk-jpl/src/m/mesh/meshconvert.py
===================================================================
--- /issm/trunk-jpl/src/m/mesh/meshconvert.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/mesh/meshconvert.py	(revision 17497)
@@ -1,7 +1,7 @@
 import numpy
 from collections import OrderedDict
-from BamgConvertMesh import *
-from bamgmesh import *
-from bamggeom import *
+from BamgConvertMesh import BamgConvertMesh 
+from bamgmesh import bamgmesh
+from bamggeom import bamggeom
 
 def meshconvert(md,*args):
Index: /issm/trunk-jpl/src/m/mesh/rifts/meshprocessrifts.py
===================================================================
--- /issm/trunk-jpl/src/m/mesh/rifts/meshprocessrifts.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/mesh/rifts/meshprocessrifts.py	(revision 17497)
@@ -1,7 +1,7 @@
 import numpy
-from TriMeshProcessRifts import *
-from ContourToMesh import *
-from meshprocessoutsiderifts import *
-from GetAreas import *
+from TriMeshProcessRifts import TriMeshProcessRifts
+from ContourToMesh import ContourToMesh
+from meshprocessoutsiderifts import meshprocessoutsiderifts
+from GetAreas import GetAreas
 
 def meshprocessrifts(md,domainoutline):
Index: /issm/trunk-jpl/src/m/mesh/roundmesh.py
===================================================================
--- /issm/trunk-jpl/src/m/mesh/roundmesh.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/mesh/roundmesh.py	(revision 17497)
@@ -2,7 +2,6 @@
 import os
 from collections import OrderedDict
-from expwrite import *
-from triangle import *
-#from bamg import *
+from expwrite import expwrite
+from triangle import triangle
 
 def roundmesh(md,radius,resolution):
Index: /issm/trunk-jpl/src/m/mesh/squaremesh.py
===================================================================
--- /issm/trunk-jpl/src/m/mesh/squaremesh.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/mesh/squaremesh.py	(revision 17497)
@@ -1,5 +1,5 @@
 import numpy
-from NodeConnectivity import *
-from ElementConnectivity import *
+from NodeConnectivity import NodeConnectivity
+from ElementConnectivity import ElementConnectivity 
 
 def squaremesh(md,Lx,Ly,nx,ny):
Index: /issm/trunk-jpl/src/m/parameterization/contourenvelope.py
===================================================================
--- /issm/trunk-jpl/src/m/parameterization/contourenvelope.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/parameterization/contourenvelope.py	(revision 17497)
@@ -4,5 +4,5 @@
 from NodeConnectivity import NodeConnectivity
 from ElementConnectivity import ElementConnectivity
-from mesh import *
+from mesh import mesh
 import MatlabFuncs as m
 
Index: /issm/trunk-jpl/src/m/parameterization/setflowequation.py
===================================================================
--- /issm/trunk-jpl/src/m/parameterization/setflowequation.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/parameterization/setflowequation.py	(revision 17497)
@@ -1,4 +1,4 @@
 import numpy
-from model import *
+from model import model
 from pairoptions import pairoptions
 import MatlabFuncs as m
Index: /issm/trunk-jpl/src/m/parameterization/setmask.py
===================================================================
--- /issm/trunk-jpl/src/m/parameterization/setmask.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/parameterization/setmask.py	(revision 17497)
@@ -1,5 +1,5 @@
 import numpy
 import os
-from model import *
+from model import model
 from FlagElements import FlagElements
 import pairoptions
Index: /issm/trunk-jpl/src/m/plot/plot_manager.py
===================================================================
--- /issm/trunk-jpl/src/m/plot/plot_manager.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/plot/plot_manager.py	(revision 17497)
@@ -5,5 +5,4 @@
 	print "could not import pylab, matplotlib has not been installed, no plotting capabilities enabled"
 
-from pairoptions import *
 from checkplotoptions import checkplotoptions
 from plot_mesh import plot_mesh
Index: /issm/trunk-jpl/src/m/plot/plotmodel.py
===================================================================
--- /issm/trunk-jpl/src/m/plot/plotmodel.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/plot/plotmodel.py	(revision 17497)
@@ -6,5 +6,4 @@
 	print "could not import pylab, matplotlib has not been installed, no plotting capabilities enabled"
 
-#from pairoptions import *
 from plotoptions import plotoptions
 from plot_manager import plot_manager
Index: /issm/trunk-jpl/src/m/solve/marshall.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/marshall.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/solve/marshall.py	(revision 17497)
@@ -1,3 +1,3 @@
-from WriteData import *
+from WriteData import WriteData
 from EnumDefinitions import *
 
Index: /issm/trunk-jpl/src/m/solvers/asmoptions.py
===================================================================
--- /issm/trunk-jpl/src/m/solvers/asmoptions.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/solvers/asmoptions.py	(revision 17497)
@@ -1,3 +1,4 @@
-from pairoptions import *
+import pairoptions
+
 def asmoptions(*args):
 	#ASMOPTIONS - return ASM petsc options
@@ -7,5 +8,5 @@
 	
 	#retrieve options provided in varargin
-	arguments=pairoptions(*args) 
+	arguments=pairoptions.pairoptions(*args) 
 	
 	options=[['toolkit','petsc'],['mat_type','aij'],['ksp_type','gmres'],['pc_type','asm'],['sub_pc_type','lu'],['pc_asm_overlap',3],['ksp_max_it',100],['ksp_rtol',1e-30]];
Index: /issm/trunk-jpl/src/m/solvers/iluasmoptions.py
===================================================================
--- /issm/trunk-jpl/src/m/solvers/iluasmoptions.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/solvers/iluasmoptions.py	(revision 17497)
@@ -1,4 +1,4 @@
 from collections import OrderedDict
-from pairoptions import *
+import pairoptions
 
 def iluasmoptions(*args):
@@ -11,5 +11,5 @@
 			 
 	#retrieve options provided in varargin
-	options=pairoptions(*args)
+	options=pairoptions.pairoptions(*args)
 	iluasm=OrderedDict()
 
Index: /issm/trunk-jpl/src/m/solvers/issmgslsolver.py
===================================================================
--- /issm/trunk-jpl/src/m/solvers/issmgslsolver.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/solvers/issmgslsolver.py	(revision 17497)
@@ -1,3 +1,4 @@
-from pairoptions import *
+import pairoptions
+
 def issmgslsolver(*args):
 	#ISSMSOLVE - return issm solver options
@@ -7,5 +8,5 @@
 	
 	#retrieve options provided in varargin
-	arguments=pairoptions(*args) 
+	arguments=pairoptions.pairoptions(*args) 
 	
 	options=[['toolkit','issm'],['mat_type','dense'],['vec_type','seq'],['solver_type','gsl']];
Index: /issm/trunk-jpl/src/m/solvers/issmmumpssolver.py
===================================================================
--- /issm/trunk-jpl/src/m/solvers/issmmumpssolver.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/solvers/issmmumpssolver.py	(revision 17497)
@@ -1,3 +1,4 @@
-from pairoptions import *
+import pairoptions
+
 def issmmumpssolver(*args):
 	#ISSMSOLVE - return issm solver options
@@ -7,5 +8,5 @@
 	
 	#retrieve options provided in varargin
-	arguments=pairoptions(*args) 
+	arguments=pairoptions.pairoptions(*args) 
 	
 	options=[['toolkit','issm'],['mat_type','mpidense'],['vec_type','mpi'],['solver_type','mumps']];
Index: /issm/trunk-jpl/src/m/solvers/jacobiasmoptions.py
===================================================================
--- /issm/trunk-jpl/src/m/solvers/jacobiasmoptions.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/solvers/jacobiasmoptions.py	(revision 17497)
@@ -1,3 +1,4 @@
-from pairoptions import *
+import pairoptions
+
 def jacobiasmoptions(*args):
 	#ASMOPTIONS - return Additive Shwartz Method with Jacobi preconditioner petsc options
@@ -7,5 +8,5 @@
 	
 	#retrieve options provided in varargin
-	arguments=pairoptions(*args) 
+	arguments=pairoptions.pairoptions(*args) 
 	
 	options=[['toolkit','petsc'],['mat_type','aij'],['ksp_type','gmres'],['pc_type','asm'],['sub_pc_type','jacobi'],['pc_asm_overlap',3],['ksp_max_it',100],['ksp_rtol',1e-15]];
Index: /issm/trunk-jpl/src/m/solvers/jacobicgoptions.py
===================================================================
--- /issm/trunk-jpl/src/m/solvers/jacobicgoptions.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/solvers/jacobicgoptions.py	(revision 17497)
@@ -1,3 +1,4 @@
-from pairoptions import *
+import pairoptions 
+
 def jacobicgoptions(*args):
 	#ASMOPTIONS - return Additive Shwartz Method with Jacobi preconditioner petsc options
@@ -7,5 +8,5 @@
 	
 	#retrieve options provided in varargin
-	arguments=pairoptions(*args) 
+	arguments=pairoptions.pairoptions(*args) 
 	
 	options=[['toolkit','petsc'],['mat_type','aij'],['ksp_type','cg'],['ksp_max_it',100],['ksp_rtol',1e-15]];
Index: /issm/trunk-jpl/src/m/solvers/matlaboptions.py
===================================================================
--- /issm/trunk-jpl/src/m/solvers/matlaboptions.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/solvers/matlaboptions.py	(revision 17497)
@@ -1,3 +1,4 @@
-from pairoptions import *
+import pairoptions
+
 def matlaboptions(*args):
 	#MATLABOPTIONS - return Matlab petsc options
@@ -7,5 +8,5 @@
 	
 	#retrieve options provided in varargin
-	arguments=pairoptions(*args) 
+	arguments=pairoptions.pairoptions(*args) 
 	
 	options=[['toolkit','petsc'],['ksp_type','matlab']];
Index: /issm/trunk-jpl/src/m/solvers/mumpsoptions.py
===================================================================
--- /issm/trunk-jpl/src/m/solvers/mumpsoptions.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/solvers/mumpsoptions.py	(revision 17497)
@@ -1,5 +1,5 @@
 from collections import OrderedDict
-from pairoptions import *
-from IssmConfig  import *
+import pairoptions
+from IssmConfig import IssmConfig
 
 def mumpsoptions(*args):
@@ -12,5 +12,5 @@
 
 	#retrieve options provided in varargin
-	options=pairoptions(*args)
+	options=pairoptions.pairoptions(*args)
 	mumps=OrderedDict()
 
Index: /issm/trunk-jpl/src/m/solvers/soroptions.py
===================================================================
--- /issm/trunk-jpl/src/m/solvers/soroptions.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/solvers/soroptions.py	(revision 17497)
@@ -1,3 +1,4 @@
-from pairoptions import *
+import pairoptions
+
 def soroptions(*args):
 	#SOROPTIONS - return Relaxation Solver petsc options
@@ -7,5 +8,5 @@
 	
 	#retrieve options provided in varargin
-	arguments=pairoptions(*args) 
+	arguments=pairoptions.pairoptions(*args) 
 	
 	options=[['toolkit','petsc'],['mat_type','aij'],['ksp_type','cg'],['pc_type','sor'],['pc_sor_omega',1.1],['pc_sor_its',2]];
Index: /issm/trunk-jpl/src/m/solvers/stokesoptions.py
===================================================================
--- /issm/trunk-jpl/src/m/solvers/stokesoptions.py	(revision 17496)
+++ /issm/trunk-jpl/src/m/solvers/stokesoptions.py	(revision 17497)
@@ -1,4 +1,5 @@
-from pairoptions import *
-from IssmConfig  import *
+import pairoptions
+from IssmConfig import IssmConfig
+
 def stokesoptions(*args):
 	#STOKESOPTIONS - return STOKES multi-physics solver petsc options
@@ -8,5 +9,5 @@
 	
 	#retrieve options provided in varargin
-	arguments=pairoptions(*args) 
+	arguments=pairoptions.pairoptions(*args)