some pure cleaning up.

This commit is contained in:
Kai Bao 2016-05-11 11:43:48 +02:00
parent f2b7f2a56c
commit 19a256dce0
3 changed files with 1 additions and 10 deletions

View File

@ -377,11 +377,6 @@ namespace Opm {
void void
assembleMassBalanceEq(const SolutionState& state); assembleMassBalanceEq(const SolutionState& state);
// TODO: only kept for now due to flow_multisegment
// will be removed soon
void updateWellState(const V& dwells,
WellState& well_state);
bool bool
solveWellEq(const std::vector<ADB>& mob_perfcells, solveWellEq(const std::vector<ADB>& mob_perfcells,

View File

@ -222,7 +222,7 @@ namespace detail {
well_model_.init(&fluid_, &active_, &phaseCondition_, &vfp_properties_, gravity, depth); well_model_.init(&fluid_, &active_, &phaseCondition_, &vfp_properties_, gravity, depth);
// TODO: put this for now to avoid modify the following code. // TODO: put this for now to avoid modify the following code.
// TODO: this code is fragile. // TODO: this code can be fragile.
const Wells* wells_arg = &(asImpl().well_model_.wells()); const Wells* wells_arg = &(asImpl().well_model_.wells());
#if HAVE_MPI #if HAVE_MPI
@ -765,8 +765,6 @@ namespace detail {
// Possibly switch well controls and updating well state to // Possibly switch well controls and updating well state to
// get reasonable initial conditions for the wells // get reasonable initial conditions for the wells
// asImpl().updateWellControls(well_state);
// asImpl().wellModel().updateWellControls(well_state);
asImpl().wellModel().updateWellControls(terminal_output_, well_state); asImpl().wellModel().updateWellControls(terminal_output_, well_state);
// Create the primary variables. // Create the primary variables.
@ -814,7 +812,6 @@ namespace detail {
asImpl().wellModel().addWellFluxEq(cq_s, state, residual_); asImpl().wellModel().addWellFluxEq(cq_s, state, residual_);
asImpl().addWellContributionToMassBalanceEq(cq_s, state, well_state); asImpl().addWellContributionToMassBalanceEq(cq_s, state, well_state);
asImpl().wellModel().addWellControlEq(state, well_state, aliveWells, residual_); asImpl().wellModel().addWellControlEq(state, well_state, aliveWells, residual_);
// asImpl().computeWellPotentials(state, mob_perfcells, b_perfcells, well_state);
{ {
SolutionState state0 = state; SolutionState state0 = state;
asImpl().makeConstantState(state0); asImpl().makeConstantState(state0);

View File

@ -591,7 +591,6 @@ namespace Opm
{ {
if( localWellsActive() ) if( localWellsActive() )
{ {
// TODO: these parameter should be stored in the StandardWells class
const int np = num_phases_; const int np = num_phases_;
const int nw = wells().number_of_wells; const int nw = wells().number_of_wells;