OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-19 16:22:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1841 from andlaus/remove_isSubstep

Browse Source 
EclProblem: remove the isSubstep parameter from writeOutput()
This commit is contained in:
Tor Harald Sandve 2019-06-03 10:41:12 +02:00 committed by GitHub
commit 8f60a5f9fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -989,16 +989,14 @@ public:
* \brief Write the requested quantities of the current solution into the output
* 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
// write the desired VTK files.
ParentType::writeOutput(isSubStep, verbose);
ParentType::writeOutput(verbose);
if (enableEclOutput_)
eclWriter_->writeOutput(isSubStep);
eclWriter_->writeOutput(/*isSubStep=*/!this->simulator().episodeWillBeOver());
}
/*!

4
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

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

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

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