OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2046 Whitespace cleanup

Browse Source
This commit is contained in:
Jacob Støren
2017-11-03 08:23:35 +01:00
parent 2443199bfd
commit 7e1831bfa0
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp
View File

@@ -494,24 +494,6 @@ void RigSimulationWellCenterLineCalculator::finishPipeCenterLine(std::vector< st
pipeBranchesCLCoords.back().push_back(entryPointLastCell + 1.5*(lastCellCenter - entryPointLastCell) ); pipeBranchesCLCoords.back().push_back(entryPointLastCell + 1.5*(lastCellCenter - entryPointLastCell) );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -911,7 +893,7 @@ private:
} }
else // if ( endToGrow > 1 ) else // if ( endToGrow > 1 )
{ {
m_branchLines.push_back(std::make_pair(false, std::deque<size_t>{branchList.front(), cellWithNeighborsPair.first, neighbour })); m_branchLines.push_back(std::make_pair(false, std::deque<size_t>{ branchList.front(), cellWithNeighborsPair.first, neighbour } ));
auto newBranchLineIt = std::prev(m_branchLines.end()); auto newBranchLineIt = std::prev(m_branchLines.end());
growBranchListEnd(newBranchLineIt); growBranchListEnd(newBranchLineIt);
} }
@@ -994,9 +976,14 @@ private:
while ( nb != -1 ) while ( nb != -1 )
{ {
if ( prevCell == -1 ) if ( prevCell == -1 )
{
m_branchLines.push_back(std::make_pair(false, std::deque<size_t>{startCell, nb})); m_branchLines.push_back(std::make_pair(false, std::deque<size_t>{startCell, nb}));
}
else else
{
m_branchLines.push_back(std::make_pair(false, std::deque<size_t>{prevCell, startCell, nb})); m_branchLines.push_back(std::make_pair(false, std::deque<size_t>{prevCell, startCell, nb}));
}
m_unusedWellCellIndices.erase(nb); m_unusedWellCellIndices.erase(nb);
auto lastBranchIt = std::prev(m_branchLines.end()); auto lastBranchIt = std::prev(m_branchLines.end());
@@ -1068,6 +1055,7 @@ private:
return (point-cellCenter).length(); return (point-cellCenter).length();
} }
private:
// The bool tells if this can be expanded in the front, // The bool tells if this can be expanded in the front,
// Set to false when the branchLine starts from a branching cell (cell with more than two neighbors) // Set to false when the branchLine starts from a branching cell (cell with more than two neighbors)
std::list< std::pair<bool, std::deque<size_t> > > m_branchLines; std::list< std::pair<bool, std::deque<size_t> > > m_branchLines;
@@ -1082,8 +1070,6 @@ private:
const RigEclipseCaseData* m_eclipseCaseData; const RigEclipseCaseData* m_eclipseCaseData;
const RigWellResultFrame& m_orgWellResultFrame; const RigWellResultFrame& m_orgWellResultFrame;
}; };
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------