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

Refactor Aquifer datastructures to follow opm-common

Browse Source 
- Replace use of Base:: with this-> in derived classes
- Add AquiferInterface::size() utility functions
- Remove AquiferInterface::cell_idx_ member
This commit is contained in:
Joakim Hove
2020-02-10 17:39:04 +01:00
parent 76682497e8
commit 3a7f5799af
4 changed files with 109 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,20 +158,15 @@ BlackoilAquiferModel<TypeTag>::init()
const AquiferCT aquiferct = AquiferCT(eclState.getTableManager(), deck);
const Aquancon aquifer_connect = Aquancon(eclState.getInputGrid(), deck);
std::vector<AquiferCT::AQUCT_data> aquifersData = aquiferct.data();
std::vector<Aquancon::AquanconOutput> aquifer_connection = aquifer_connect.getAquOutput();
assert(aquifersData.size() == aquifer_connection.size());
const auto& ugrid = simulator_.vanguard().grid();
const auto& gridView = simulator_.gridView();
const int number_of_cells = gridView.size(0);
cartesian_to_compressed_ = cartesianToCompressed(number_of_cells, Opm::UgGridHelpers::globalCell(ugrid));
for (size_t i = 0; i < aquifersData.size(); ++i) {
aquifers_CarterTracy.push_back(AquiferCarterTracy<TypeTag>(
aquifer_connection[i], cartesian_to_compressed_, this->simulator_, aquifersData[i]));
}
for (const auto& aquifer : aquiferct)
aquifers_CarterTracy.push_back(AquiferCarterTracy<TypeTag>(aquifer_connect[aquifer.aquiferID], cartesian_to_compressed_, this->simulator_, aquifer));
}
if (comm.rank() == 0)
has = deck.hasKeyword("AQUFETP");
@@ -188,20 +183,15 @@ BlackoilAquiferModel<TypeTag>::init()
const Aquifetp aquifetp = Aquifetp(deck);
const Aquancon aquifer_connect = Aquancon(eclState.getInputGrid(), deck);
std::vector<Aquifetp::AQUFETP_data> aquifersData = aquifetp.data();
std::vector<Aquancon::AquanconOutput> aquifer_connection = aquifer_connect.getAquOutput();
assert(aquifersData.size() == aquifer_connection.size());
const auto& ugrid = simulator_.vanguard().grid();
const auto& gridView = simulator_.gridView();
const int number_of_cells = gridView.size(0);
cartesian_to_compressed_ = cartesianToCompressed(number_of_cells, Opm::UgGridHelpers::globalCell(ugrid));
for (size_t i = 0; i < aquifersData.size(); ++i) {
aquifers_Fetkovich.push_back(AquiferFetkovich<TypeTag>(
aquifer_connection[i], cartesian_to_compressed_, this->simulator_, aquifersData[i]));
}
for (const auto& aquifer : aquifetp)
aquifers_Fetkovich.push_back(AquiferFetkovich<TypeTag>(aquifer_connect[aquifer.aquiferID], cartesian_to_compressed_, this->simulator_, aquifer));
}
}
template <typename TypeTag>