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

White space cleanup

Browse Source
This commit is contained in:
Joakim Hove
2019-01-28 09:52:11 +01:00
parent bd4e872230
commit 6ca6f27640
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@@ -1728,9 +1728,9 @@ namespace Opm {
if (automaticShutInStr == "STOP") {
automaticShutIn = false;
}
const size_t wseqIndex = m_wells.size();
const size_t wseqIndex = m_wells.size();
Well well(wellName, wseqIndex,
headI, headJ, refDepth, drainageRadius,
preferredPhase, m_timeMap,
@@ -1820,7 +1820,7 @@ namespace Opm {
if (!child_groups.size()) {
//for (const auto& well_name : group.getWells( timeStep )) {
const auto& ch_wells = group.getWells( timeStep );
for (auto it= ch_wells.begin(); it != ch_wells.end(); it++) {
for (auto it= ch_wells.begin(); it != ch_wells.end(); it++) {
wells.push_back( getWell( *it ));
}
}
@@ -1829,9 +1829,9 @@ namespace Opm {
}
}
std::vector< const Well* > Schedule::getWells(size_t timeStep) const {
if (timeStep >= m_timeMap.size()) {
throw std::invalid_argument("Timestep to large");
@@ -1900,7 +1900,7 @@ namespace Opm {
}
void Schedule::addGroup(const std::string& groupName, size_t timeStep) {
const size_t gseqIndex = m_groups.size();
const size_t gseqIndex = m_groups.size();
m_groups.insert( groupName, Group { groupName, gseqIndex, m_timeMap, timeStep } );
m_events.addEvent( ScheduleEvents::NEW_GROUP , timeStep );
}
@@ -1952,15 +1952,15 @@ namespace Opm {
}
std::vector< const Group* > Schedule::getGroups(size_t timeStep) const {
if (timeStep >= m_timeMap.size()) {
throw std::invalid_argument("Timestep to large");
}
auto defined = [=]( const Group& g ) {
return g.hasBeenDefined( timeStep );
};
std::vector< const Group* > groups;
for( const auto& group : m_groups ) {
@@ -1969,7 +1969,7 @@ namespace Opm {
}
return groups;
}
void Schedule::addWellToGroup( Group& newGroup, Well& well , size_t timeStep) {
const std::string currentGroupName = well.getGroupName(timeStep);
if (currentGroupName != "") {