Merge branch 'dev' into docs

This commit is contained in:
Lindsey Heagy
2016-03-06 21:50:27 -08:00
66 changed files with 6439 additions and 126 deletions
-1
View File
@@ -746,4 +746,3 @@ class DiffOperators(object):
kron3(av(n[2]), speye(n[1]+1), av(n[0])),
kron3(speye(n[2]+1), av(n[1]), av(n[0]))), format="csr")
return self._aveN2F