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

pick currect version of flow for gas-water-vapwat case

Browse Source
This commit is contained in:
Tor Harald Sandve 2023-04-14 15:30:38 +02:00
parent 688d575802
commit 2a20ad8283
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -438,6 +438,7 @@ private:
{ {
const bool diffusive = eclipseState_->getSimulationConfig().isDiffusive(); const bool diffusive = eclipseState_->getSimulationConfig().isDiffusive();
const bool disgasw = eclipseState_->getSimulationConfig().hasDISGASW(); const bool disgasw = eclipseState_->getSimulationConfig().hasDISGASW();
const bool vapwat = eclipseState_->getSimulationConfig().hasVAPWAT();
// oil-gas // oil-gas
if (phases.active( Phase::OIL ) && phases.active( Phase::GAS )) { if (phases.active( Phase::OIL ) && phases.active( Phase::GAS )) {
@ -461,7 +462,7 @@ private:
// gas-water // gas-water
else if ( phases.active( Phase::GAS ) && phases.active( Phase::WATER ) ) { else if ( phases.active( Phase::GAS ) && phases.active( Phase::WATER ) ) {
if (disgasw) { if (disgasw || vapwat) {
if (diffusive) { if (diffusive) {
return flowEbosGasWaterDissolutionDiffuseMain(argc_, argv_, outputCout_, outputFiles_); return flowEbosGasWaterDissolutionDiffuseMain(argc_, argv_, outputCout_, outputFiles_);
} }
@ -469,7 +470,7 @@ private:
} }
if (diffusive) { if (diffusive) {
if (outputCout_) { if (outputCout_) {
std::cerr << "The DIFFUSE option is not available for the two-phase gas/water model without disgasw." << std::endl; std::cerr << "The DIFFUSE option is not available for the two-phase gas/water model without disgasw or vapwat." << std::endl;
} }
return EXIT_FAILURE; return EXIT_FAILURE;
} }