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

Only apply timestep after event at the beginning of an episode

Browse Source
This commit is contained in:
Tor Harald Sandve 2019-06-20 15:42:48 +02:00
parent f4efd464f4
commit 4b1544469d
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ebos/eclproblem.hh
View File

@ -3072,10 +3072,6 @@ private:
// first thing in the morning, limit the time step size to the maximum size // first thing in the morning, limit the time step size to the maximum size
dtNext = std::min(dtNext, maxTimeStepSize_); dtNext = std::min(dtNext, maxTimeStepSize_);
// use at least slightly more than half of the maximum time step size by default
if (dtNext < maxTimeStepSize_ && maxTimeStepSize_ < dtNext*2)
dtNext = 1.01 * maxTimeStepSize_/2.0;
Scalar remainingEpisodeTime = Scalar remainingEpisodeTime =
simulator.episodeStartTime() + simulator.episodeLength() simulator.episodeStartTime() + simulator.episodeLength()
- (simulator.startTime() + simulator.time()); - (simulator.startTime() + simulator.time());
@ -3088,6 +3084,7 @@ private:
// necessary, but it should not hurt and is more fool-proof // necessary, but it should not hurt and is more fool-proof
dtNext = std::min(maxTimeStepSize_, remainingEpisodeTime/2.0); dtNext = std::min(maxTimeStepSize_, remainingEpisodeTime/2.0);
if (simulator.episodeStarts()) {
// if a well event occured, respect the limit for the maximum time step after // if a well event occured, respect the limit for the maximum time step after
// that, too // that, too
int reportStepIdx = std::max(episodeIdx, 0); int reportStepIdx = std::max(episodeIdx, 0);
@ -3098,6 +3095,7 @@ private:
|| events.hasEvent(Opm::ScheduleEvents::WELL_STATUS_CHANGE, reportStepIdx); || events.hasEvent(Opm::ScheduleEvents::WELL_STATUS_CHANGE, reportStepIdx);
if (episodeIdx >= 0 && wellEventOccured && maxTimeStepAfterWellEvent_ > 0) if (episodeIdx >= 0 && wellEventOccured && maxTimeStepAfterWellEvent_ > 0)
dtNext = std::min(dtNext, maxTimeStepAfterWellEvent_); dtNext = std::min(dtNext, maxTimeStepAfterWellEvent_);
}
return dtNext; return dtNext;
} }