OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-20 11:48:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Main: move code for setting up Vanguard to compile unit

Browse Source
This commit is contained in:
Arne Morten Kvarving 2023-01-18 13:00:32 +01:00
parent c901570c9b
commit 560b0e5cbb
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
opm/simulators/flow/Main.cpp
View File

@ -200,4 +200,15 @@ void Main::readDeck(const std::string& deckFilename,
outputFiles_ = (omode != FileOutputMode::OUTPUT_NONE);
}
void Main::setupVanguard()
{
EclGenericVanguard::setParams(this->setupTime_,
this->eclipseState_,
this->schedule_,
std::move(this->udqState_),
std::move(this->actionState_),
std::move(this->wtestState_),
this->summaryConfig_);
}
} // namespace Opm

27
opm/simulators/flow/Main.hpp
View File

@ -172,14 +172,7 @@ public:
if (initialize_<Properties::TTag::FlowEarlyBird>(exitCode)) {
// TODO: check that this deck really represents a blackoil
// case. E.g. check that number of phases == 3
EclGenericVanguard::setParams(
setupTime_,
eclipseState_,
schedule_,
std::move(udqState_),
std::move(this->actionState_),
std::move(this->wtestState_),
summaryConfig_);
this->setupVanguard();
return flowEbosBlackoilTpfaMainInit(
argc_, argv_, outputCout_, outputFiles_);
} else {
@ -194,13 +187,7 @@ private:
const auto& rspec = this->eclipseState_->runspec();
const auto& phases = rspec.phases();
EclGenericVanguard::setParams(this->setupTime_,
this->eclipseState_,
this->schedule_,
std::move(this->udqState_),
std::move(this->actionState_),
std::move(this->wtestState_),
this->summaryConfig_);
this->setupVanguard();
// run the actual simulator
//
@ -277,13 +264,7 @@ private:
template <class TypeTag>
int dispatchStatic_()
{
EclGenericVanguard::setParams(this->setupTime_,
this->eclipseState_,
this->schedule_,
std::move(this->udqState_),
std::move(this->actionState_),
std::move(this->wtestState_),
this->summaryConfig_);
this->setupVanguard();
return flowEbosMain<TypeTag>(argc_, argv_, outputCout_, outputFiles_);
}
@ -652,6 +633,8 @@ private:
const int mpiRank,
const int output_param);
void setupVanguard();
int argc_{0};
char** argv_{nullptr};
bool outputCout_{false};