From 3c77b97cae528bcc389aa71e8e6002d489daf9c3 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 30 Apr 2021 12:23:46 +0200 Subject: [PATCH] MultisegmentWellContribution: remove unused members --- .../linalg/bda/MultisegmentWellContribution.cpp | 7 ++----- .../linalg/bda/MultisegmentWellContribution.hpp | 9 ++------- opm/simulators/linalg/bda/WellContributions.cpp | 8 +++----- opm/simulators/linalg/bda/WellContributions.hpp | 7 ++----- opm/simulators/wells/MultisegmentWell_impl.hpp | 3 +-- 5 files changed, 10 insertions(+), 24 deletions(-) diff --git a/opm/simulators/linalg/bda/MultisegmentWellContribution.cpp b/opm/simulators/linalg/bda/MultisegmentWellContribution.cpp index 0e6cb2e47..42f763ef2 100644 --- a/opm/simulators/linalg/bda/MultisegmentWellContribution.cpp +++ b/opm/simulators/linalg/bda/MultisegmentWellContribution.cpp @@ -30,19 +30,16 @@ namespace Opm { MultisegmentWellContribution::MultisegmentWellContribution(unsigned int dim_, unsigned int dim_wells_, - unsigned int Nb_, unsigned int Mb_, - unsigned int BnumBlocks_, std::vector &Bvalues, std::vector &BcolIndices, std::vector &BrowPointers, + unsigned int Mb_, + std::vector &Bvalues, std::vector &BcolIndices, std::vector &BrowPointers, unsigned int DnumBlocks_, double *Dvalues, UMFPackIndex *DcolPointers, UMFPackIndex *DrowIndices, std::vector &Cvalues) : dim(dim_), // size of blockvectors in vectors x and y, equal to MultisegmentWell::numEq dim_wells(dim_wells_), // size of blocks in C, B and D, equal to MultisegmentWell::numWellEq - N(Nb_ * dim), // number of rows in vectors x and y, N == dim*Nb - Nb(Nb_), // number of blockrows in x and y M(Mb_ * dim_wells), // number of rows, M == dim_wells*Mb Mb(Mb_), // number of blockrows in C, D and B DnumBlocks(DnumBlocks_), // number of blocks in D - BnumBlocks(BnumBlocks_), // number of blocks in C and B // copy data for matrix D into vectors to prevent it going out of scope Dvals(Dvalues, Dvalues + DnumBlocks * dim_wells * dim_wells), Dcols(DcolPointers, DcolPointers + M + 1), diff --git a/opm/simulators/linalg/bda/MultisegmentWellContribution.hpp b/opm/simulators/linalg/bda/MultisegmentWellContribution.hpp index 3862b3840..a96f1106f 100644 --- a/opm/simulators/linalg/bda/MultisegmentWellContribution.hpp +++ b/opm/simulators/linalg/bda/MultisegmentWellContribution.hpp @@ -47,8 +47,6 @@ class MultisegmentWellContribution private: unsigned int dim; // size of blockvectors in vectors x and y, equal to MultisegmentWell::numEq unsigned int dim_wells; // size of blocks in C, B and D, equal to MultisegmentWell::numWellEq - unsigned int N; // number of rows in vectors x and y, N == dim*Nb - unsigned int Nb; // number of blockrows in x and y unsigned int M; // number of rows, M == dim_wells*Mb unsigned int Mb; // number of blockrows in C, D and B @@ -59,7 +57,6 @@ private: // C and B are stored in BCRS format, D is stored in CSC format (Dune::UMFPack) // Sparsity pattern for C is not stored, since it is the same as B unsigned int DnumBlocks; // number of blocks in D - unsigned int BnumBlocks; // number of blocks in C and B std::vector Cvals; std::vector Dvals; std::vector Bvals; @@ -97,9 +94,7 @@ public: /// The variables representing C, B and D will go out of scope when MultisegmentWell::addWellContribution() ends /// \param[in] dim size of blocks in blockvectors x and y, equal to MultisegmentWell::numEq /// \param[in] dim_wells size of blocks of C, B and D, equal to MultisegmentWell::numWellEq - /// \param[in] Nb number of blocks in vectors x and y /// \param[in] Mb number of blockrows in C, B and D - /// \param[in] BnumBlocks number of blocks in C and B /// \param[in] Bvalues nonzero values of matrix B /// \param[in] BcolIndices columnindices of blocks of matrix B /// \param[in] BrowPointers rowpointers of matrix B @@ -109,8 +104,8 @@ public: /// \param[in] DrowIndices rowindices of matrix D /// \param[in] Cvalues nonzero values of matrix C MultisegmentWellContribution(unsigned int dim, unsigned int dim_wells, - unsigned int Nb, unsigned int Mb, - unsigned int BnumBlocks, std::vector &Bvalues, std::vector &BcolIndices, std::vector &BrowPointers, + unsigned int Mb, + std::vector &Bvalues, std::vector &BcolIndices, std::vector &BrowPointers, unsigned int DnumBlocks, double *Dvalues, UMFPackIndex *DcolPointers, UMFPackIndex *DrowIndices, std::vector &Cvalues); diff --git a/opm/simulators/linalg/bda/WellContributions.cpp b/opm/simulators/linalg/bda/WellContributions.cpp index b6dc2b075..19fe818ac 100644 --- a/opm/simulators/linalg/bda/WellContributions.cpp +++ b/opm/simulators/linalg/bda/WellContributions.cpp @@ -253,15 +253,13 @@ void WellContributions::alloc() } void WellContributions::addMultisegmentWellContribution(unsigned int dim_, unsigned int dim_wells_, - unsigned int Nb_, unsigned int Mb, - unsigned int BnumBlocks, std::vector &Bvalues, std::vector &BcolIndices, std::vector &BrowPointers, + unsigned int Mb, + std::vector &Bvalues, std::vector &BcolIndices, std::vector &BrowPointers, unsigned int DnumBlocks, double *Dvalues, UMFPackIndex *DcolPointers, UMFPackIndex *DrowIndices, std::vector &Cvalues) { assert(dim==dim_); - this->Nb = Nb_; - this->N = Nb * dim_; - MultisegmentWellContribution *well = new MultisegmentWellContribution(dim_, dim_wells_, Nb, Mb, BnumBlocks, Bvalues, BcolIndices, BrowPointers, DnumBlocks, Dvalues, DcolPointers, DrowIndices, Cvalues); + MultisegmentWellContribution *well = new MultisegmentWellContribution(dim_, dim_wells_, Mb, Bvalues, BcolIndices, BrowPointers, DnumBlocks, Dvalues, DcolPointers, DrowIndices, Cvalues); multisegments.emplace_back(well); ++num_ms_wells; } diff --git a/opm/simulators/linalg/bda/WellContributions.hpp b/opm/simulators/linalg/bda/WellContributions.hpp index 5c93748c7..08607d6bc 100644 --- a/opm/simulators/linalg/bda/WellContributions.hpp +++ b/opm/simulators/linalg/bda/WellContributions.hpp @@ -81,7 +81,6 @@ private: bool allocated = false; unsigned int N; // number of rows (not blockrows) in vectors x and y - unsigned int Nb; // number of blockrows in vectors x and y unsigned int dim; // number of columns in blocks in B and C, equal to StandardWell::numEq unsigned int dim_wells; // number of rows in blocks in B and C, equal to StandardWell::numStaticWellEq unsigned int num_blocks = 0; // total number of blocks in all wells @@ -197,9 +196,7 @@ public: /// Matrices C and B are passed in Blocked CSR, matrix D in CSC /// \param[in] dim size of blocks in vectors x and y, equal to MultisegmentWell::numEq /// \param[in] dim_wells size of blocks of C, B and D, equal to MultisegmentWell::numWellEq - /// \param[in] Nb number of blocks in vectors x and y /// \param[in] Mb number of blockrows in C, B and D - /// \param[in] BnumBlocks number of blocks in C and B /// \param[in] Bvalues nonzero values of matrix B /// \param[in] BcolIndices columnindices of blocks of matrix B /// \param[in] BrowPointers rowpointers of matrix B @@ -209,8 +206,8 @@ public: /// \param[in] DrowIndices rowindices of matrix D /// \param[in] Cvalues nonzero values of matrix C void addMultisegmentWellContribution(unsigned int dim, unsigned int dim_wells, - unsigned int Nb, unsigned int Mb, - unsigned int BnumBlocks, std::vector &Bvalues, std::vector &BcolIndices, std::vector &BrowPointers, + unsigned int Mb, + std::vector &Bvalues, std::vector &BcolIndices, std::vector &BrowPointers, unsigned int DnumBlocks, double *Dvalues, UMFPackIndex *DcolPointers, UMFPackIndex *DrowIndices, std::vector &Cvalues); diff --git a/opm/simulators/wells/MultisegmentWell_impl.hpp b/opm/simulators/wells/MultisegmentWell_impl.hpp index c2a198a0a..68c9e1cd8 100644 --- a/opm/simulators/wells/MultisegmentWell_impl.hpp +++ b/opm/simulators/wells/MultisegmentWell_impl.hpp @@ -701,7 +701,6 @@ namespace Opm MultisegmentWell:: addWellContribution(WellContributions& wellContribs) const { - unsigned int Nb = duneB_.M(); // number of blockrows in matrix A unsigned int Mb = duneB_.N(); // number of blockrows in duneB_, duneC_ and duneD_ unsigned int BnumBlocks = duneB_.nonzeroes(); unsigned int DnumBlocks = duneD_.nonzeroes(); @@ -752,7 +751,7 @@ namespace Opm Brows.emplace_back(sumBlocks); } - wellContribs.addMultisegmentWellContribution(numEq, numWellEq, Nb, Mb, BnumBlocks, Bvals, Bcols, Brows, DnumBlocks, Dvals, Dcols, Drows, Cvals); + wellContribs.addMultisegmentWellContribution(numEq, numWellEq, Mb, Bvals, Bcols, Brows, DnumBlocks, Dvals, Dcols, Drows, Cvals); } #endif