adding updateWellState and updateWellControls to StandardWells

This commit is contained in:
Kai Bao
2016-04-11 15:45:03 +02:00
parent 376c940f09
commit 5da57973fe
10 changed files with 466 additions and 396 deletions

View File

@@ -174,6 +174,7 @@ namespace Opm {
using Base::terminal_output_;
using Base::primalVariable_;
using Base::pvdt_;
using Base::vfp_properties_;
// --------- Protected methods ---------
@@ -199,7 +200,7 @@ namespace Opm {
using Base::drMaxRel;
using Base::maxResidualAllowed;
using Base::updateWellControls;
// using Base::updateWellControls;
using Base::computeWellConnectionPressures;
using Base::addWellControlEq;
using Base::computeRelPerm;

View File

@@ -498,7 +498,9 @@ namespace Opm {
// Possibly switch well controls and updating well state to
// get reasonable initial conditions for the wells
updateWellControls(well_state);
const double gravity = detail::getGravity(geo_.gravity(), UgGridHelpers::dimensions(grid_));
// updateWellControls(well_state);
stdWells().updateWellControls(fluid_.phaseUsage(), gravity, vfp_properties_, terminal_output_, active_, well_state);
// Create the primary variables.
SolutionState state = variableState(reservoir_state, well_state);