Merge pull request #2086 from joakim-hove/group-is-field
Add method Group::is_field()
This commit is contained in:
commit
624ff50628
@ -231,6 +231,7 @@ struct ProductionControls {
|
|||||||
bool defined(std::size_t timeStep) const;
|
bool defined(std::size_t timeStep) const;
|
||||||
std::size_t insert_index() const;
|
std::size_t insert_index() const;
|
||||||
const std::string& name() const;
|
const std::string& name() const;
|
||||||
|
bool is_field() const;
|
||||||
int getGroupNetVFPTable() const;
|
int getGroupNetVFPTable() const;
|
||||||
|
|
||||||
bool updateNetVFPTable(int vfp_arg);
|
bool updateNetVFPTable(int vfp_arg);
|
||||||
|
@ -134,6 +134,10 @@ const std::string& Group::name() const {
|
|||||||
return this->m_name;
|
return this->m_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool Group::is_field() const {
|
||||||
|
return (this->m_name == "FIELD");
|
||||||
|
}
|
||||||
|
|
||||||
const Group::GroupProductionProperties& Group::productionProperties() const {
|
const Group::GroupProductionProperties& Group::productionProperties() const {
|
||||||
return this->production_properties;
|
return this->production_properties;
|
||||||
}
|
}
|
||||||
|
@ -523,6 +523,9 @@ BOOST_AUTO_TEST_CASE(GCONINJE_GCONPROD) {
|
|||||||
BOOST_CHECK(!g2.injectionGroupControlAvailable(Phase::WATER));
|
BOOST_CHECK(!g2.injectionGroupControlAvailable(Phase::WATER));
|
||||||
BOOST_CHECK( g1.injectionGroupControlAvailable(Phase::GAS));
|
BOOST_CHECK( g1.injectionGroupControlAvailable(Phase::GAS));
|
||||||
BOOST_CHECK( g2.injectionGroupControlAvailable(Phase::GAS));
|
BOOST_CHECK( g2.injectionGroupControlAvailable(Phase::GAS));
|
||||||
|
|
||||||
|
BOOST_CHECK(f.is_field());
|
||||||
|
BOOST_CHECK(!g1.is_field());
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
const auto& g1 = schedule.getGroup("G1", 1);
|
const auto& g1 = schedule.getGroup("G1", 1);
|
||||||
|
Loading…
Reference in New Issue
Block a user