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

Merge pull request #2830 from hakonhagland/step_cleanup

Browse Source 
Implements a Python step_cleanup() method.
This commit is contained in:
Joakim Hove 2020-11-04 14:27:38 +01:00 committed by GitHub
commit a28bd3ab90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
opm/simulators/flow/FlowMainEbos.hpp
View File

@ -335,6 +335,15 @@ namespace Opm
return simulator_->runStep(*simtimer_);
}
// Called from Python to cleanup after having executed the last
// executeStep()
int executeStepsCleanup()
{
SimulatorReport report = simulator_->finalize();
runSimulatorAfterSim_(report);
return report.success.exit_status;
}
// Print an ASCII-art header to the PRT and DEBUG files.
// \return Whether unkown keywords were seen during parsing.
static void printPRTHeader(bool output_cout)

9
opm/simulators/flow/python/simulators.hpp
View File

@ -35,14 +35,17 @@ public:
BlackOilSimulator( const std::string &deckFilename);
int run();
int step();
int step_init();
int stepInit();
int stepCleanup();
private:
const std::string deckFilename_;
bool hasRunInit_ = false;
bool hasRunCleanup_ = false;
std::unique_ptr<FlowMainEbosType> mainEbos_;
std::unique_ptr<Opm::Main> main_;
bool hasRunInit_;
};
} // namespace Opm::Python
} // namespace Opm::Pybind
#endif // OPM_SIMULATORS_HEADER_INCLUDED

24
python/simulators/simulators.cpp
View File

@ -18,7 +18,7 @@ namespace py = pybind11;
namespace Opm::Pybind {
BlackOilSimulator::BlackOilSimulator( const std::string &deckFilename)
: deckFilename_(deckFilename), hasRunInit_(false)
: deckFilename_{deckFilename}
{
}
@ -33,16 +33,29 @@ int BlackOilSimulator::step()
if (!hasRunInit_) {
throw std::logic_error("step() called before step_init()");
}
if (hasRunCleanup_) {
throw std::logic_error("step() called after step_cleanup()");
}
return mainEbos_->executeStep();
}
int BlackOilSimulator::step_init()
int BlackOilSimulator::stepCleanup()
{
hasRunCleanup_ = true;
return mainEbos_->executeStepsCleanup();
}
int BlackOilSimulator::stepInit()
{
if (hasRunInit_) {
// Running step_init() multiple times is not implemented yet,
// currently we just do nothing and return
return EXIT_SUCCESS;
if (hasRunCleanup_) {
throw std::logic_error("step_init() called again");
}
else {
return EXIT_SUCCESS;
}
}
main_ = std::make_unique<Opm::Main>( deckFilename_ );
int exitCode = EXIT_SUCCESS;
@ -65,5 +78,6 @@ PYBIND11_MODULE(simulators, m)
.def(py::init< const std::string& >())
.def("run", &Opm::Pybind::BlackOilSimulator::run)
.def("step", &Opm::Pybind::BlackOilSimulator::step)
.def("step_init", &Opm::Pybind::BlackOilSimulator::step_init);
.def("step_init", &Opm::Pybind::BlackOilSimulator::stepInit)
.def("step_cleanup", &Opm::Pybind::BlackOilSimulator::stepCleanup);
}