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 branch 'OPM:master' into ms_pressure_eq_derivatives

Browse Source
This commit is contained in:
Stein Krogstad
2023-05-24 13:35:11 +02:00
committed by GitHub
parent 5c0b76f337 cf169167d0
commit 3beef758e4
19 changed files with 235 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@
#include <flow/flow_ebos_brine.hpp>
#include <flow/flow_ebos_brine_saltprecipitation.hpp>
#include <flow/flow_ebos_gaswater_saltprec_vapwat.hpp>
#include <flow/flow_ebos_gaswater_saltprec_energy.hpp>
#include <flow/flow_ebos_brine_precsalt_vapwat.hpp>
#include <flow/flow_ebos_onephase.hpp>
#include <flow/flow_ebos_onephase_energy.hpp>
@@ -226,7 +227,7 @@ private:
}
// Brine case
else if (phases.active(Phase::BRINE)) {
else if (phases.active(Phase::BRINE) && !thermal) {
return this->runBrine(phases);
}
@@ -604,6 +605,10 @@ private:
// water-gas-thermal
if (!phases.active( Phase::OIL ) && phases.active( Phase::WATER ) && phases.active( Phase::GAS )) {
if (phases.active(Phase::BRINE)){
return flowEbosGasWaterSaltprecEnergyMain(argc_, argv_, outputCout_, outputFiles_);
}
return flowEbosGasWaterEnergyMain(argc_, argv_, outputCout_, outputFiles_);
}