Merge pull request #2672 from akva2/fix_harmless_ubsan

changed: delay deck dereference
This commit is contained in:
Atgeirr Flø Rasmussen 2020-06-15 10:42:44 +02:00 committed by GitHub
commit 16a599684d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -279,7 +279,6 @@ private:
const auto& gridView = vanguard.gridView(); const auto& gridView = vanguard.gridView();
const auto& elementMapper = simulator_.model().elementMapper(); const auto& elementMapper = simulator_.model().elementMapper();
const auto& eclState = simulator_.vanguard().eclState(); const auto& eclState = simulator_.vanguard().eclState();
const auto& deck = simulator_.vanguard().deck();
const Opm::SimulationConfig& simConfig = eclState.getSimulationConfig(); const Opm::SimulationConfig& simConfig = eclState.getSimulationConfig();
const auto& thpres = simConfig.getThresholdPressure(); const auto& thpres = simConfig.getThresholdPressure();
@ -334,6 +333,7 @@ private:
if (enableExperiments) { if (enableExperiments) {
// apply threshold pressures accross faults (experimental!) // apply threshold pressures accross faults (experimental!)
const auto& deck = simulator_.vanguard().deck();
if (deck.hasKeyword("THPRESFT")) if (deck.hasKeyword("THPRESFT"))
extractThpresft_(deck.getKeyword("THPRESFT")); extractThpresft_(deck.getKeyword("THPRESFT"));
} }