From 1c4021f0a353301008752703041cea3c7bcc3353 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 5 Feb 2020 22:58:05 +0100 Subject: [PATCH 1/4] Use TableManager in AquiferCT constructor --- opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp index 80594b909..bbed46e8c 100644 --- a/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp +++ b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp @@ -155,7 +155,7 @@ BlackoilAquiferModel::init() const auto& eclState = this->simulator_.vanguard().eclState(); // Get all the carter tracy aquifer properties data and put it in aquifers vector - const AquiferCT aquiferct = AquiferCT(eclState, deck); + const AquiferCT aquiferct = AquiferCT(eclState.getTableManager(), deck); const Aquancon aquifer_connect = Aquancon(eclState.getInputGrid(), deck); std::vector aquifersData = aquiferct.getAquifers(); From e910ebe738ac20059103487c90bb35c274a197ba Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 5 Feb 2020 22:51:35 +0100 Subject: [PATCH 2/4] Aquifer accessor renamed --- opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp index bbed46e8c..a7cf379aa 100644 --- a/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp +++ b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp @@ -158,7 +158,7 @@ BlackoilAquiferModel::init() const AquiferCT aquiferct = AquiferCT(eclState.getTableManager(), deck); const Aquancon aquifer_connect = Aquancon(eclState.getInputGrid(), deck); - std::vector aquifersData = aquiferct.getAquifers(); + std::vector aquifersData = aquiferct.data(); std::vector aquifer_connection = aquifer_connect.getAquOutput(); assert(aquifersData.size() == aquifer_connection.size()); @@ -188,7 +188,7 @@ BlackoilAquiferModel::init() const Aquifetp aquifetp = Aquifetp(deck); const Aquancon aquifer_connect = Aquancon(eclState.getInputGrid(), deck); - std::vector aquifersData = aquifetp.getAquifers(); + std::vector aquifersData = aquifetp.data(); std::vector aquifer_connection = aquifer_connect.getAquOutput(); assert(aquifersData.size() == aquifer_connection.size()); From cb8a76d098e68e84cdbfb3371c153f8c0d651d3e Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 5 Feb 2020 22:50:28 +0100 Subject: [PATCH 3/4] Use [i] instead of at(i) when accessing Aquifer container --- opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp index a7cf379aa..58a82199f 100644 --- a/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp +++ b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp @@ -170,7 +170,7 @@ BlackoilAquiferModel::init() for (size_t i = 0; i < aquifersData.size(); ++i) { aquifers_CarterTracy.push_back(AquiferCarterTracy( - aquifer_connection.at(i), cartesian_to_compressed_, this->simulator_, aquifersData.at(i))); + aquifer_connection[i], cartesian_to_compressed_, this->simulator_, aquifersData[i])); } } if (comm.rank() == 0) @@ -200,7 +200,7 @@ BlackoilAquiferModel::init() for (size_t i = 0; i < aquifersData.size(); ++i) { aquifers_Fetkovich.push_back(AquiferFetkovich( - aquifer_connection.at(i), cartesian_to_compressed_, this->simulator_, aquifersData.at(i))); + aquifer_connection[i], cartesian_to_compressed_, this->simulator_, aquifersData[i])); } } } From 0e1a210ef2acf21ba1f81860879f478368714ee3 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 5 Feb 2020 22:51:54 +0100 Subject: [PATCH 4/4] Use std::pair for initial aquifer pressure --- opm/simulators/aquifers/AquiferCarterTracy.hpp | 4 ++-- opm/simulators/aquifers/AquiferFetkovich.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opm/simulators/aquifers/AquiferCarterTracy.hpp b/opm/simulators/aquifers/AquiferCarterTracy.hpp index 5e2a56e49..c523f28e3 100644 --- a/opm/simulators/aquifers/AquiferCarterTracy.hpp +++ b/opm/simulators/aquifers/AquiferCarterTracy.hpp @@ -212,10 +212,10 @@ protected: int pvttableIdx = aquct_data_.pvttableID - 1; Base::rhow_.resize(Base::cell_idx_.size(), 0.); - if (!aquct_data_.p0) { + if (!aquct_data_.p0.first) { Base::pa0_ = calculateReservoirEquilibrium(); } else { - Base::pa0_ = *(aquct_data_.p0); + Base::pa0_ = aquct_data_.p0.second; } // use the thermodynamic state of the first active cell as a diff --git a/opm/simulators/aquifers/AquiferFetkovich.hpp b/opm/simulators/aquifers/AquiferFetkovich.hpp index af09ec6ec..fd5383975 100644 --- a/opm/simulators/aquifers/AquiferFetkovich.hpp +++ b/opm/simulators/aquifers/AquiferFetkovich.hpp @@ -207,10 +207,10 @@ protected: return; } - if (!aqufetp_data_.p0) { + if (!aqufetp_data_.p0.first) { Base::pa0_ = calculateReservoirEquilibrium(); } else { - Base::pa0_ = *(aqufetp_data_.p0); + Base::pa0_ = aqufetp_data_.p0.second; } aquifer_pressure_ = Base::pa0_; }