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

cleaing up and fixing the error from rebasing.

Browse Source
This commit is contained in:
Kai Bao 2017-08-10 13:33:45 +02:00
parent af6155d15a
commit 49df0c12f6
2 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
opm/autodiff/StandardWell_impl.hpp
View File

@ -807,7 +807,6 @@ namespace Opm
const BlackoilModelParameters& param, const BlackoilModelParameters& param,
WellState& well_state) const WellState& well_state) const
{ {
// TODO: to check whether all the things from PR 1220 were incoporated.
const int np = number_of_phases_; const int np = number_of_phases_;
const int nw = well_state.bhp().size(); const int nw = well_state.bhp().size();
const double dBHPLimit = param.dbhp_max_rel_; const double dBHPLimit = param.dbhp_max_rel_;
@ -1311,21 +1310,6 @@ namespace Opm
well_controls_set_current( wc, current); well_controls_set_current( wc, current);
} }
// update whether well is under group control
/* if (wellCollection()->groupControlActive()) {
// get well node in the well collection
WellNode& well_node = well_collection_->findWellNode(std::string(wells().name[w]));
// update whehter the well is under group control or individual control
if (well_node.groupControlIndex() >= 0 && current == well_node.groupControlIndex()) {
// under group control
well_node.setIndividualControl(false);
} else {
// individual control
well_node.setIndividualControl(true);
}
} */
// the new well control indices after all the related updates, // the new well control indices after all the related updates,
const int updated_control_index = xw.currentControls()[w]; const int updated_control_index = xw.currentControls()[w];
@ -1339,17 +1323,6 @@ namespace Opm
if (updated_control_index != old_control_index) { // || well_collection_->groupControlActive()) { if (updated_control_index != old_control_index) { // || well_collection_->groupControlActive()) {
updateWellStateWithTarget(updated_control_index, xw); updateWellStateWithTarget(updated_control_index, xw);
} }
// upate the well targets following group controls
// it will not change the control mode, only update the targets
/* if (wellCollection()->groupControlActive()) {
applyVREPGroupControl(xw);
wellCollection()->updateWellTargets(xw.wellRates());
for (int w = 0; w < nw; ++w) {
const WellControls* wc = wells().ctrls[w];
updateWellStateWithTarget(wc, updated_control_index[w], w, xw);
}
} */
} }

8
opm/autodiff/StandardWellsDense_impl.hpp
View File

@ -24,10 +24,6 @@ namespace Opm {
, has_polymer_(GET_PROP_VALUE(TypeTag, EnablePolymer)) , has_polymer_(GET_PROP_VALUE(TypeTag, EnablePolymer))
, current_timeIdx_(current_timeIdx) , current_timeIdx_(current_timeIdx)
, rate_converter_(rate_converter) , rate_converter_(rate_converter)
, well_perforation_efficiency_factors_((wells_!=nullptr ? wells_->well_connpos[wells_->number_of_wells] : 0), 1.0)
, well_perforation_densities_( wells_ ? wells_arg->well_connpos[wells_arg->number_of_wells] : 0)
, well_perforation_pressure_diffs_( wells_ ? wells_arg->well_connpos[wells_arg->number_of_wells] : 0)
, wellVariables_( wells_ ? (wells_arg->number_of_wells * numWellEq) : 0)
{ {
createWellContainer(wells_arg); createWellContainer(wells_arg);
} }
@ -507,7 +503,6 @@ namespace Opm {
well_state = well_state0; well_state = well_state0;
setWellSolutions(well_state); setWellSolutions(well_state);
// also recover the old well controls // also recover the old well controls
// TODO: well_solutions_ for each well not recovered here.
for (int w = 0; w < nw; ++w) { for (int w = 0; w < nw; ++w) {
WellControls* wc = well_container_[w]->wellControls(); WellControls* wc = well_container_[w]->wellControls();
well_controls_set_current(wc, well_state.currentControls()[w]); well_controls_set_current(wc, well_state.currentControls()[w]);
@ -586,6 +581,8 @@ namespace Opm {
} }
} }
// TODO: there should be a better way to do the following, while I did not find
// a direct way to handle boolean variables there.
{ {
const auto& grid = ebosSimulator.gridManager().grid(); const auto& grid = ebosSimulator.gridManager().grid();
int value = 0; int value = 0;
@ -995,7 +992,6 @@ namespace Opm {
StandardWellsDense<TypeTag>:: StandardWellsDense<TypeTag>::
computeRepRadiusPerfLength(const Grid& grid) computeRepRadiusPerfLength(const Grid& grid)
{ {
// TODO, the function does not work for parallel running // TODO, the function does not work for parallel running
// to be fixed later. // to be fixed later.
int number_of_cells = Opm::UgGridHelpers::numCells(grid); int number_of_cells = Opm::UgGridHelpers::numCells(grid);