OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-18 21:43:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Changed input arguments for group checking

Browse Source
This commit is contained in:
Kjetil Olsen Lye 2012-04-12 16:56:58 +02:00
parent 608766421b
commit fb6bde6e04
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/core/WellCollection.cpp
View File

@ -88,9 +88,9 @@ namespace Opm
return NULL;
}
bool WellCollection::conditionsMet(const std::vector<double>& pressure, const UnstructuredGrid& grid) const {
bool WellCollection::conditionsMet(const std::vector<double>& well_bhp, const std::vector<double>& well_rate) const {
for(size_t i = 0; i < leaf_nodes_.size(); i++) {
if(! static_cast<WellNode*>(leaf_nodes_[i].get())->conditionsMet(pressure, grid) ) {
if(! static_cast<WellNode*>(leaf_nodes_[i].get())->conditionsMet(well_bhp, well_rate) ) {
return false;
}
}

2
opm/core/WellCollection.hpp
View File

@ -40,7 +40,7 @@ namespace Opm
const EclipseGridParser& deck);
bool conditionsMet(const std::vector<double>& pressure, const UnstructuredGrid& grid) const;
bool conditionsMet(const std::vector<double>& well_bhp, const std::vector<double>& well_rate) const;
const std::vector<std::tr1::shared_ptr<WellsGroupInterface> >& getLeafNodes() const;
private:

10
opm/core/WellsGroup.cpp
View File

@ -64,11 +64,11 @@ namespace Opm
}
bool WellsGroup::conditionsMet(const std::vector<double>& pressure,
const UnstructuredGrid& grid, const struct Wells* wells, int index_of_well)
bool WellsGroup::conditionsMet(const std::vector<double>& well_bhp, const std::vector<double>& well_rate,
const struct Wells* wells, int index_of_well)
{
if(parent_ != NULL) {
bool parent_ok = (static_cast<WellsGroup*>(parent_))->conditionsMet(pressure, grid, wells, index_of_well);
bool parent_ok = (static_cast<WellsGroup*>(parent_))->conditionsMet(well_bhp, well_rate, wells, index_of_well);
if(!parent_ok) {
return false;
}
@ -88,10 +88,10 @@ namespace Opm
{
}
bool WellNode::conditionsMet(const std::vector<double>& pressure, const UnstructuredGrid& grid)
bool WellNode::conditionsMet(const std::vector<double>& well_bhp, const std::vector<double>& well_rate)
{
if(parent_ != NULL) {
bool parent_ok = (static_cast<WellsGroup*>(parent_))->conditionsMet(pressure, grid, wells_, self_index_);
bool parent_ok = (static_cast<WellsGroup*>(parent_))->conditionsMet(well_bhp, well_rate, wells_, self_index_);
if(!parent_ok) {
return false;
}

4
opm/core/WellsGroup.hpp
View File

@ -58,7 +58,7 @@ namespace Opm
void addChild(std::tr1::shared_ptr<WellsGroupInterface> child);
bool conditionsMet(const std::vector<double>& pressure, const UnstructuredGrid& grid, const struct Wells* wells,
bool conditionsMet(const std::vector<double>& well_bhp, const std::vector<double>& well_rate, const struct Wells* wells,
int index_of_well);
private:
std::vector<std::tr1::shared_ptr<WellsGroupInterface> > children_;
@ -74,7 +74,7 @@ namespace Opm
InjectionSpecification inj_spec);
virtual WellsGroupInterface* findGroup(std::string name_of_node);
virtual bool conditionsMet(const std::vector<double>& pressure, const UnstructuredGrid& grid);
virtual bool conditionsMet(const std::vector<double>& well_bhp, const std::vector<double>& well_rate);
virtual bool isLeafNode() const;
void setWellsPointer(const struct Wells* wells, int self_index);