Index: /issm/trunk-jpl/test/Par/79North.py
===================================================================
--- /issm/trunk-jpl/test/Par/79North.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/79North.py	(revision 16170)
@@ -2,9 +2,9 @@
 import inspect
 import netCDF4
-from numpy import *
-from verbose import *
+import numpy
+from verbose import verbose 
 from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
-from paterson import *
-from SetMarineIceSheetBC import *
+from paterson import paterson 
+from SetMarineIceSheetBC import SetMarineIceSheetBC
 
 #Start defining model parameters here
@@ -34,5 +34,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 #Friction
@@ -43,5 +43,5 @@
 
 #Ice shelf melting and surface mass balance 
-md.basalforcings.melting_rate=zeros((md.mesh.numberofvertices,1))
+md.basalforcings.melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
 md.basalforcings.melting_rate[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.
 md.surfaceforcings.mass_balance=15*numpy.ones((md.mesh.numberofvertices,1))
Index: /issm/trunk-jpl/test/Par/ISMIPA.py
===================================================================
--- /issm/trunk-jpl/test/Par/ISMIPA.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/ISMIPA.py	(revision 16170)
@@ -1,4 +1,4 @@
 import numpy
-from SetIceSheetBC import *
+from SetIceSheetBC import SetIceSheetBC
 
 #Ok, start defining model parameters here
@@ -20,5 +20,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 print "      boundary conditions for stressbalance model"
Index: /issm/trunk-jpl/test/Par/ISMIPB.py
===================================================================
--- /issm/trunk-jpl/test/Par/ISMIPB.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/ISMIPB.py	(revision 16170)
@@ -1,4 +1,4 @@
 import numpy
-from SetIceSheetBC import *
+from SetIceSheetBC import SetIceSheetBC
 
 #Ok, start defining model parameters here
@@ -20,5 +20,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 print "      boundary conditions for stressbalance model"
Index: /issm/trunk-jpl/test/Par/ISMIPC.py
===================================================================
--- /issm/trunk-jpl/test/Par/ISMIPC.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/ISMIPC.py	(revision 16170)
@@ -1,4 +1,4 @@
 import numpy
-from SetIceSheetBC import *
+from SetIceSheetBC import SetIceSheetBC
 
 #Ok, start defining model parameters here
@@ -21,5 +21,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 print "      boundary conditions for stressbalance model:"
Index: /issm/trunk-jpl/test/Par/ISMIPD.py
===================================================================
--- /issm/trunk-jpl/test/Par/ISMIPD.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/ISMIPD.py	(revision 16170)
@@ -1,4 +1,4 @@
 import numpy
-from SetIceSheetBC import *
+from SetIceSheetBC import SetIceSheetBC
 
 #Ok, start defining model parameters here
@@ -20,5 +20,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 print "      boundary conditions for stressbalance model:"
Index: /issm/trunk-jpl/test/Par/ISMIPE.py
===================================================================
--- /issm/trunk-jpl/test/Par/ISMIPE.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/ISMIPE.py	(revision 16170)
@@ -1,5 +1,5 @@
 import numpy
 import netCDF4
-from SetIceSheetBC import *
+from SetIceSheetBC import SetIceSheetBC
 
 #Ok, start defining model parameters here
@@ -32,5 +32,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 print "      boundary conditions for stressbalance model:"
Index: /issm/trunk-jpl/test/Par/ISMIPF.py
===================================================================
--- /issm/trunk-jpl/test/Par/ISMIPF.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/ISMIPF.py	(revision 16170)
@@ -1,4 +1,4 @@
 import numpy
-from SetIceSheetBC import *
+from SetIceSheetBC import SetIceSheetBC
 
 #Ok, start defining model parameters here
@@ -22,5 +22,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 print "      boundary conditions for stressbalance model"
Index: /issm/trunk-jpl/test/Par/Pig.py
===================================================================
--- /issm/trunk-jpl/test/Par/Pig.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/Pig.py	(revision 16170)
@@ -2,9 +2,9 @@
 import inspect
 import netCDF4
-from numpy import *
-from verbose import *
+import numpy
+from verbose import verbose
 from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
-from paterson import *
-from SetMarineIceSheetBC import *
+from paterson import paterson 
+from SetMarineIceSheetBC import SetMarineIceSheetBC
 
 #Start defining model parameters here
@@ -28,6 +28,6 @@
 md.initialization.vx=md.inversion.vx_obs
 md.initialization.vy=md.inversion.vy_obs
-md.initialization.vz=zeros((md.mesh.numberofvertices,1))
-md.initialization.pressure=zeros((md.mesh.numberofvertices,1))
+md.initialization.vz=numpy.zeros((md.mesh.numberofvertices,1))
+md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices,1))
 
 #Materials
@@ -38,5 +38,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 #Friction
Index: /issm/trunk-jpl/test/Par/RoundSheetEISMINT.py
===================================================================
--- /issm/trunk-jpl/test/Par/RoundSheetEISMINT.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/RoundSheetEISMINT.py	(revision 16170)
@@ -1,4 +1,4 @@
 import numpy
-from SetMarineIceSheetBC import *
+from SetMarineIceSheetBC import SetMarineIceSheetBC
 
 #Ok, start defining model parameters here
@@ -25,5 +25,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 print "      creating surface mass balance"
Index: /issm/trunk-jpl/test/Par/RoundSheetShelf.py
===================================================================
--- /issm/trunk-jpl/test/Par/RoundSheetShelf.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/RoundSheetShelf.py	(revision 16170)
@@ -3,6 +3,6 @@
 import copy
 import inspect
-from paterson import *
-from verbose import *
+from paterson import paterson
+from verbose import paterson
 
 #Start defining model parameters here
@@ -69,5 +69,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 #Surface mass balance and basal melting
Index: /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py
===================================================================
--- /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py	(revision 16170)
@@ -1,4 +1,4 @@
 import numpy
-from SetMarineIceSheetBC import *
+from SetMarineIceSheetBC import SetMarineIceSheetBC
 
 print "      creating thickness"
@@ -29,5 +29,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 print "      creating surface mass balance"
Index: /issm/trunk-jpl/test/Par/SquareEISMINT.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareEISMINT.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/SquareEISMINT.py	(revision 16170)
@@ -1,4 +1,4 @@
 import numpy
-from SetMarineIceSheetBC import *
+from SetMarineIceSheetBC import SetMarineIceSheetBC
 
 #Ok, start defining model parameters here
@@ -30,5 +30,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 print "      creating surface mass balance"
Index: /issm/trunk-jpl/test/Par/SquareSheetConstrained.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareSheetConstrained.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/SquareSheetConstrained.py	(revision 16170)
@@ -3,8 +3,8 @@
 import numpy
 import inspect
-from verbose import *
+from verbose import verbose
 from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
-from paterson import *
-from SetIceSheetBC import *
+from paterson import paterson
+from SetIceSheetBC import SetIceSheetBC
 
 #Start defining model parameters here
@@ -41,5 +41,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 #Friction
Index: /issm/trunk-jpl/test/Par/SquareSheetShelf.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareSheetShelf.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/SquareSheetShelf.py	(revision 16170)
@@ -2,9 +2,9 @@
 import inspect
 import netCDF4
-from numpy import *
-from verbose import *
+import numpy
+from verbose import verbose
 from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
-from paterson import *
-from SetMarineIceSheetBC import *
+from paterson import paterson 
+from SetMarineIceSheetBC import SetMarineIceSheetBC
 
 #Start defining model parameters here
@@ -35,6 +35,6 @@
 [md.initialization.vx]  = InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)
 [md.initialization.vy]  = InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)
-md.initialization.vz=zeros((md.mesh.numberofvertices,1))
-md.initialization.pressure=zeros((md.mesh.numberofvertices,1))
+md.initialization.vz=numpy.zeros((md.mesh.numberofvertices,1))
+md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices,1))
 
 #Materials
@@ -44,5 +44,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 #Accumulation and melting
Index: /issm/trunk-jpl/test/Par/SquareShelf.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareShelf.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/SquareShelf.py	(revision 16170)
@@ -2,9 +2,9 @@
 import inspect
 import netCDF4
-from numpy import *
-from verbose import *
+import numpy
+from verbose import verbose
 from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
-from paterson import *
-from SetIceShelfBC import *
+from paterson import paterson
+from SetIceShelfBC import SetIceShelfBC
 
 #Start defining model parameters here
@@ -39,6 +39,6 @@
 [md.initialization.vx]=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)
 [md.initialization.vy]=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)
-md.initialization.vz=zeros((md.mesh.numberofvertices,1))
-md.initialization.pressure=zeros((md.mesh.numberofvertices,1))
+md.initialization.vz=numpy.zeros((md.mesh.numberofvertices,1))
+md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices,1))
 
 #dbg - begin
@@ -60,5 +60,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 #Friction
Index: /issm/trunk-jpl/test/Par/SquareShelf2.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareShelf2.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/SquareShelf2.py	(revision 16170)
@@ -2,9 +2,9 @@
 import inspect
 import netCDF4
-from numpy import *
-from verbose import *
+import numpy
+from verbose import verbose
 from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
-from paterson import *
-from SetIceShelfBC import *
+from paterson import paterson
+from SetIceShelfBC import SetIceShelfBC
 
 #Start defining model parameters here
@@ -39,6 +39,6 @@
 [md.initialization.vx]=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)
 [md.initialization.vy]=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)
-md.initialization.vz=zeros((md.mesh.numberofvertices,1))
-md.initialization.pressure=zeros((md.mesh.numberofvertices,1))
+md.initialization.vz=numpy.zeros((md.mesh.numberofvertices,1))
+md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices,1))
 
 #dbg - begin
@@ -60,5 +60,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 #Friction
Index: /issm/trunk-jpl/test/Par/SquareShelfConstrained.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareShelfConstrained.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/SquareShelfConstrained.py	(revision 16170)
@@ -3,8 +3,8 @@
 import numpy
 import inspect
-from verbose import *
+from verbose import verbose
 from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
-from paterson import *
-from SetIceShelfBC import *
+from paterson import paterson
+from SetIceShelfBC import SetIceShelfBC
 
 #Start defining model parameters here
@@ -41,5 +41,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 #Surface mass balance and basal melting
Index: /issm/trunk-jpl/test/Par/SquareThermal.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareThermal.py	(revision 16169)
+++ /issm/trunk-jpl/test/Par/SquareThermal.py	(revision 16170)
@@ -1,5 +1,5 @@
 import numpy
-from paterson import *
-from SetMarineIceSheetBC import *
+from paterson import paterson
+from SetMarineIceSheetBC import SetMarineIceSheetBC
 
 #Ok, start defining model parameters here
@@ -32,5 +32,5 @@
 
 #Damage
-md.damage.D=zeros((md.mesh.numberofvertices,1))
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 print "      creating surface mass balance"