OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-30 13:03:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

ECL problem: fix the episode handling

Browse Source 
now the episodes seem to match the report steps...
This commit is contained in:
Andreas Lauser 2014-05-30 12:42:48 +02:00
parent d852cc0d03
commit 12b1c257d6
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/problems/eclproblem.hh
View File

@ -232,10 +232,11 @@ public:
simulator.setEpisodeIndex(0); simulator.setEpisodeIndex(0);
// the user-specified initial time step can be shorter than // the user-specified initial time step can be shorter than
// the one given in the deck, but it can't be longer. // the initial report step size given in the deck, but it
// can't be longer.
Scalar dt = simulator.timeStepSize(); Scalar dt = simulator.timeStepSize();
if (dt > simulator.episodeLength()) if (dt > simulator.episodeLength())
simulator.setTimeStepSize(dt); simulator.setTimeStepSize(simulator.episodeLength());
} }
/*! /*!
@ -245,8 +246,18 @@ public:
{ {
Simulator &simulator = this->simulator(); Simulator &simulator = this->simulator();
Opm::TimeMapConstPtr timeMap = simulator.gridManager().schedule()->getTimeMap(); Opm::TimeMapConstPtr timeMap = simulator.gridManager().schedule()->getTimeMap();
// TimeMap deals with points in time, so the number of time
// intervalls (i.e., report steps) is one less!
int numReportSteps = timeMap->size() - 1;
// start the next episode if there are additional report
// steps, else finish the simulation
int episodeIdx = simulator.episodeIndex(); int episodeIdx = simulator.episodeIndex();
simulator.startNextEpisode(timeMap->getTimeStepLength(episodeIdx + 1)); if (episodeIdx < numReportSteps)
simulator.startNextEpisode(timeMap->getTimeStepLength(episodeIdx + 1));
else
simulator.setFinished(true);
} }
/*! /*!
@ -545,16 +556,14 @@ private:
initialFluidStates_.resize(numDof); initialFluidStates_.resize(numDof);
if (!deck->hasKeyword("SWAT") || if (!deck->hasKeyword("SWAT") ||
!deck->hasKeyword("SGAS")) { !deck->hasKeyword("SGAS"))
OPM_THROW(std::runtime_error, OPM_THROW(std::runtime_error,
"So far, the Eclipse input file requires the presence of the SWAT " "So far, the Eclipse input file requires the presence of the SWAT "
"and SGAS keywords"); "and SGAS keywords");
} if (!deck->hasKeyword("PRESSURE"))
if (!deck->hasKeyword("PRESSURE")) {
OPM_THROW(std::runtime_error, OPM_THROW(std::runtime_error,
"So far, the Eclipse input file requires the presence of the PRESSURE " "So far, the Eclipse input file requires the presence of the PRESSURE "
"keyword"); "keyword");
}
const std::vector<double> &waterSaturationData = const std::vector<double> &waterSaturationData =
deck->getKeyword("SWAT")->getSIDoubleData(); deck->getKeyword("SWAT")->getSIDoubleData();