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

addressing reviewing comments for OPM/opm-simulators#2951

Browse Source
This commit is contained in:
Kai Bao
2020-12-03 15:02:17 +01:00
parent 3f5402fb5b
commit 61bebb2ec5
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
opm/simulators/wells/MultisegmentWell_impl.hpp
View File

@@ -2769,21 +2769,21 @@ namespace Opm
assembleControlEq(well_state, schedule, summaryState, inj_controls, prod_controls, deferred_logger); assembleControlEq(well_state, schedule, summaryState, inj_controls, prod_controls, deferred_logger);
} else { } else {
// TODO: maybe the following should go to the function assemblePressureEq() // TODO: maybe the following should go to the function assemblePressureEq()
switch(segmentSet()[seg].segmentType()) { switch(segmentSet()[seg].segmentType()) {
case Segment::SegmentType::SICD : case Segment::SegmentType::SICD :
assembleSICDPressureEq(seg, well_state); assembleSICDPressureEq(seg, well_state);
break; break;
case Segment::SegmentType::AICD : { case Segment::SegmentType::AICD : {
const UnitSystem& unit_system = ebosSimulator.vanguard().eclState().getDeckUnitSystem(); const UnitSystem& unit_system = ebosSimulator.vanguard().eclState().getDeckUnitSystem();
assembleAICDPressureEq(seg, well_state, unit_system); assembleAICDPressureEq(seg, well_state, unit_system);
break; break;
} }
case Segment::SegmentType::VALVE : case Segment::SegmentType::VALVE :
assembleValvePressureEq(seg, well_state); assembleValvePressureEq(seg, well_state);
break; break;
default : default :
assemblePressureEq(seg, well_state); assemblePressureEq(seg, well_state);
} }
} }
well_state.segPressDrop()[seg] = well_state.segPressDropHydroStatic()[seg] + well_state.segPressDrop()[seg] = well_state.segPressDropHydroStatic()[seg] +
@@ -4001,7 +4001,7 @@ namespace Opm
using MathTool = MathToolbox<EvalWell>; using MathTool = MathToolbox<EvalWell>;
const EvalWell mixture_viscosity = MathTool::pow(water_fraction, aicd.waterViscExponent()) * water_viscosity const EvalWell mixture_viscosity = MathTool::pow(water_fraction, aicd.waterViscExponent()) * water_viscosity
+ MathTool::pow(oil_fraction, aicd.oilViscExponent()) * oil_viscosity + MathTool::pow(oil_fraction, aicd.oilViscExponent()) * oil_viscosity
+ MathTool::pow(gas_fraction, aicd.oilViscExponent()) * gas_viscosity; + MathTool::pow(gas_fraction, aicd.gasViscExponent()) * gas_viscosity;
const EvalWell mixture_density = MathTool::pow(water_fraction, aicd.waterDensityExponent()) * water_density const EvalWell mixture_density = MathTool::pow(water_fraction, aicd.waterDensityExponent()) * water_density
+ MathTool::pow(oil_fraction, aicd.oilDensityExponent()) * oil_density + MathTool::pow(oil_fraction, aicd.oilDensityExponent()) * oil_density