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

Merge branch 'master' into reorder_tof

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-10-08 16:16:05 +02:00
commit ca71fe5132
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/core/simulator/SimulatorCompressibleTwophase.cpp
View File

@ -407,8 +407,8 @@ namespace Opm
// Optionally, check if well controls are satisfied. // Optionally, check if well controls are satisfied.
if (check_well_controls_) { if (check_well_controls_) {
Opm::computePhaseFlowRatesPerWell(*wells_, Opm::computePhaseFlowRatesPerWell(*wells_,
fractional_flows,
well_state.perfRates(), well_state.perfRates(),
fractional_flows,
well_resflows_phase); well_resflows_phase);
std::cout << "Checking well conditions." << std::endl; std::cout << "Checking well conditions." << std::endl;
// For testing we set surface := reservoir // For testing we set surface := reservoir

2
opm/core/wells/WellsGroup.cpp
View File

@ -863,7 +863,7 @@ namespace Opm
return; return;
} }
// We're a producer, so we need to negate the input // We're a producer, so we need to negate the input
double ntarget = target; double ntarget = -target;
double distr[3] = { 0.0, 0.0, 0.0 }; double distr[3] = { 0.0, 0.0, 0.0 };
const int* phase_pos = phaseUsage().phase_pos; const int* phase_pos = phaseUsage().phase_pos;