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 from totto82/updateAndInvalid

Browse Source 
Invalidate and update the intensive quantities at the same time
This commit is contained in:
Atgeirr Flø Rasmussen 2020-09-28 09:02:25 +02:00 committed by GitHub
commit e8460b384e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
ebos
eclproblem.hh
opm/simulators/flow
BlackoilModelEbos.hpp

5
ebos/eclproblem.hh
View File

@ -1059,9 +1059,8 @@ public:
// if TUNING is enabled, also limit the time step size after a tuning event to TSINIT
dt = std::min(dt, initialTimeStepSize_);
simulator.setTimeStepSize(dt);
if (doInvalidate)
this->model().invalidateIntensiveQuantitiesCache(/*timeIdx=*/0);
this->model().invalidateAndUpdateIntensiveQuantities(/*timeIdx=*/0);
}
/*!
@ -1104,7 +1103,7 @@ public:
invalidateIntensiveQuantities = invalidateFromMaxWaterSat || invalidateFromMinPressure;
if (invalidateIntensiveQuantities)
this->model().invalidateIntensiveQuantitiesCache(/*timeIdx=*/0);
this->model().invalidateAndUpdateIntensiveQuantities(/*timeIdx=*/0);
wellModel_.beginTimeStep();
if (enableAquifers_)

2
opm/simulators/flow/BlackoilModelEbos.hpp
View File

@ -553,7 +553,7 @@ namespace Opm {
// residual
// if the solution is updated, the intensive quantities need to be recalculated
ebosSimulator_.model().invalidateIntensiveQuantitiesCache(/*timeIdx=*/0);
ebosSimulator_.model().invalidateAndUpdateIntensiveQuantities(/*timeIdx=*/0);
}
/// Return true if output to cout is wanted.