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

cleaning up the output and adding more comments.

Browse Source
This commit is contained in:
Kai Bao 2016-10-13 12:38:04 +02:00
parent d992161b82
commit 26b16c1050
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -1057,14 +1057,13 @@ namespace detail {
asImpl().wellModel().addWellControlEq(wellSolutionState, well_state, aliveWells, residual_); asImpl().wellModel().addWellControlEq(wellSolutionState, well_state, aliveWells, residual_);
converged = getWellConvergence(it); converged = getWellConvergence(it);
// When the well targets are just updated or need to be updated, we need at least one more iteration.
if (asImpl().wellModel().justUpdateWellTargets()) { if (asImpl().wellModel().justUpdateWellTargets()) {
std::cout << "converged changed to false due to justUpdateWellTargets " << std::endl;
converged = false; converged = false;
asImpl().wellModel().setJustUpdateWellTargets(false); asImpl().wellModel().setJustUpdateWellTargets(false);
} }
if (converged && asImpl().wellModel().needUpdateWellTargets()) { if (converged && asImpl().wellModel().needUpdateWellTargets()) {
std::cout << "converged changed to false due to needUpdateWellTargets " << std::endl;
converged = false; converged = false;
} }
@ -1089,9 +1088,7 @@ namespace detail {
const Eigen::VectorXd& dx = solver.solve(total_residual_v.matrix()); const Eigen::VectorXd& dx = solver.solve(total_residual_v.matrix());
assert(dx.size() == total_residual_v.size()); assert(dx.size() == total_residual_v.size());
asImpl().wellModel().updateWellState(dx.array(), dpMaxRel(), well_state); asImpl().wellModel().updateWellState(dx.array(), dpMaxRel(), well_state);
std::cout << "after updateWellState " << std::endl;
asImpl().wellModel().updateWellControls(well_state); asImpl().wellModel().updateWellControls(well_state);
std::cout << " justUpdateWellTargets " << asImpl().wellModel().justUpdateWellTargets() << std::endl;
} }
// We have to update the well controls regardless whether there are local // We have to update the well controls regardless whether there are local
// wells active or not as parallel logging will take place that needs to // wells active or not as parallel logging will take place that needs to

12
opm/autodiff/StandardWells_impl.hpp
View File

@ -777,20 +777,19 @@ namespace Opm
xw.currentControls()[w] = ctrl_index; xw.currentControls()[w] = ctrl_index;
current = xw.currentControls()[w]; current = xw.currentControls()[w];
// not good practice, revising the interface for the better implementation later. // not good practice, not easy to put groupControlIndex to WellsGroup.
auto* well_node = dynamic_cast<Opm::WellNode *>(well_collection_->findNode(std::string(wells().name[w]))); // revising the interface for the better implementation later.
WellNode* well_node = dynamic_cast<Opm::WellNode *>(well_collection_->findNode(std::string(wells().name[w])));
// When the wells swtiching back and forwards between individual control and group control // When the wells swtiching back and forwards between individual control and group control
// The targets of the wells should be updated. // The targets of the wells should be updated.
if (well_node->individualControl()) { if (well_node->individualControl()) {
if (ctrl_index == well_node->groupControlIndex()) { if (ctrl_index == well_node->groupControlIndex()) {
std::cout << "well " << well_node->name() << " is switching from individual control to group control " << std::endl;
well_node->setIndividualControl(false); well_node->setIndividualControl(false);
} }
} else { } else {
if (ctrl_index != well_node->groupControlIndex()) { if (ctrl_index != well_node->groupControlIndex()) {
well_node->setIndividualControl(true); well_node->setIndividualControl(true);
std::cout << "well " << well_node->name() << " is switching from group control to individual control " << std::endl;
} }
} }
// TODO: double confirming the current strategy // TODO: double confirming the current strategy
@ -798,7 +797,10 @@ namespace Opm
} else { } else {
// no constraints got broken // no constraints got broken
// the wells running under group control should set to be under group control // the wells running under group control should set to be under group control
auto* well_node = dynamic_cast<Opm::WellNode *>(well_collection_->findNode(std::string(wells().name[w]))); // it is based on the fact that we begin with setting all the wells be be under individual control
// The wells switch to be under group control after breaking one of the group target/limit.
// It is the same philosophy with the current srategy of the well control changing.
WellNode* well_node = dynamic_cast<Opm::WellNode *>(well_collection_->findNode(std::string(wells().name[w])));
if (well_node->individualControl()) { if (well_node->individualControl()) {
// the wells running under group control, meaning they are not under individual control // the wells running under group control, meaning they are not under individual control
if (current == well_node->groupControlIndex()) { if (current == well_node->groupControlIndex()) {