Index: /issm/trunk-jpl/src/m/boundaryconditions/SetIceSheetBC.py
===================================================================
--- /issm/trunk-jpl/src/m/boundaryconditions/SetIceSheetBC.py	(revision 22132)
+++ /issm/trunk-jpl/src/m/boundaryconditions/SetIceSheetBC.py	(revision 22133)
@@ -15,7 +15,7 @@
 	#node on Dirichlet
 	pos=np.nonzero(md.mesh.vertexonboundary)
-	md.stressbalance.spcvx=float('nan')*np.ones(md.mesh.numberofvertices)
-	md.stressbalance.spcvy=float('nan')*np.ones(md.mesh.numberofvertices)
-	md.stressbalance.spcvz=float('nan')*np.ones(md.mesh.numberofvertices)
+	md.stressbalance.spcvx=float('nan')*np.ones((md.mesh.numberofvertices))
+	md.stressbalance.spcvy=float('nan')*np.ones((md.mesh.numberofvertices))
+	md.stressbalance.spcvz=float('nan')*np.ones((md.mesh.numberofvertices))
 	md.stressbalance.spcvx[pos]=0
 	md.stressbalance.spcvy[pos]=0
Index: /issm/trunk-jpl/src/m/coordsystems/gmtmask.py
===================================================================
--- /issm/trunk-jpl/src/m/coordsystems/gmtmask.py	(revision 22132)
+++ /issm/trunk-jpl/src/m/coordsystems/gmtmask.py	(revision 22133)
@@ -21,12 +21,12 @@
 
 	if recursive:
-		string='             recursing: num vertices #i'+str(lenlat)
+		print '             recursing: num vertices #'+str(lenlat)
 	else:
-		string='gmtmask: num vertices #i'+str(lenlat)
+		print 'gmtmask: num vertices #'+str(lenlat)
 	
 	#Check lat and long size is not more than 50,000 If so, recursively call gmtmask: 
 
 	if lenlat>50000:
-		for i in range(ceil(lenlat/50000)):
+		for i in range(int(ceil(lenlat/50000))):
 			j=(i+1)*50000-1
 			if j>lenlat:
@@ -72,9 +72,9 @@
 	fid.close()
 
-	mask=np.zeros([nv,1])
+	mask=np.zeros(nv)
 	mask[oce_vertices]=1
 	
 	subprocess.call('rm -rf ./all_vertices.txt ./oce_vertices.txt ./gmt.history',shell=True)
 	if not recursive:
-		string='gmtmask: done'
+		print 'gmtmask: done'
 	return mask
Index: /issm/trunk-jpl/src/m/parameterization/setmask.py
===================================================================
--- /issm/trunk-jpl/src/m/parameterization/setmask.py	(revision 22132)
+++ /issm/trunk-jpl/src/m/parameterization/setmask.py	(revision 22133)
@@ -23,5 +23,4 @@
 	"""
 	#some checks on list of arguments
-	print type(md)
 	if not isinstance(md,model):
 		raise TypeError("setmask error message")
Index: /issm/trunk-jpl/src/m/solve/WriteData.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/WriteData.py	(revision 22132)
+++ /issm/trunk-jpl/src/m/solve/WriteData.py	(revision 22133)
@@ -42,8 +42,8 @@
 	#Scale data if necesarry
 	if options.exist('scale'):
+		data=np.array(data)
 		scale = options.getfieldvalue('scale')
 		if np.size(data) > 1 :
 			if np.size(data,0)==timeserieslength:
-				data=np.array(data)
 				data[0:-1,:] = scale*data[0:-1,:]
 			else:
Index: /issm/trunk-jpl/src/m/solve/solve.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/solve.py	(revision 22132)
+++ /issm/trunk-jpl/src/m/solve/solve.py	(revision 22133)
@@ -29,4 +29,5 @@
 		 - 'DamageEvolution'  or 'da'
 		 - 'Gia'              or 'gia'
+		 - 'Esa'	      or 'esa'
 		 - 'Sealevelrise'     or 'slr'
 		 - 'Love'             or 'lv'
@@ -69,4 +70,6 @@
         elif solutionstring.lower() == 'lv' or solutionstring.lower() == 'love':
                 solutionstring = 'LoveSolution';
+	elif solutionstring.lower() == 'esa':
+		solutionstring = 'EsaSolution';
 	elif solutionstring.lower() == 'slr' or solutionstring.lower() == 'sealevelrise':
 		solutionstring = 'SealevelriseSolution';