changed: subclass Main for python

move the initFlowBlackoil method into it

in particular we then avoid the FlowMainType type alias
in Main.hpp
This commit is contained in:
Arne Morten Kvarving
2024-09-09 14:26:24 +02:00
parent fc96e9da75
commit 2a9d81227b
4 changed files with 64 additions and 25 deletions

View File

@@ -22,7 +22,6 @@
#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/input/eclipse/Schedule/Schedule.hpp>
#include <opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
#include <opm/simulators/flow/Main.hpp>
#include <opm/simulators/flow/FlowMain.hpp>
//#include <opm/simulators/flow/python/PyFluidState.hpp>
#include <opm/simulators/flow/python/PyMaterialState.hpp>
@@ -216,7 +215,7 @@ int PyBlackOilSimulator::stepInit()
}
}
if (this->deck_) {
this->main_ = std::make_unique<Opm::Main>(
this->main_ = std::make_unique<Opm::PyMain>(
this->deck_->getDataFile(),
this->eclipse_state_,
this->schedule_,
@@ -226,7 +225,7 @@ int PyBlackOilSimulator::stepInit()
);
}
else {
this->main_ = std::make_unique<Opm::Main>(
this->main_ = std::make_unique<Opm::PyMain>(
this->deck_filename_,
this->mpi_init_,
this->mpi_finalize_