OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 02:00:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #426 from joakim-hove/OPM-218

Browse Source 
Opm 218
This commit is contained in:
Joakim Hove 2015-08-05 15:11:28 +02:00
commit 5ed11e4af9
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.cpp
View File

@ -236,19 +236,20 @@ namespace Opm
BlackoilOutputWriter::
writeTimeStep(const SimulatorTimerInterface& timer,
const SimulatorState& state,
const WellState& wellState)
const WellState& wellState,
bool substep)
{
// VTK output
if( vtkWriter_ ) {
vtkWriter_->writeTimeStep( timer, state, wellState );
vtkWriter_->writeTimeStep( timer, state, wellState , false );
}
// Matlab output
if( matlabWriter_ ) {
matlabWriter_->writeTimeStep( timer, state, wellState );
matlabWriter_->writeTimeStep( timer, state, wellState , false );
}
// ECL output
if ( eclWriter_ ) {
eclWriter_->writeTimeStep(timer, state, wellState);
eclWriter_->writeTimeStep(timer, state, wellState, substep);
}
// write backup file
if( backupfile_ )

9
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

@ -133,7 +133,8 @@ namespace Opm
/** \copydoc Opm::OutputWriter::writeTimeStep */
void writeTimeStep(const SimulatorTimerInterface& timer,
const SimulatorState& state,
const WellState& )
const WellState&,
bool substep = false)
{
outputStateVtk(grid_, state, timer.currentStepNum(), outputDir_);
}
@ -162,7 +163,8 @@ namespace Opm
/** \copydoc Opm::OutputWriter::writeTimeStep */
void writeTimeStep(const SimulatorTimerInterface& timer,
const SimulatorState& reservoirState,
const WellState& wellState)
const WellState& wellState,
bool substep = false)
{
const BlackoilState* state =
dynamic_cast< const BlackoilState* > (&reservoirState);
@ -196,7 +198,8 @@ namespace Opm
/** \copydoc Opm::OutputWriter::writeTimeStep */
void writeTimeStep(const SimulatorTimerInterface& timer,
const SimulatorState& reservoirState,
const WellState& wellState);
const WellState& wellState,
bool substep = false);
/** \brief return output directory */
const std::string& outputDirectory() const { return outputDir_; }