OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2310 from akva2/noecl_small_stuff

Browse Source 
Preparatory changes for single-process parsing
This commit is contained in:
Markus Blatt
2020-01-30 09:13:14 +01:00
committed by GitHub
parent 2a131bc46c 75f2b34ba6
commit daa8f778bb
3 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp
+19 -2
View File
@@ -140,7 +140,17 @@ void
BlackoilAquiferModel<TypeTag>::init()
{
const auto& deck = this->simulator_.vanguard().deck();
if (deck.hasKeyword("AQUCT")) {
const auto& comm = this->simulator_.vanguard().gridView().comm();
bool has;
if (comm.rank() == 0)
has = deck.hasKeyword("AQUCT");
comm.broadcast(&has, 1, 0);
if (has) {
if (comm.size() > 1)
throw std::runtime_error("Aquifers currently do not work in parallel.");
// updateConnectionIntensiveQuantities();
const auto& eclState = this->simulator_.vanguard().eclState();
@@ -163,7 +173,14 @@ BlackoilAquiferModel<TypeTag>::init()
aquifer_connection.at(i), cartesian_to_compressed_, this->simulator_, aquifersData.at(i)));
}
}
if (deck.hasKeyword("AQUFETP")) {
if (comm.rank() == 0)
has = deck.hasKeyword("AQUFETP");
comm.broadcast(&has, 1, 0);
if (has) {
if (comm.size() > 1)
throw std::runtime_error("Aquifers currently do not work in parallel.");
// updateConnectionIntensiveQuantities();
const auto& eclState = this->simulator_.vanguard().eclState();