OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-16 20:24:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

ECL problem: fix the episode handling code

Browse Source 
now the report steps specified in the deck are adhered to...
This commit is contained in:
Andreas Lauser 2014-07-09 12:01:07 +02:00
parent a5f13f65b8
commit 7af0060812
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tests/problems/eclproblem.hh
View File

@ -122,8 +122,10 @@ SET_SCALAR_PROP(EclBaseProblem, Temperature, 293.15);
// The default for the end time of the simulation [s] // The default for the end time of the simulation [s]
// //
// By default, stop after the first year... // By default, stop it after the universe will probably have stopped
SET_SCALAR_PROP(EclBaseProblem, EndTime, 1*365*24*60*60); // to exist. (the ECL problem will finish the simulation explicitly
// after it simulated the last episode specified in the deck.)
SET_SCALAR_PROP(EclBaseProblem, EndTime, 1e100);
// The default for the initial time step size of the simulation [s]. // The default for the initial time step size of the simulation [s].
// //
@ -240,22 +242,41 @@ public:
} }
/*! /*!
* \brief Called by the time manager after the end of an episode. * \brief Called by the simulator before an episode begins.
*/ */
void episodeEnd() void beginEpisode()
{ }
/*!
* \brief Called by the simulator before each time integration.
*/
void beginTimeStep()
{ }
/*!
* \brief Called by the simulator before each Newton-Raphson iteration.
*/
void beginIteration()
{ }
/*!
* \brief Called by the simulator after the end of an episode.
*/
void endEpisode()
{ {
Simulator &simulator = this->simulator(); Simulator &simulator = this->simulator();
Opm::TimeMapConstPtr timeMap = simulator.gridManager().schedule()->getTimeMap(); Opm::EclipseStateConstPtr eclipseState = this->simulator().gridManager().eclipseState();
Opm::TimeMapConstPtr timeMap = eclipseState->getSchedule()->getTimeMap();
// TimeMap deals with points in time, so the number of time // TimeMap deals with points in time, so the number of time
// intervalls (i.e., report steps) is one less! // intervals (i.e., report steps) is one less!
int numReportSteps = timeMap->size() - 1; int numReportSteps = timeMap->size() - 1;
// start the next episode if there are additional report // start the next episode if there are additional report
// steps, else finish the simulation // steps, else finish the simulation
int episodeIdx = simulator.episodeIndex(); int nextEpisodeIdx = simulator.episodeIndex() + 1;
if (episodeIdx < numReportSteps) if (nextEpisodeIdx < numReportSteps)
simulator.startNextEpisode(timeMap->getTimeStepLength(episodeIdx + 1)); simulator.startNextEpisode(timeMap->getTimeStepLength(nextEpisodeIdx));
else else
simulator.setFinished(true); simulator.setFinished(true);
} }