Merge branch 'release' into pbrubeck/merge-release

Author: pbrubeck

pyop2/types/mat.py

@@ -1166,7 +1166,7 @@ def mult(self, mat, x, y):
                 # Column matrix
                 if x.sizes[1] == 1:
                     v.copy(y)
-                    a = np.zeros(1, dtype=dtypes.ScalarType)
+                    a = np.zeros((), dtype=dtypes.ScalarType)
                     if x.comm.rank == 0:
                         a[...] = x.array_r
                     else:
@@ -1183,7 +1183,7 @@ def multTranspose(self, mat, x, y):
                 # Row matrix
                 if x.sizes[1] == 1:
                     v.copy(y)
-                    a = np.zeros(1, dtype=dtypes.ScalarType)
+                    a = np.zeros((), dtype=dtypes.ScalarType)
                     if x.comm.rank == 0:
                         a[...] = x.array_r
                     else:
@@ -1208,7 +1208,7 @@ def multTransposeAdd(self, mat, x, y, z):
                 # Row matrix
                 if x.sizes[1] == 1:
                     v.copy(z)
-                    a = np.zeros(1, dtype=dtypes.ScalarType)
+                    a = np.zeros((), dtype=dtypes.ScalarType)
                     if x.comm.rank == 0:
                         a[...] = x.array_r
                     else: