OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2319 from joakim-hove/aquifer-reactor

Browse Source 
Aquifer refactor
This commit is contained in:
Joakim Hove 2020-02-07 14:28:10 +01:00 committed by GitHub
commit ac72e49a41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/simulators/aquifers/AquiferCarterTracy.hpp
View File

@ -212,10 +212,10 @@ protected:
int pvttableIdx = aquct_data_.pvttableID - 1; int pvttableIdx = aquct_data_.pvttableID - 1;
Base::rhow_.resize(Base::cell_idx_.size(), 0.); Base::rhow_.resize(Base::cell_idx_.size(), 0.);
if (!aquct_data_.p0) { if (!aquct_data_.p0.first) {
Base::pa0_ = calculateReservoirEquilibrium(); Base::pa0_ = calculateReservoirEquilibrium();
} else { } else {
Base::pa0_ = *(aquct_data_.p0); Base::pa0_ = aquct_data_.p0.second;
} }
// use the thermodynamic state of the first active cell as a // use the thermodynamic state of the first active cell as a

4
opm/simulators/aquifers/AquiferFetkovich.hpp
View File

@ -207,10 +207,10 @@ protected:
return; return;
} }
if (!aqufetp_data_.p0) { if (!aqufetp_data_.p0.first) {
Base::pa0_ = calculateReservoirEquilibrium(); Base::pa0_ = calculateReservoirEquilibrium();
} else { } else {
Base::pa0_ = *(aqufetp_data_.p0); Base::pa0_ = aqufetp_data_.p0.second;
} }
aquifer_pressure_ = Base::pa0_; aquifer_pressure_ = Base::pa0_;
} }

10
opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp
View File

@ -155,10 +155,10 @@ BlackoilAquiferModel<TypeTag>::init()
const auto& eclState = this->simulator_.vanguard().eclState(); const auto& eclState = this->simulator_.vanguard().eclState();
// Get all the carter tracy aquifer properties data and put it in aquifers vector // 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); const Aquancon aquifer_connect = Aquancon(eclState.getInputGrid(), deck);
std::vector<AquiferCT::AQUCT_data> aquifersData = aquiferct.getAquifers(); std::vector<AquiferCT::AQUCT_data> aquifersData = aquiferct.data();
std::vector<Aquancon::AquanconOutput> aquifer_connection = aquifer_connect.getAquOutput(); std::vector<Aquancon::AquanconOutput> aquifer_connection = aquifer_connect.getAquOutput();
assert(aquifersData.size() == aquifer_connection.size()); assert(aquifersData.size() == aquifer_connection.size());
@ -170,7 +170,7 @@ BlackoilAquiferModel<TypeTag>::init()
for (size_t i = 0; i < aquifersData.size(); ++i) { for (size_t i = 0; i < aquifersData.size(); ++i) {
aquifers_CarterTracy.push_back(AquiferCarterTracy<TypeTag>( aquifers_CarterTracy.push_back(AquiferCarterTracy<TypeTag>(
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) if (comm.rank() == 0)
@ -188,7 +188,7 @@ BlackoilAquiferModel<TypeTag>::init()
const Aquifetp aquifetp = Aquifetp(deck); const Aquifetp aquifetp = Aquifetp(deck);
const Aquancon aquifer_connect = Aquancon(eclState.getInputGrid(), deck); const Aquancon aquifer_connect = Aquancon(eclState.getInputGrid(), deck);
std::vector<Aquifetp::AQUFETP_data> aquifersData = aquifetp.getAquifers(); std::vector<Aquifetp::AQUFETP_data> aquifersData = aquifetp.data();
std::vector<Aquancon::AquanconOutput> aquifer_connection = aquifer_connect.getAquOutput(); std::vector<Aquancon::AquanconOutput> aquifer_connection = aquifer_connect.getAquOutput();
assert(aquifersData.size() == aquifer_connection.size()); assert(aquifersData.size() == aquifer_connection.size());
@ -200,7 +200,7 @@ BlackoilAquiferModel<TypeTag>::init()
for (size_t i = 0; i < aquifersData.size(); ++i) { for (size_t i = 0; i < aquifersData.size(); ++i) {
aquifers_Fetkovich.push_back(AquiferFetkovich<TypeTag>( aquifers_Fetkovich.push_back(AquiferFetkovich<TypeTag>(
aquifer_connection.at(i), cartesian_to_compressed_, this->simulator_, aquifersData.at(i))); aquifer_connection[i], cartesian_to_compressed_, this->simulator_, aquifersData[i]));
} }
} }
} }