Index: /issm/trunk-jpl/test/Par/79North.py
===================================================================
--- /issm/trunk-jpl/test/Par/79North.py	(revision 16170)
+++ /issm/trunk-jpl/test/Par/79North.py	(revision 16171)
@@ -12,6 +12,6 @@
 #Geometry and observation
 f         = netCDF4.Dataset('../Data/79North.nc','r')
-x         = reshape(f.variables['x'][:],(-1))
-y         = reshape(f.variables['y'][:],(-1))
+x         = numpy.reshape(f.variables['x'][:],(-1))
+y         = numpy.reshape(f.variables['y'][:],(-1))
 vx        = f.variables['vx'][:]
 vy        = f.variables['vy'][:]
@@ -28,7 +28,7 @@
 
 #Materials
-md.initialization.temperature=(273.-20.)*ones((md.mesh.numberofvertices,1))
+md.initialization.temperature=(273.-20.)*numpy.ones((md.mesh.numberofvertices,1))
 md.materials.rheology_B=paterson(md.initialization.temperature)
-md.materials.rheology_n=3.*ones((md.mesh.numberofelements,1))
+md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
 md.initialization.temperature=md.initialization.temperature
 
@@ -37,8 +37,8 @@
 
 #Friction
-md.friction.coefficient=50.*ones((md.mesh.numberofvertices,1))
+md.friction.coefficient=50.*numpy.ones((md.mesh.numberofvertices,1))
 md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.
-md.friction.p=ones((md.mesh.numberofelements,1))
-md.friction.q=ones((md.mesh.numberofelements,1))
+md.friction.p=numpy.ones((md.mesh.numberofelements,1))
+md.friction.q=numpy.ones((md.mesh.numberofelements,1))
 
 #Ice shelf melting and surface mass balance 
Index: /issm/trunk-jpl/test/Par/Pig.py
===================================================================
--- /issm/trunk-jpl/test/Par/Pig.py	(revision 16170)
+++ /issm/trunk-jpl/test/Par/Pig.py	(revision 16171)
@@ -12,6 +12,6 @@
 #Geometry and observation
 f = netCDF4.Dataset('../Data/Pig.nc','r')
-x         = reshape(f.variables['x'][:],(-1))
-y         = reshape(f.variables['y'][:],(-1))
+x         = numpy.reshape(f.variables['x'][:],(-1))
+y         = numpy.reshape(f.variables['y'][:],(-1))
 vx_obs    = f.variables['vx_obs'][:]
 vy_obs    = f.variables['vy_obs'][:]
@@ -32,7 +32,7 @@
 
 #Materials
-md.initialization.temperature=(273.-20.)*ones((md.mesh.numberofvertices,1))
+md.initialization.temperature=(273.-20.)*numpy.ones((md.mesh.numberofvertices,1))
 md.materials.rheology_B=paterson(md.initialization.temperature)
-md.materials.rheology_n=3.*ones((md.mesh.numberofelements,1))
+md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
 md.initialization.temperature=md.initialization.temperature
 
@@ -41,8 +41,8 @@
 
 #Friction
-md.friction.coefficient=50.*ones((md.mesh.numberofvertices,1))
+md.friction.coefficient=50.*numpy.ones((md.mesh.numberofvertices,1))
 md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.
-md.friction.p=ones((md.mesh.numberofelements,1))
-md.friction.q=ones((md.mesh.numberofelements,1))
+md.friction.p=numpy.ones((md.mesh.numberofelements,1))
+md.friction.q=numpy.ones((md.mesh.numberofelements,1))
 
 #Numerical parameters
Index: /issm/trunk-jpl/test/Par/SquareSheetShelf.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareSheetShelf.py	(revision 16170)
+++ /issm/trunk-jpl/test/Par/SquareSheetShelf.py	(revision 16171)
@@ -26,6 +26,6 @@
 #Initial velocity 
 f = netCDF4.Dataset('../Data/SquareSheetShelf.nc','r')
-x         = reshape(f.variables['x'][:],(-1))
-y         = reshape(f.variables['y'][:],(-1))
+x         = numpy.reshape(f.variables['x'][:],(-1))
+y         = numpy.reshape(f.variables['y'][:],(-1))
 vx        = f.variables['vx'][:]
 vy        = f.variables['vy'][:]
@@ -39,7 +39,7 @@
 
 #Materials
-md.initialization.temperature=(273.-20.)*ones((md.mesh.numberofvertices,1))
+md.initialization.temperature=(273.-20.)*numpy.ones((md.mesh.numberofvertices,1))
 md.materials.rheology_B=paterson(md.initialization.temperature)
-md.materials.rheology_n=3.*ones((md.mesh.numberofelements,1))
+md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
 
 #Damage
@@ -51,8 +51,8 @@
 
 #Friction
-md.friction.coefficient=20.*ones((md.mesh.numberofvertices,1))
+md.friction.coefficient=20.*numpy.ones((md.mesh.numberofvertices,1))
 md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.
-md.friction.p=ones((md.mesh.numberofelements,1))
-md.friction.q=ones((md.mesh.numberofelements,1))
+md.friction.p=numpy.ones((md.mesh.numberofelements,1))
+md.friction.q=numpy.ones((md.mesh.numberofelements,1))
 
 #Numerical parameters
Index: /issm/trunk-jpl/test/Par/SquareShelf.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareShelf.py	(revision 16170)
+++ /issm/trunk-jpl/test/Par/SquareShelf.py	(revision 16171)
@@ -23,6 +23,6 @@
 iVelF = netCDF4.Dataset('../Data/SquareShelf.nc','r')
 
-x=reshape(iVelF.variables['x'][:],(-1))
-y=reshape(iVelF.variables['y'][:],(-1))
+x=numpy.reshape(iVelF.variables['x'][:],(-1))
+y=numpy.reshape(iVelF.variables['y'][:],(-1))
 vx=iVelF.variables['vx'][:]
 vy=iVelF.variables['vy'][:]
@@ -55,7 +55,7 @@
 
 #Materials
-md.initialization.temperature = (273.-20.)*ones((md.mesh.numberofvertices,1))
+md.initialization.temperature = (273.-20.)*numpy.ones((md.mesh.numberofvertices,1))
 md.materials.rheology_B = paterson(md.initialization.temperature)
-md.materials.rheology_n = 3.*ones((md.mesh.numberofelements,1))
+md.materials.rheology_n = 3.*numpy.ones((md.mesh.numberofelements,1))
 
 #Damage
@@ -63,8 +63,8 @@
 
 #Friction
-md.friction.coefficient = 20.*ones((md.mesh.numberofvertices,1))
+md.friction.coefficient = 20.*numpy.ones((md.mesh.numberofvertices,1))
 md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.
-md.friction.p = ones((md.mesh.numberofelements,1))
-md.friction.q = ones((md.mesh.numberofelements,1))
+md.friction.p = numpy.ones((md.mesh.numberofelements,1))
+md.friction.q = numpy.ones((md.mesh.numberofelements,1))
 
 #Numerical parameters
@@ -77,5 +77,5 @@
 md.steadystate.reltol = 0.02
 md.stressbalance.reltol = 0.02
-md.stressbalance.abstol = nan
+md.stressbalance.abstol = float('nan')
 md.timestepping.time_step = 1.
 md.timestepping.final_time = 3.
Index: /issm/trunk-jpl/test/Par/SquareShelf2.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareShelf2.py	(revision 16170)
+++ /issm/trunk-jpl/test/Par/SquareShelf2.py	(revision 16171)
@@ -23,6 +23,6 @@
 iVelF = netCDF4.Dataset('../Data/SquareShelf.nc','r')
 
-x=reshape(iVelF.variables['x'][:],(-1))
-y=reshape(iVelF.variables['y'][:],(-1))
+x=numpy.reshape(iVelF.variables['x'][:],(-1))
+y=numpy.reshape(iVelF.variables['y'][:],(-1))
 vx=iVelF.variables['vx'][:]
 vy=iVelF.variables['vy'][:]
@@ -55,7 +55,7 @@
 
 #Materials
-md.initialization.temperature = (273.-20.)*ones((md.mesh.numberofvertices,1))
+md.initialization.temperature = (273.-20.)*numpy.ones((md.mesh.numberofvertices,1))
 md.materials.rheology_B = paterson(md.initialization.temperature)
-md.materials.rheology_n = 3.*ones((md.mesh.numberofelements,1))
+md.materials.rheology_n = 3.*numpy.ones((md.mesh.numberofelements,1))
 
 #Damage
@@ -63,8 +63,8 @@
 
 #Friction
-md.friction.coefficient = 20.*ones((md.mesh.numberofvertices,1))
+md.friction.coefficient = 20.*numpy.ones((md.mesh.numberofvertices,1))
 md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.
-md.friction.p = ones((md.mesh.numberofelements,1))
-md.friction.q = ones((md.mesh.numberofelements,1))
+md.friction.p = numpy.ones((md.mesh.numberofelements,1))
+md.friction.q = numpy.ones((md.mesh.numberofelements,1))
 
 #Numerical parameters
@@ -77,5 +77,5 @@
 md.steadystate.reltol = 0.02
 md.stressbalance.reltol = 0.02
-md.stressbalance.abstol = nan
+md.stressbalance.abstol = float('nan')
 md.timestepping.time_step = 1.
 md.timestepping.final_time = 3.