Initial Cleanup of Code.

No major changes. (duplicate code, and python conventions)
This commit is contained in:
Rowan Cockett
2013-06-11 16:18:15 +02:00
parent 2554318427
commit 1251440021
9 changed files with 436 additions and 465 deletions
+9 -10
View File
@@ -1,12 +1,11 @@
from scipy.sparse import linalg
from utils import *
from sputils import *
def inv3X3BlockDiagonal(a11,a12,a13,a21,a22,a23,a31,a32,a33):
def inv3X3BlockDiagonal(a11, a12, a13, a21, a22, a23, a31, a32, a33):
a11 = mkvc(a11)
a12 = mkvc(a12)
a11 = mkvc(a11)
a12 = mkvc(a12)
a13 = mkvc(a13)
a21 = mkvc(a21)
a22 = mkvc(a22)
@@ -17,16 +16,16 @@ def inv3X3BlockDiagonal(a11,a12,a13,a21,a22,a23,a31,a32,a33):
detA = a31*a12*a23 - a31*a13*a22 - a21*a12*a33 + a21*a13*a32 + a11*a22*a33 - a11*a23*a32
b11 = (a22*a33 - a23*a32)/detA
b11 = +(a22*a33 - a23*a32)/detA
b12 = -(a12*a33 - a13*a32)/detA
b13 = (a12*a23 - a13*a22)/detA
b13 = +(a12*a23 - a13*a22)/detA
b21 = (a31*a23 - a21*a33)/detA
b21 = +(a31*a23 - a21*a33)/detA
b22 = -(a31*a13 - a11*a33)/detA
b23 = (a21*a13 - a11*a23)/detA
b23 = +(a21*a13 - a11*a23)/detA
b31 = -(a31*a22 - a21*a32)/detA
b32 = (a31*a12 - a11*a32)/detA
b32 = +(a31*a12 - a11*a32)/detA
b33 = -(a21*a12 - a11*a22)/detA
B = appendBottom3(
@@ -34,4 +33,4 @@ def inv3X3BlockDiagonal(a11,a12,a13,a21,a22,a23,a31,a32,a33):
appendRight3(sdiag(b21), sdiag(b22), sdiag(b23)),
appendRight3(sdiag(b31), sdiag(b32), sdiag(b33)))
return B
return B