OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1025 from totto82/fix_hydrocarbonstate

Browse Source 
Fix to handle cases without DISGAS and VAPOIL
This commit is contained in:
Atgeirr Flø Rasmussen 2016-06-07 11:38:16 +02:00
commit f5cf2d47e1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/core/utility/initHydroCarbonState.hpp
View File

@ -6,7 +6,7 @@
namespace Opm namespace Opm
{ {
void initHydroCarbonState(BlackoilState& state, const PhaseUsage& pu, const int num_cells) { void initHydroCarbonState(BlackoilState& state, const PhaseUsage& pu, const int num_cells, const bool has_disgas, const bool has_vapoil) {
enum { Oil = BlackoilPhases::Liquid, Gas = BlackoilPhases::Vapour, Water = BlackoilPhases::Aqua }; enum { Oil = BlackoilPhases::Liquid, Gas = BlackoilPhases::Vapour, Water = BlackoilPhases::Aqua };
// hydrocarbonstate is only used when gas and oil is present // hydrocarbonstate is only used when gas and oil is present
assert(pu.phase_used[Oil]); assert(pu.phase_used[Oil]);
@ -29,11 +29,11 @@ void initHydroCarbonState(BlackoilState& state, const PhaseUsage& pu, const int
continue; // cases (almost) filled with water is treated as GasAndOil case; continue; // cases (almost) filled with water is treated as GasAndOil case;
} }
} }
if ( saturation[c*np + pu.phase_pos[ Gas ]] == 0.0) { if ( saturation[c*np + pu.phase_pos[ Gas ]] == 0.0 && has_disgas) {
hydroCarbonState[c] = HydroCarbonState::OilOnly; hydroCarbonState[c] = HydroCarbonState::OilOnly;
continue; continue;
} }
if ( saturation[c*np + pu.phase_pos[ Oil ]] == 0.0) { if ( saturation[c*np + pu.phase_pos[ Oil ]] == 0.0 && has_vapoil) {
hydroCarbonState[c] = HydroCarbonState::GasOnly; hydroCarbonState[c] = HydroCarbonState::GasOnly;
} }
} }