Implemented the C matrix construction.

larsgeb · Mar 21, 2018 · 084a8e8 · 084a8e8
1 parent 5d1fcf4
commit 084a8e8
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/matrices.py b/matrices.py
@@ -3,10 +3,13 @@
 import scipy.sparse as sparse
 
 
-def constructC(dxOpTemp, rhsDxOpTemp, dyOpTemp, rhsDyOpTemp, psi, dxOpPsi, dyOpPsi, sqrtRa):
+def constructC(dxOpTemp, rhsDxOpTemp, dyOpTemp, rhsDyOpTemp, dlOpTemp, rhsDlOpTemp, psi, dxOpPsi, dyOpPsi, sqrtRa):
 
-    rhs = sqrtRa * (rhsDxOpTemp * (dyOpPsi * psi) - rhsDyOpTemp * (dxOpPsi * psi))
+    dxPsi = sparse.diags((dxOpPsi @ psi)[:, 0], 0)
+    dyPsi = sparse.diags((dyOpPsi @ psi)[:, 0], 0)
 
-    return sqrtRa * (
-            sparse.diags([(dxOpTemp * dyOpPsi * psi)[:, 0]], [0]) - sparse.diags([(dxOpPsi * psi)[:, 0]], [0])), rhs
-    # return 0
+    C = sqrtRa * (dyPsi @ dxOpTemp - dxPsi @ dyOpTemp ) - dlOpTemp
+
+    rhsC = - rhsDlOpTemp + sqrtRa * (dyPsi @ rhsDxOpTemp- dyPsi @ rhsDyOpTemp)
+
+    return C,rhsC