Merge branch 'master' of https://bitbucket.org/rcockett/simpeg into diffOperators

Conflicts:
	SimPEG/sputils.py

Resolved conflicts.

SimPEG/sputils.py

@@ -1,13 +1,15 @@
 import numpy as np
 from scipy import sparse
+from numpy import ones
+
 
 def ddx(n):
     """Define 1D derivatives"""
     return sparse.spdiags((np.ones((n+1,1))*[-1,1]).T, [0,1], n, n+1, format="csr")
-    
+
 def sdiag(h):
     """Sparse diagonal matrix"""
-    return sparse.spdiags(h, 0, np.size(h), np.size(h), format="csr")    
+    return sparse.spdiags(h, 0, np.size(h), np.size(h), format="csr")
 
 def speye(n):
     """Sparse identity"""
@@ -23,4 +25,55 @@ def spzeros(n1, n2):
 
 def av(n):
     """Define 1D averaging operator"""
-    return sparse.spdiags((0.5*np.ones((n+1,1))*[1,1]).T, [0,1], n, n+1, format="csr")
+    return sparse.spdiags((0.5*np.ones((n+1,1))*[1,1]).T, [0,1], n, n+1, format="csr")
+
+def av(n):
+    """Define 1D average"""
+    return 0.5*(sparse.spdiags(ones(n+1), 0, n, n+1) + sparse.spdiags(ones(n+1), 1, n, n+1))
+
+def spzeros(n1, n2):
+    """spzeros"""
+    return sparse.coo_matrix((n1, n2))
+
+def appendBottom(A, B):
+    """append on bottom"""
+    C = sparse.vstack((A, B))
+    C = C.tocsr()
+    return C
+
+
+def appendBottom3(A, B, C):
+    """append on bottom"""
+    C = appendBottom(appendBottom(A, B), C)
+    C = C.tocsr()
+    return C
+
+
+def appendRight(A, B):
+    """append on right"""
+    C = sparse.hstack((A, B))
+    C = C.tocsr()
+    return C
+
+
+def appendRight3(A, B, C):
+    """append on right"""
+    C = appendRight(appendRight(A, B), C)
+    C = C.tocsr()
+    return C
+
+
+def blkDiag(A, B):
+    """blockdigonal"""
+    O12 = sparse.coo_matrix((np.shape(A)[0], np.shape(B)[1]))
+    O21 = sparse.coo_matrix((np.shape(B)[0], np.shape(A)[1]))
+    C = sparse.vstack((sparse.hstack((A, O12)), sparse.hstack((O21, B))))
+    C = C.tocsr()
+    return C
+
+
+def blkDiag3(A, B, C):
+    """blockdigonal 3"""
+    ABC = blkDiag(blkDiag(A, B), C)
+    ABC = ABC.tocsr()
+    return ABC