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

EclProblem: remove the isSubstep parameter from writeOutput()

Browse Source 
Now that the book keeping for time stepping is correct even in `flow`,
this parameter has become redundant.
This commit is contained in:
Andreas Lauser 2019-05-13 12:49:43 +02:00
parent 8197bcfc54
commit 8657f18075
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ebos/eclproblem.hh
View File

@ -982,16 +982,14 @@ public:
* \brief Write the requested quantities of the current solution into the output * \brief Write the requested quantities of the current solution into the output
* files. * files.
*/ */
void writeOutput(bool isSubStep, bool verbose = true) void writeOutput(bool verbose = true)
{ {
assert(!this->simulator().episodeWillBeOver() == isSubStep);
// use the generic code to prepare the output fields and to // use the generic code to prepare the output fields and to
// write the desired VTK files. // write the desired VTK files.
ParentType::writeOutput(isSubStep, verbose); ParentType::writeOutput(verbose);
if (enableEclOutput_) if (enableEclOutput_)
eclWriter_->writeOutput(isSubStep); eclWriter_->writeOutput(/*isSubStep=*/!this->simulator().episodeWillBeOver());
} }
/*! /*!

4
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -239,7 +239,7 @@ public:
ebosSimulator_.setTimeStepSize(0.0); ebosSimulator_.setTimeStepSize(0.0);
wellModel_().beginReportStep(timer.currentStepNum()); wellModel_().beginReportStep(timer.currentStepNum());
ebosSimulator_.problem().writeOutput(false); ebosSimulator_.problem().writeOutput();
report.output_write_time += perfTimer.stop(); report.output_write_time += perfTimer.stop();
} }
@ -294,7 +294,7 @@ public:
perfTimer.start(); perfTimer.start();
const double nextstep = adaptiveTimeStepping ? adaptiveTimeStepping->suggestedNextStep() : -1.0; const double nextstep = adaptiveTimeStepping ? adaptiveTimeStepping->suggestedNextStep() : -1.0;
ebosSimulator_.problem().setNextTimeStepSize(nextstep); ebosSimulator_.problem().setNextTimeStepSize(nextstep);
ebosSimulator_.problem().writeOutput(false); ebosSimulator_.problem().writeOutput();
report.output_write_time += perfTimer.stop(); report.output_write_time += perfTimer.stop();
solver->model().endReportStep(); solver->model().endReportStep();

2
opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp
View File

@ -322,7 +322,7 @@ namespace Opm {
Opm::time::StopWatch perfTimer; Opm::time::StopWatch perfTimer;
perfTimer.start(); perfTimer.start();
ebosProblem.writeOutput(/*isSubStep=*/true); ebosProblem.writeOutput();
report.output_write_time += perfTimer.secsSinceStart(); report.output_write_time += perfTimer.secsSinceStart();
} }