Merge pull request #4574 from totto82/add_gas_water_energy

add gas + water + energy to flow
This commit is contained in:
Kai Bao 2023-03-31 10:44:41 +02:00 committed by GitHub
commit fcb6e41490
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -42,6 +42,7 @@
#include <flow/flow_ebos_onephase_energy.hpp>
#include <flow/flow_ebos_oilwater_brine.hpp>
#include <flow/flow_ebos_gaswater_brine.hpp>
#include <flow/flow_ebos_gaswater_energy.hpp>
#include <flow/flow_ebos_gaswater_dissolution.hpp>
#include <flow/flow_ebos_gaswater_dissolution_diffuse.hpp>
#include <flow/flow_ebos_energy.hpp>
@ -600,6 +601,11 @@ private:
return flowEbosGasOilEnergyMain(argc_, argv_, outputCout_, outputFiles_);
}
// water-gas-thermal
if (!phases.active( Phase::OIL ) && phases.active( Phase::WATER ) && phases.active( Phase::GAS )) {
return flowEbosGasWaterEnergyMain(argc_, argv_, outputCout_, outputFiles_);
}
return flowEbosEnergyMain(argc_, argv_, outputCout_, outputFiles_);
}