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

Merge pull request #2735 from hakonhagland/python_step2

Browse Source 
Implements a Python step() method.
This commit is contained in:
Atgeirr Flø Rasmussen 2020-09-22 15:47:48 +02:00 committed by GitHub
commit 68add695fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,6 +326,13 @@ namespace Opm
return execute_(&FlowMainEbos::runSimulatorInit, /*cleanup=*/false); return execute_(&FlowMainEbos::runSimulatorInit, /*cleanup=*/false);
} }
// Returns true unless "EXIT" was encountered in the schedule
// section of the input datafile.
int executeStep()
{
return simulator_->runStep(*simtimer_);
}
// Print an ASCII-art header to the PRT and DEBUG files. // Print an ASCII-art header to the PRT and DEBUG files.
// \return Whether unkown keywords were seen during parsing. // \return Whether unkown keywords were seen during parsing.
static void printPRTHeader(bool output_cout) static void printPRTHeader(bool output_cout)

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

@ -34,6 +34,7 @@ private:
public: public:
BlackOilSimulator( const std::string &deckFilename); BlackOilSimulator( const std::string &deckFilename);
int run(); int run();
int step();
int step_init(); int step_init();
private: private:

9
python/simulators/simulators.cpp
View File

@ -28,6 +28,14 @@ int BlackOilSimulator::run()
return mainObject.runDynamic(); return mainObject.runDynamic();
} }
int BlackOilSimulator::step()
{
if (!hasRunInit_) {
throw std::logic_error("step() called before step_init()");
}
return mainEbos_->executeStep();
}
int BlackOilSimulator::step_init() int BlackOilSimulator::step_init()
{ {
@ -56,5 +64,6 @@ PYBIND11_MODULE(simulators, m)
py::class_<Opm::Pybind::BlackOilSimulator>(m, "BlackOilSimulator") py::class_<Opm::Pybind::BlackOilSimulator>(m, "BlackOilSimulator")
.def(py::init< const std::string& >()) .def(py::init< const std::string& >())
.def("run", &Opm::Pybind::BlackOilSimulator::run) .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::step_init);
} }