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

Changed the WellCollection addChild functions to be more specific, and strict

Browse Source
This commit is contained in:
Kristian Flikka
2014-02-13 16:00:39 +01:00
parent 663eb5a56d
commit 15a7255f30
4 changed files with 41 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,56 +27,52 @@
namespace Opm
{
void WellCollection::addChild(GroupConstPtr groupChild, GroupConstPtr groupParent,
void WellCollection::addField(GroupConstPtr fieldGroup, size_t timeStep, const PhaseUsage& phaseUsage) {
WellsGroupInterface* fieldNode = findNode(fieldGroup->name());
if (fieldNode) {
OPM_THROW(std::runtime_error, "Trying to add FIELD node, but this already exists. Can only have one FIELD node.");
}
roots_.push_back(createGroupWellsGroup(fieldGroup, timeStep, phaseUsage));
}
void WellCollection::addGroup(GroupConstPtr groupChild, std::string parent_name,
size_t timeStep, const PhaseUsage& phaseUsage) {
WellsGroupInterface* parent = findNode(groupParent->name());
WellsGroupInterface* parent = findNode(parent_name);
if (!parent) {
roots_.push_back(createGroupWellsGroup(groupParent, timeStep, phaseUsage));
parent = roots_[roots_.size() - 1].get();
OPM_THROW(std::runtime_error, "Trying to add child to group named " << parent_name << ", but this does not exist in the WellCollection.");
}
std::shared_ptr<WellsGroupInterface> child = getAndUnRootChild(groupChild->name());
if (findNode(groupChild->name())) {
OPM_THROW(std::runtime_error, "Trying to add child named " << groupChild->name() << ", but this group is already in the WellCollection.");
if (!child.get()) {
child = createGroupWellsGroup(groupChild, timeStep, phaseUsage);
}
std::shared_ptr<WellsGroupInterface> child = createGroupWellsGroup(groupChild, timeStep, phaseUsage);
WellsGroup* parent_as_group = static_cast<WellsGroup*> (parent);
if (!parent_as_group) {
OPM_THROW(std::runtime_error, "Trying to add child to group named " << groupParent->name() << ", but it's not a group.");
OPM_THROW(std::runtime_error, "Trying to add child to group named " << parent->name() << ", but it's not a group.");
}
parent_as_group->addChild(child);
if(child->isLeafNode()) {
leaf_nodes_.push_back(static_cast<WellNode*>(child.get()));
}
child->setParent(parent);
}
void WellCollection::addChild(WellConstPtr wellChild, GroupConstPtr groupParent,
size_t timeStep, const PhaseUsage& phaseUsage) {
WellsGroupInterface* parent = findNode(groupParent->name());
void WellCollection::addWell(WellConstPtr wellChild, size_t timeStep, const PhaseUsage& phaseUsage) {
WellsGroupInterface* parent = findNode(wellChild->getGroupName(timeStep));
if (!parent) {
roots_.push_back(createGroupWellsGroup(groupParent, timeStep, phaseUsage));
parent = roots_[roots_.size() - 1].get();
OPM_THROW(std::runtime_error, "Trying to add child to group named " << wellChild->getGroupName(timeStep) << ", but this group does not exist in the WellCollection.");
}
std::shared_ptr<WellsGroupInterface> child = getAndUnRootChild(wellChild->name());
if (!child.get()) {
child = createWellWellsGroup(wellChild, timeStep, phaseUsage);
}
std::shared_ptr<WellsGroupInterface> child = createWellWellsGroup(wellChild, timeStep, phaseUsage);
WellsGroup* parent_as_group = static_cast<WellsGroup*> (parent);
if (!parent_as_group) {
OPM_THROW(std::runtime_error, "Trying to add child to group named " << groupParent->name() << ", but it's not a group.");
OPM_THROW(std::runtime_error, "Trying to add child to group named " << wellChild->getGroupName(timeStep) << ", but it's not a group.");
}
parent_as_group->addChild(child);
if(child->isLeafNode()) {
leaf_nodes_.push_back(static_cast<WellNode*>(child.get()));
}
leaf_nodes_.push_back(static_cast<WellNode*>(child.get()));
child->setParent(parent);
}

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

@@ -40,28 +40,13 @@ namespace Opm
{
public:
/// Adds and creates if necessary the child to the collection
/// and appends it to parent's children. Also adds and creates the parent
/// if necessary.
/// \param[in] wellChild the child well
/// \param[in] groupParent the parent group
/// \param[in] phaseUsage the phase usage
/// \param[in] timeStep the current time step
void addChild(WellConstPtr wellChild, GroupConstPtr groupParent,
void addField(GroupConstPtr fieldGroup, size_t timeStep, const PhaseUsage& phaseUsage);
void addWell(WellConstPtr wellChild, size_t timeStep, const PhaseUsage& phaseUsage);
void addGroup(GroupConstPtr groupChild, std::string parent_name,
size_t timeStep, const PhaseUsage& phaseUsage);
/// Adds and creates if necessary the child to the collection
/// and appends it to parent's children. Also adds and creates the parent
/// if necessary.
/// \param[in] groupChild the child group
/// \param[in] groupParent the parent group
/// \param[in] phaseUsage the phase usage
/// \param[in] timeStep the current time step
void addChild(GroupConstPtr groupChild, GroupConstPtr groupParent,
size_t timeStep, const PhaseUsage& phaseUsage);
/// Adds and creates if necessary the child to the collection
/// and appends it to parent's children. Also adds and creates the parent
/// if necessary.