Index: /issm/trunk-jpl/src/m/mesh/bamg.py
===================================================================
--- /issm/trunk-jpl/src/m/mesh/bamg.py	(revision 24261)
+++ /issm/trunk-jpl/src/m/mesh/bamg.py	(revision 24262)
@@ -250,5 +250,5 @@
 
                             #rift is crossing edge [i1 i2] of the domain
-                            #Get coordinate of intersection point (http: / /  mathworld.wolfram.com / Line-LineIntersection.html)
+                            #Get coordinate of intersection point (http://mathworld.wolfram.com/Line-LineIntersection.html)
                             x3 = domain[0]['x'][i1]
                             y3 = domain[0]['y'][i1]
@@ -510,5 +510,5 @@
             if SegIntersect(np.array([[x1, y1], [x2, y2]]), np.array([[x3, y3], [x4, y4]])):
 
-                #Get coordinate of intersection point (http: / /  mathworld.wolfram.com / Line-LineIntersection.html)
+                #Get coordinate of intersection point (http://mathworld.wolfram.com/Line-LineIntersection.html)
                 x = np.linalg.det(np.array([np.linalg.det(np.array([[x1, y1], [x2, y2]])), x1 - x2], [np.linalg.det(np.array([[x3, y3], [x4, y4]])), x3 - x4]) / np.linalg.det(np.array([[x1 - x2, y1 - y2], [x3 - x4, y3 - y4]])))
                 y = np.linalg.det(np.array([np.linalg.det(np.array([[x1, y1], [x2, y2]])), y1 - y2], [np.linalg.det(np.array([[x3, y3], [x4, y4]])), y3 - y4]) / np.linalg.det(np.array([[x1 - x2, y1 - y2], [x3 - x4, y3 - y4]])))
Index: /issm/trunk-jpl/src/m/plot/plotdoc.py
===================================================================
--- /issm/trunk-jpl/src/m/plot/plotdoc.py	(revision 24261)
+++ /issm/trunk-jpl/src/m/plot/plotdoc.py	(revision 24262)
@@ -141,5 +141,5 @@
     #                'qmudata': " ",
     #                'figposition': " position of figure:  'fullscreen', 'halfright', 'halfleft', 'portrait', 'landscape', ... (hardcoded in applyoptions.m)",
-    #                'offsetaxispos': " offset of current axis position to get more space (ex:  [ - 0.02 0  0.04 0])",
+    #                'offsetaxispos': " offset of current axis position to get more space (ex:  [ -0.02 0  0.04 0])",
     #                'axispos': " axis position to get more space",
     #                'hmin': " (numeric, minimum for histogram)",
Index: /issm/trunk-jpl/test/NightlyRun/test1501.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test1501.py	(revision 24261)
+++ /issm/trunk-jpl/test/NightlyRun/test1501.py	(revision 24262)
@@ -32,5 +32,5 @@
 for i in range(1, 11):
     md = solve(md, 'Masstransport')
-    md.smb.mass_balance = md.smb.mass_balance - ((md.results.MasstransportSolution.Thickness) - md.geometry.thickness)
+    md.smb.mass_balance = md.smb.mass_balance - (np.squeeze(md.results.MasstransportSolution.Thickness) - md.geometry.thickness)
 
 #Set up transient
@@ -38,7 +38,7 @@
 
 #tooth= [ [ones(400, 1) * (smb') - 10.]' [ones(400, 1) * (smb')]' ]
-tooth = np.hstack((np.tile(smb - 10., (1, 400)), np.tile(smb, (1, 400))))
+tooth = np.vstack((np.tile(smb - 10., (400, 1)), np.tile(smb, (400, 1))))
 #smb = [ [ones(399, 1) * (smb')]' smb  tooth tooth]
-smb = np.hstack((np.tile(smb, (1, 399)), smb, tooth, tooth))
+smb = np.vstack((np.tile(smb, (399, 1)), smb, tooth, tooth)).T
 
 #md.smb.mass_balance= smb
@@ -102,5 +102,4 @@
 if printingflag:
     pass
-
     """
     starttime = 360
@@ -136,5 +135,5 @@
 
         subplot(5, 9, [28:31 37:40])
-        set(gca, 'pos', get(gca, 'pos') + [ - 0.08 - 0.08 0.07 0.08])
+        set(gca, 'pos', get(gca, 'pos') + [ -0.08 - 0.08 0.07 0.08])
         field = 'Thickness'
 
@@ -151,5 +150,5 @@
 
         subplot(5, 9, [33:36 42:45])
-        set(gca, 'pos', get(gca, 'pos') + [ - 0.00 - 0.08 0.07 0.08])
+        set(gca, 'pos', get(gca, 'pos') + [ -0.00 - 0.08 0.07 0.08])
         field = 'Vel'
 
@@ -167,5 +166,5 @@
         subplot(5, 4, 1:4)
         cla
-        set(gca, 'pos', get(gca, 'pos') + [ - 0.07 0.03 0.12 0.015])
+        set(gca, 'pos', get(gca, 'pos') + [ -0.07 0.03 0.12 0.015])
         plot(starttime:endtime, mean(massbal), 'k', 'LineWidth', 4)
         hold on
@@ -178,5 +177,5 @@
         subplot(5, 4, 5:8)
         cla
-        set(gca, 'pos', get(gca, 'pos') + [ - 0.07 0.015 0.12 0.015])
+        set(gca, 'pos', get(gca, 'pos') + [ -0.07 0.015 0.12 0.015])
         plot(starttime:endtime, sum(volume) / 1000 / 1000 / 1000, 'LineWidth', 4)
         hold on
@@ -189,5 +188,5 @@
         subplot(5, 4, 9:12)
         cla
-        set(gca, 'pos', get(gca, 'pos') + [ - 0.07 0 0.12 0.015])
+        set(gca, 'pos', get(gca, 'pos') + [ -0.07 0 0.12 0.015])
         plot(starttime:endtime, mean(velocity) / 1000, 'LineWidth', 4)
         hold on
Index: /issm/trunk-jpl/test/NightlyRun/test1502.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test1502.py	(revision 24261)
+++ /issm/trunk-jpl/test/NightlyRun/test1502.py	(revision 24262)
@@ -12,5 +12,5 @@
 printingflag = False
 
-md = triangle(model(), '../Exp/Square.exp', 450000.)
+md = triangle(model(), '../Exp/Square.exp', 350000.)
 md = setmask(md, 'all', '')
 md = parameterize(md, '../Par/SquareShelf.py')
@@ -33,5 +33,5 @@
 for i in range(1, 11):
     md = solve(md, 'Masstransport')
-    md.smb.mass_balance = md.smb.mass_balance - ((md.results.MasstransportSolution.Thickness) - md.geometry.thickness)
+    md.smb.mass_balance = md.smb.mass_balance - (np.squeeze(md.results.MasstransportSolution.Thickness) - md.geometry.thickness)
 
 #Set up transient
@@ -39,7 +39,7 @@
 
 #tooth= [ [ones(400, 1) * (smb') - 10.]' [ones(400, 1) * (smb')]' ]
-tooth = np.hstack((np.tile(smb - 10., (1, 400)), np.tile(smb, (1, 400))))
+tooth = np.vstack((np.tile(smb - 10., (400, 1)), np.tile(smb, (400, 1))))
 #smb = [ [ones(399, 1) * (smb')]' smb  tooth tooth]
-smb = np.hstack((np.tile(smb, (1, 399)), smb, tooth, tooth))
+smb = np.vstack((np.tile(smb, (399, 1)), smb, tooth, tooth)).T
 
 #md.smb.mass_balance= smb
@@ -143,5 +143,5 @@
 
         subplot(5, 9, [28:31 37:40])
-        set(gca, 'pos', get(gca, 'pos') + [ - 0.08 - 0.08 0.07 0.08])
+        set(gca, 'pos', get(gca, 'pos') + [ -0.08 - 0.08 0.07 0.08])
         field = 'Thickness'
 
@@ -158,5 +158,5 @@
 
         subplot(5, 9, [33:36 42:45])
-        set(gca, 'pos', get(gca, 'pos') + [ - 0.01 - 0.08 0.07 0.08])
+        set(gca, 'pos', get(gca, 'pos') + [ -0.01 - 0.08 0.07 0.08])
         field = 'Vel'
 
@@ -174,5 +174,5 @@
         subplot(5, 4, 1:4)
         cla
-        set(gca, 'pos', get(gca, 'pos') + [ - 0.07 0.03 0.12 0.015])
+        set(gca, 'pos', get(gca, 'pos') + [ -0.07 0.03 0.12 0.015])
         plot(starttime:endtime, mean(massbal), 'k', 'LineWidth', 4)
         hold on
@@ -185,5 +185,5 @@
         subplot(5, 4, 5:8)
         cla
-        set(gca, 'pos', get(gca, 'pos') + [ - 0.07 0.015 0.12 0.015])
+        set(gca, 'pos', get(gca, 'pos') + [ -0.07 0.015 0.12 0.015])
         plot(starttime:endtime, sum(volume) / 1000 / 1000 / 1000, 'LineWidth', 4)
         hold on
@@ -196,5 +196,5 @@
         subplot(5, 4, 9:12)
         cla
-        set(gca, 'pos', get(gca, 'pos') + [ - 0.07 0 0.12 0.015])
+        set(gca, 'pos', get(gca, 'pos') + [ -0.07 0 0.12 0.015])
         plot(starttime:endtime, mean(velocity) / 1000, 'LineWidth', 4)
         hold on