OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OPM-218: Write restart files at same interval as eclipse

Browse Source
This commit is contained in:
chflo 2015-08-02 22:26:45 +02:00 committed by Joakim Hove
parent 5e9e472613
commit a949d5a736
10 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opm/core/io/OutputWriter.cpp
View File

@ -34,9 +34,10 @@ struct MultiWriter : public OutputWriter {
virtual void writeTimeStep(const SimulatorTimerInterface& timer,
const SimulatorState& reservoirState,
const WellState& wellState) {
const WellState& wellState,
bool isSubstep) {
for (it_t it = writers_->begin (); it != writers_->end(); ++it) {
(*it)->writeTimeStep (timer, reservoirState, wellState);
(*it)->writeTimeStep (timer, reservoirState, wellState, isSubstep);
}
}

3
opm/core/io/OutputWriter.hpp
View File

@ -88,7 +88,8 @@ public:
*/
virtual void writeTimeStep(const SimulatorTimerInterface& timer,
const SimulatorState& reservoirState,
const WellState& wellState) = 0;
const WellState& wellState,
bool isSubstep) = 0;
/*!
* Create a suitable set of output formats based on configuration.

6
opm/core/io/eclipse/EclipseWriter.cpp
View File

@ -1219,8 +1219,10 @@ void EclipseWriter::writeInit(const SimulatorTimerInterface &timer)
// implementation of the writeTimeStep method
void EclipseWriter::writeTimeStep(const SimulatorTimerInterface& timer,
const SimulatorState& reservoirState,
const WellState& wellState)
const WellState& wellState,
bool isSubstep)
{
// if we don't want to write anything, this method becomes a
// no-op...
if (!enableOutput_) {
@ -1258,7 +1260,7 @@ void EclipseWriter::writeTimeStep(const SimulatorTimerInterface& timer,
// Write restart file
if(ioConfig->getWriteRestartFile(timer.reportStepNum()))
if(!isSubstep && ioConfig->getWriteRestartFile(timer.reportStepNum()))
{
const size_t ncwmax = eclipseState_->getSchedule()->getMaxNumCompletionsForWells(timer.reportStepNum());
const size_t numWells = eclipseState_->getSchedule()->numWells(timer.reportStepNum());

2
opm/core/io/eclipse/EclipseWriter.hpp
View File

@ -98,7 +98,7 @@ public:
*/
virtual void writeTimeStep(const SimulatorTimerInterface& timer,
const SimulatorState& reservoirState,
const WellState& wellState);
const WellState& wellState, bool isSubstep );
static int eclipseWellTypeMask(WellType wellType, WellInjector::TypeEnum injectorType);

3
opm/core/simulator/AdaptiveTimeStepping_impl.hpp
View File

@ -180,7 +180,8 @@ namespace Opm {
// write data if outputWriter was provided
if( outputWriter ) {
outputWriter->writeTimeStep( substepTimer, state, well_state );
bool substep = true;
outputWriter->writeTimeStep( substepTimer, state, well_state, substep);
}
// set new time step length

2
opm/core/simulator/SimulatorOutput.cpp
View File

@ -88,7 +88,7 @@ SimulatorOutputBase::writeOutput () {
// relay the request to the handlers (setup in the constructor
// from parameters)
writer_->writeTimeStep (*timer_, *reservoirState_, *wellState_);
writer_->writeTimeStep (*timer_, *reservoirState_, *wellState_ , false);
// advance to the next reporting time
++next_;

2
tests/test_EclipseWriteRFTHandler.cpp
View File

@ -220,7 +220,7 @@ BOOST_AUTO_TEST_CASE(test_EclipseWriterRFTHandler)
for (; simulatorTimer->currentStepNum() < simulatorTimer->numSteps(); ++ (*simulatorTimer)) {
std::shared_ptr<Opm::BlackoilState> blackoilState2 = createBlackoilState(simulatorTimer->currentStepNum(),ourFineGridManagerPtr);
std::shared_ptr<Opm::WellState> wellState = createWellState(blackoilState2);
eclipseWriter->writeTimeStep(*simulatorTimer, *blackoilState2, *wellState);
eclipseWriter->writeTimeStep(*simulatorTimer, *blackoilState2, *wellState, false);
}
std::string cwd(test_work_area_get_cwd(test_area.get()));

2
tests/test_EclipseWriter.cpp
View File

@ -408,7 +408,7 @@ BOOST_AUTO_TEST_CASE(EclipseWriterIntegration)
for (; simTimer->currentStepNum() < simTimer->numSteps(); ++ (*simTimer)) {
createBlackoilState(simTimer->currentStepNum());
createWellState(simTimer->currentStepNum());
eclWriter->writeTimeStep(*simTimer, *blackoilState, *wellState);
eclWriter->writeTimeStep(*simTimer, *blackoilState, *wellState, false);
checkRestartFile(simTimer->currentStepNum());
checkSummaryFile(simTimer->currentStepNum());
}

2
tests/test_readWriteWellStateData.cpp
View File

@ -258,7 +258,7 @@ BOOST_AUTO_TEST_CASE(EclipseReadWriteWellStateData)
setValuesInWellState(wellState);
simTimer->setCurrentStepNum(1);
eclipseWriter->writeTimeStep(*simTimer, *blackoilState, *wellState);
eclipseWriter->writeTimeStep(*simTimer, *blackoilState, *wellState , false);
const char * test_area_path = test_work_area_get_cwd(test_area);
std::string slash = "/";

2
tests/test_writenumwells.cpp
View File

@ -185,7 +185,7 @@ BOOST_AUTO_TEST_CASE(EclipseWriteRestartWellInfo)
for(int timestep=0; timestep <= countTimeStep; ++timestep){
simTimer->setCurrentStepNum(timestep);
eclipseWriter->writeTimeStep(*simTimer, *blackoilState, *wellState);
eclipseWriter->writeTimeStep(*simTimer, *blackoilState, *wellState, false);
}
verifyWellState(eclipse_restart_filename, eclipseState->getEclipseGrid(), eclipseState->getSchedule());