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

FlowMain: rename ebosSimulator to modelSimulator

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-02-01 10:45:58 +01:00
parent b09c70213b
commit 2bec00bb9b
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
opm/simulators/flow/FlowMain.hpp
View File

@ -98,7 +98,7 @@ void handleExtraConvergenceOutput(SimulatorReport& report,
{ {
public: public:
using MaterialLawManager = typename GetProp<TypeTag, Properties::MaterialLaw>::EclMaterialLawManager; using MaterialLawManager = typename GetProp<TypeTag, Properties::MaterialLaw>::EclMaterialLawManager;
using EbosSimulator = GetPropType<TypeTag, Properties::Simulator>; using ModelSimulator = GetPropType<TypeTag, Properties::Simulator>;
using Grid = GetPropType<TypeTag, Properties::Grid>; using Grid = GetPropType<TypeTag, Properties::Grid>;
using GridView = GetPropType<TypeTag, Properties::GridView>; using GridView = GetPropType<TypeTag, Properties::GridView>;
using Problem = GetPropType<TypeTag, Properties::Problem>; using Problem = GetPropType<TypeTag, Properties::Problem>;
@ -138,7 +138,7 @@ void handleExtraConvergenceOutput(SimulatorReport& report,
Simulator::registerParameters(); Simulator::registerParameters();
// register the parameters inherited from ebos // register the base parameters
registerAllParameters_<TypeTag>(/*finalizeRegistration=*/false); registerAllParameters_<TypeTag>(/*finalizeRegistration=*/false);
// hide the parameters unused by flow. TODO: this is a pain to maintain // hide the parameters unused by flow. TODO: this is a pain to maintain
@ -313,11 +313,13 @@ void handleExtraConvergenceOutput(SimulatorReport& report,
return report.success.exit_status; return report.success.exit_status;
} }
EbosSimulator *getSimulatorPtr() { ModelSimulator* getSimulatorPtr()
return ebosSimulator_.get(); {
return modelSimulator_.get();
} }
SimulatorTimer* getSimTimer() { SimulatorTimer* getSimTimer()
{
return simtimer_.get(); return simtimer_.get();
} }
@ -357,7 +359,7 @@ void handleExtraConvergenceOutput(SimulatorReport& report,
return status; return status;
setupParallelism(); setupParallelism();
setupEbosSimulator(); setupModelSimulator();
createSimulator(); createSimulator();
// if run, do the actual work, else just initialize // if run, do the actual work, else just initialize
@ -420,7 +422,7 @@ void handleExtraConvergenceOutput(SimulatorReport& report,
// force closing of all log files. // force closing of all log files.
OpmLog::removeAllBackends(); OpmLog::removeAllBackends();
if (mpi_rank_ != 0 || mpi_size_ < 2 || !this->output_files_ || !ebosSimulator_) { if (mpi_rank_ != 0 || mpi_size_ < 2 || !this->output_files_ || !modelSimulator_) {
return; return;
} }
@ -429,11 +431,11 @@ void handleExtraConvergenceOutput(SimulatorReport& report,
EWOMS_GET_PARAM(TypeTag, bool, EnableLoggingFalloutWarning)); EWOMS_GET_PARAM(TypeTag, bool, EnableLoggingFalloutWarning));
} }
void setupEbosSimulator() void setupModelSimulator()
{ {
ebosSimulator_ = std::make_unique<EbosSimulator>(EclGenericVanguard::comm(), /*verbose=*/false); modelSimulator_ = std::make_unique<ModelSimulator>(EclGenericVanguard::comm(), /*verbose=*/false);
ebosSimulator_->executionTimer().start(); modelSimulator_->executionTimer().start();
ebosSimulator_->model().applyInitialSolution(); modelSimulator_->model().applyInitialSolution();
try { try {
// Possible to force initialization only behavior (NOSIM). // Possible to force initialization only behavior (NOSIM).
@ -463,13 +465,13 @@ void handleExtraConvergenceOutput(SimulatorReport& report,
} }
const EclipseState& eclState() const const EclipseState& eclState() const
{ return ebosSimulator_->vanguard().eclState(); } { return modelSimulator_->vanguard().eclState(); }
EclipseState& eclState() EclipseState& eclState()
{ return ebosSimulator_->vanguard().eclState(); } { return modelSimulator_->vanguard().eclState(); }
const Schedule& schedule() const const Schedule& schedule() const
{ return ebosSimulator_->vanguard().schedule(); } { return modelSimulator_->vanguard().schedule(); }
// Run the simulator. // Run the simulator.
int runSimulator() int runSimulator()
@ -571,14 +573,14 @@ void handleExtraConvergenceOutput(SimulatorReport& report,
void createSimulator() void createSimulator()
{ {
// Create the simulator instance. // Create the simulator instance.
simulator_ = std::make_unique<Simulator>(*ebosSimulator_); simulator_ = std::make_unique<Simulator>(*modelSimulator_);
} }
Grid& grid() Grid& grid()
{ return ebosSimulator_->vanguard().grid(); } { return modelSimulator_->vanguard().grid(); }
private: private:
std::unique_ptr<EbosSimulator> ebosSimulator_; std::unique_ptr<ModelSimulator> modelSimulator_;
int mpi_rank_ = 0; int mpi_rank_ = 0;
int mpi_size_ = 1; int mpi_size_ = 1;
std::any parallel_information_; std::any parallel_information_;