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 #1647 from andlaus/thermal_determination

Browse Source 
flow: use eclipseState.simulatorConfig().isThermal() to determine whether energy ought to be conserved
This commit is contained in:
Tor Harald Sandve 2018-12-07 12:51:19 +01:00 committed by GitHub
commit bec18a5d91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flow/flow.cpp
View File

@ -167,6 +167,12 @@ int main(int argc, char** argv)
const auto& phases = runspec.phases(); const auto& phases = runspec.phases();
std::shared_ptr<Opm::EclipseState> eclipseState = std::make_shared< Opm::EclipseState > ( *deck, parseContext ); std::shared_ptr<Opm::EclipseState> eclipseState = std::make_shared< Opm::EclipseState > ( *deck, parseContext );
// run the actual simulator
//
// TODO: make sure that no illegal combinations like thermal and twophase are
// requested.
// Twophase cases // Twophase cases
if( phases.size() == 2 ) { if( phases.size() == 2 ) {
// oil-gas // oil-gas
@ -211,7 +217,7 @@ int main(int argc, char** argv)
return Opm::flowEbosSolventMain(argc, argv); return Opm::flowEbosSolventMain(argc, argv);
} }
// Energy case // Energy case
else if ( phases.active( Opm::Phase::ENERGY ) ) { else if (eclipseState->getSimulationConfig().isThermal()) {
Opm::flowEbosEnergySetDeck(*deck, *eclipseState); Opm::flowEbosEnergySetDeck(*deck, *eclipseState);
return Opm::flowEbosEnergyMain(argc, argv); return Opm::flowEbosEnergyMain(argc, argv);
} }