From 638f795928454e926cf2490f63bc675a5c47d511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= <dennis.glaeser@iws.uni-stuttgart.de>
Date: Mon, 19 Nov 2018 12:07:13 +0100
Subject: [PATCH] [mpfa][iv] remove obsolete matrices
All matrices are now stored in the data handles
---
.../mpfa/omethod/interactionvolume.hh | 22 -------------------
.../mpfa/omethod/staticinteractionvolume.hh | 22 -------------------
2 files changed, 44 deletions(-)
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh b/dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh
index 4ed30d9eec..2dd239e6cb 100644
--- a/dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh
+++ b/dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh
@@ -249,11 +249,6 @@ public:
}
}
}
-
- // Maybe resize local matrices if dynamic types are used
- resizeMatrix(A_, numUnknowns_, numUnknowns_);
- resizeMatrix(B_, numUnknowns_, numKnowns_);
- resizeMatrix(C_, numFaces_, numUnknowns_);
}
//! returns the number of primary scvfs of this interaction volume
@@ -296,18 +291,6 @@ public:
const std::vector<DirichletData>& dirichletData() const
{ return dirichletData_; }
- //! returns the matrix associated with face unknowns in local equation system
- const AMatrix& A() const { return A_; }
- AMatrix& A() { return A_; }
-
- //! returns the matrix associated with cell unknowns in local equation system
- const BMatrix& B() const { return B_; }
- BMatrix& B() { return B_; }
-
- //! returns the matrix associated with face unknowns in flux expressions
- const CMatrix& C() const { return C_; }
- CMatrix& C() { return C_; }
-
//! returns container storing the transmissibilities for each face & coordinate
const TransmissibilityStorage& omegas() const { return wijk_; }
TransmissibilityStorage& omegas() { return wijk_; }
@@ -349,11 +332,6 @@ private:
std::vector<LocalFaceData> localFaceData_;
std::vector<DirichletData> dirichletData_;
- // Matrices needed for computation of transmissibilities
- AMatrix A_;
- BMatrix B_;
- CMatrix C_;
-
// The omega factors are stored during assembly of local system
TransmissibilityStorage wijk_;
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/staticinteractionvolume.hh b/dumux/discretization/cellcentered/mpfa/omethod/staticinteractionvolume.hh
index c27a3f0598..cfd6891edc 100644
--- a/dumux/discretization/cellcentered/mpfa/omethod/staticinteractionvolume.hh
+++ b/dumux/discretization/cellcentered/mpfa/omethod/staticinteractionvolume.hh
@@ -207,11 +207,6 @@ public:
// make sure we found it
assert(localFaceData_[faceIdxLocal*2+1].ivLocalInsideScvIndex() == outsideLocalScvIdx);
}
-
- // Maybe resize local matrices if dynamic types are used
- resizeMatrix(A_, numScvf, numScvf);
- resizeMatrix(B_, numScvf, numScv);
- resizeMatrix(C_, numScvf, numScv);
}
//! returns the number of primary scvfs of this interaction volume
@@ -255,18 +250,6 @@ public:
const std::array<DirichletData, 0>& dirichletData() const
{ return dirichletData_; }
- //! returns the matrix associated with face unknowns in local equation system
- const AMatrix& A() const { return A_; }
- AMatrix& A() { return A_; }
-
- //! returns the matrix associated with cell unknowns in local equation system
- const BMatrix& B() const { return B_; }
- BMatrix& B() { return B_; }
-
- //! returns the matrix associated with face unknowns in flux expressions
- const CMatrix& C() const { return C_; }
- CMatrix& C() { return C_; }
-
//! returns container storing the transmissibilities for each face & coordinate
const TransmissibilityStorage& omegas() const { return wijk_; }
TransmissibilityStorage& omegas() { return wijk_; }
@@ -308,11 +291,6 @@ private:
std::array<LocalScvfType, numScvf> scvfs_;
std::array<LocalFaceData, numScvf*2> localFaceData_;
- // Matrices needed for computation of transmissibilities
- AMatrix A_;
- BMatrix B_;
- CMatrix C_;
-
// The omega factors are stored during assembly of local system
TransmissibilityStorage wijk_;
--
GitLab