mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Merge pull request #3830 from plgbrts/vapwat
Adding explicit input specification of water-gas ratio (RVW) and RVW output plus simulator gas-water system with salt precipitation and water evaporation for
This commit is contained in:
@@ -34,6 +34,7 @@
|
||||
#include <flow/flow_ebos_foam.hpp>
|
||||
#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_oilwater_brine.hpp>
|
||||
#include <flow/flow_ebos_gaswater_brine.hpp>
|
||||
#include <flow/flow_ebos_energy.hpp>
|
||||
@@ -669,9 +670,18 @@ private:
|
||||
return flowEbosOilWaterBrineMain(argc_, argv_, outputCout_, outputFiles_);
|
||||
}
|
||||
if (phases.active(Phase::GAS)){ // gas water brine case
|
||||
flowEbosGasWaterBrineSetDeck(
|
||||
setupTime_, deck_, eclipseState_, schedule_, summaryConfig_);
|
||||
return flowEbosGasWaterBrineMain(argc_, argv_, outputCout_, outputFiles_);
|
||||
if (eclipseState_->getSimulationConfig().hasPRECSALT() &&
|
||||
eclipseState_->getSimulationConfig().hasVAPWAT()) {
|
||||
//case with water vaporization into gas phase and salt precipitation
|
||||
flowEbosGasWaterSaltprecVapwatSetDeck(
|
||||
setupTime_, deck_, eclipseState_, schedule_, summaryConfig_);
|
||||
return flowEbosGasWaterSaltprecVapwatMain(argc_, argv_, outputCout_, outputFiles_);
|
||||
}
|
||||
else {
|
||||
flowEbosGasWaterBrineSetDeck(
|
||||
setupTime_, deck_, eclipseState_, schedule_, summaryConfig_);
|
||||
return flowEbosGasWaterBrineMain(argc_, argv_, outputCout_, outputFiles_);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (eclipseState_->getSimulationConfig().hasPRECSALT()) {
|
||||
|
||||
Reference in New Issue
Block a user