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

clang-format : Set PenaltyBreakAssignment to 130

Browse Source
This commit is contained in:
Magne Sjaastad
2019-11-04 15:08:09 +01:00
parent 7c8cf60dba
commit 57cab2457e
105 changed files with 596 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp
View File

@@ -733,10 +733,10 @@ std::vector<RigFlowDiagSolverInterface::RelPermCurve>
{
scaling.enable = static_cast<unsigned char>( 0 );
}
std::vector<Opm::FlowDiagnostics::Graph> graphArr = m_opmFlowDiagStaticData->m_eclSaturationFunc
->getSatFuncCurve( satFuncRequests,
static_cast<int>( activeCellIndex ),
scaling );
std::vector<Opm::FlowDiagnostics::Graph> graphArr =
m_opmFlowDiagStaticData->m_eclSaturationFunc->getSatFuncCurve( satFuncRequests,
static_cast<int>( activeCellIndex ),
scaling );
for ( size_t i = 0; i < graphArr.size(); i++ )
{
const RelPermCurve::Ident curveIdent = curveIdentNameArr[i].first;
@@ -786,10 +786,10 @@ std::vector<RigFlowDiagSolverInterface::PvtCurve>
{
// Bo
{
std::vector<Opm::ECLPVT::PVTGraph> graphArr = m_opmFlowDiagStaticData->m_eclPvtCurveCollection
->getPvtCurve( Opm::ECLPVT::RawCurve::FVF,
Opm::ECLPhaseIndex::Liquid,
static_cast<int>( activeCellIndex ) );
std::vector<Opm::ECLPVT::PVTGraph> graphArr =
m_opmFlowDiagStaticData->m_eclPvtCurveCollection->getPvtCurve( Opm::ECLPVT::RawCurve::FVF,
Opm::ECLPhaseIndex::Liquid,
static_cast<int>( activeCellIndex ) );
for ( Opm::ECLPVT::PVTGraph srcGraph : graphArr )
{
if ( srcGraph.press.size() > 0 )
@@ -802,10 +802,10 @@ std::vector<RigFlowDiagSolverInterface::PvtCurve>
// Bg
{
std::vector<Opm::ECLPVT::PVTGraph> graphArr = m_opmFlowDiagStaticData->m_eclPvtCurveCollection
->getPvtCurve( Opm::ECLPVT::RawCurve::FVF,
Opm::ECLPhaseIndex::Vapour,
static_cast<int>( activeCellIndex ) );
std::vector<Opm::ECLPVT::PVTGraph> graphArr =
m_opmFlowDiagStaticData->m_eclPvtCurveCollection->getPvtCurve( Opm::ECLPVT::RawCurve::FVF,
Opm::ECLPhaseIndex::Vapour,
static_cast<int>( activeCellIndex ) );
for ( Opm::ECLPVT::PVTGraph srcGraph : graphArr )
{
if ( srcGraph.press.size() > 0 )
@@ -821,10 +821,10 @@ std::vector<RigFlowDiagSolverInterface::PvtCurve>
{
// Visc_o / mu_o
{
std::vector<Opm::ECLPVT::PVTGraph> graphArr = m_opmFlowDiagStaticData->m_eclPvtCurveCollection
->getPvtCurve( Opm::ECLPVT::RawCurve::Viscosity,
Opm::ECLPhaseIndex::Liquid,
static_cast<int>( activeCellIndex ) );
std::vector<Opm::ECLPVT::PVTGraph> graphArr =
m_opmFlowDiagStaticData->m_eclPvtCurveCollection->getPvtCurve( Opm::ECLPVT::RawCurve::Viscosity,
Opm::ECLPhaseIndex::Liquid,
static_cast<int>( activeCellIndex ) );
for ( Opm::ECLPVT::PVTGraph srcGraph : graphArr )
{
if ( srcGraph.press.size() > 0 )
@@ -837,10 +837,10 @@ std::vector<RigFlowDiagSolverInterface::PvtCurve>
// Visc_g / mu_g
{
std::vector<Opm::ECLPVT::PVTGraph> graphArr = m_opmFlowDiagStaticData->m_eclPvtCurveCollection
->getPvtCurve( Opm::ECLPVT::RawCurve::Viscosity,
Opm::ECLPhaseIndex::Vapour,
static_cast<int>( activeCellIndex ) );
std::vector<Opm::ECLPVT::PVTGraph> graphArr =
m_opmFlowDiagStaticData->m_eclPvtCurveCollection->getPvtCurve( Opm::ECLPVT::RawCurve::Viscosity,
Opm::ECLPhaseIndex::Vapour,
static_cast<int>( activeCellIndex ) );
for ( Opm::ECLPVT::PVTGraph srcGraph : graphArr )
{
if ( srcGraph.press.size() > 0 )