Merge pull request #2804 from totto82/updateAndInvalid

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
2 changed files with 3 additions and 4 deletions
+2 -3
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_)