From 16ffafa61645cc7f8761dcdeda98cb862aab6ed3 Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de> Date: Fri, 10 Nov 2017 21:03:29 +0100 Subject: [PATCH] [staggered][fvAssembler] Fix matrix types * types were switched --- dumux/assembly/staggeredfvassembler.hh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dumux/assembly/staggeredfvassembler.hh b/dumux/assembly/staggeredfvassembler.hh index 1fa58bafeb..1ab803e6c0 100644 --- a/dumux/assembly/staggeredfvassembler.hh +++ b/dumux/assembly/staggeredfvassembler.hh @@ -251,13 +251,13 @@ public: // convenience references CCToCCMatrixBlock& A11 = (*jacobian_)[cellCenterIdx][cellCenterIdx]; CCToFaceMatrixBlock& A12 = (*jacobian_)[cellCenterIdx][faceIdx]; - FaceToFaceMatrixBlock& A21 = (*jacobian_)[faceIdx][cellCenterIdx]; - FaceToCCMatrixBlock& A22 = (*jacobian_)[faceIdx][faceIdx]; + FaceToCCMatrixBlock& A21 = (*jacobian_)[faceIdx][cellCenterIdx]; + FaceToFaceMatrixBlock& A22 = (*jacobian_)[faceIdx][faceIdx]; A11.setBuildMode(CCToCCMatrixBlock::random); A12.setBuildMode(CCToFaceMatrixBlock::random); - A21.setBuildMode(FaceToFaceMatrixBlock::random); - A22.setBuildMode(FaceToCCMatrixBlock::random); + A21.setBuildMode(FaceToCCMatrixBlock::random); + A22.setBuildMode(FaceToFaceMatrixBlock::random); setJacobianPattern(); setResidualSize(); @@ -281,13 +281,13 @@ public: // convenience references CCToCCMatrixBlock& A11 = (*jacobian_)[cellCenterIdx][cellCenterIdx]; CCToFaceMatrixBlock& A12 = (*jacobian_)[cellCenterIdx][faceIdx]; - FaceToFaceMatrixBlock& A21 = (*jacobian_)[faceIdx][cellCenterIdx]; - FaceToCCMatrixBlock& A22 = (*jacobian_)[faceIdx][faceIdx]; + FaceToCCMatrixBlock& A21 = (*jacobian_)[faceIdx][cellCenterIdx]; + FaceToFaceMatrixBlock& A22 = (*jacobian_)[faceIdx][faceIdx]; A11.setBuildMode(CCToCCMatrixBlock::random); A12.setBuildMode(CCToFaceMatrixBlock::random); - A21.setBuildMode(FaceToFaceMatrixBlock::random); - A22.setBuildMode(FaceToCCMatrixBlock::random); + A21.setBuildMode(FaceToCCMatrixBlock::random); + A22.setBuildMode(FaceToFaceMatrixBlock::random); residual_ = std::make_shared<SolutionVector>(); @@ -321,8 +321,8 @@ public: // convenience references CCToCCMatrixBlock& A11 = (*jacobian_)[cellCenterIdx][cellCenterIdx]; CCToFaceMatrixBlock& A12 = (*jacobian_)[cellCenterIdx][faceIdx]; - FaceToFaceMatrixBlock& A21 = (*jacobian_)[faceIdx][cellCenterIdx]; - FaceToCCMatrixBlock& A22 = (*jacobian_)[faceIdx][faceIdx]; + FaceToCCMatrixBlock& A21 = (*jacobian_)[faceIdx][cellCenterIdx]; + FaceToFaceMatrixBlock& A22 = (*jacobian_)[faceIdx][faceIdx]; // set the size of the sub-matrizes A11.setSize(numDofsCC, numDofsCC); -- GitLab