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

fixing the comilation problem from rebasing.

Browse Source
This commit is contained in:
Kai Bao 2016-10-10 11:37:22 +02:00
parent e183ab6ccd
commit fec53a1af5
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,7 +239,7 @@ namespace Opm
const size_t WellCollection::numNode() const
size_t WellCollection::numNode() const
{
return leaf_nodes_.size();
}

2
opm/core/wells/WellCollection.hpp
View File

@ -120,7 +120,7 @@ namespace Opm
bool needUpdateInjectionTargets() const;
bool needUpdateProductionTargets() const;
const size_t numNode() const;
size_t numNode() const;
WellNode* getNode(size_t i) const;

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

@ -1027,7 +1027,7 @@ namespace Opm
// Current understanding. Two ways might prevent to return the guide_rate here
// 1. preventing the well from group control with keyword WGRUPCON
// 2. the well violating some limits and working under limits.
if (!only_group || !individual_control_) {
if (!only_group || !individualControl()) {
return prodSpec().guide_rate_;
} else {
return 0.0;
@ -1039,7 +1039,7 @@ namespace Opm
/// wells under group control
double WellNode::injectionGuideRate(bool only_group)
{
if (!only_group || !individual_control_) {
if (!only_group || !individualControl()) {
return injSpec().guide_rate_;
} else {
return 0.0;

11
opm/core/wells/WellsGroup.hpp
View File

@ -230,11 +230,6 @@ namespace Opm
WellsGroupInterface* parent_;
private:
std::string name_;
ProductionSpecification production_specification_;
InjectionSpecification injection_specification_;
PhaseUsage phase_usage_;
// when some well (mabye group also later), change status from group control
// to individual control, or the other way, the targets for the wells in the group need to be redistributed.
bool should_update_well_targets_;
@ -242,6 +237,12 @@ namespace Opm
// Current only consider one level of control.
// So not putting it in the WellsGroupInterface yet.
bool individual_control_;
private:
std::string name_;
ProductionSpecification production_specification_;
InjectionSpecification injection_specification_;
PhaseUsage phase_usage_;
};