mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false
This commit is contained in:
Magne Sjaastad
@@ -166,8 +166,11 @@ void RigCompletionData::setTransmissibility( double transmissibility )
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
void RigCompletionData::setTransAndWPImultBackgroundDataFromFishbone(
|
||||
double transmissibility, double skinFactor, double diameter, CellDirection direction, bool isMainBore )
|
||||
void RigCompletionData::setTransAndWPImultBackgroundDataFromFishbone( double transmissibility,
|
||||
double skinFactor,
|
||||
double diameter,
|
||||
CellDirection direction,
|
||||
bool isMainBore )
|
||||
{
|
||||
m_completionType = FISHBONES;
|
||||
m_transmissibility = transmissibility;
|
||||
@@ -180,8 +183,12 @@ void RigCompletionData::setTransAndWPImultBackgroundDataFromFishbone(
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
void RigCompletionData::setTransAndWPImultBackgroundDataFromPerforation(
|
||||
double transmissibility, double skinFactor, double diameter, double dFactor, double kh, CellDirection direction )
|
||||
void RigCompletionData::setTransAndWPImultBackgroundDataFromPerforation( double transmissibility,
|
||||
double skinFactor,
|
||||
double diameter,
|
||||
double dFactor,
|
||||
double kh,
|
||||
CellDirection direction )
|
||||
{
|
||||
m_completionType = PERFORATION;
|
||||
m_transmissibility = transmissibility;
|
||||
@@ -212,8 +219,11 @@ void RigCompletionData::setCombinedValuesExplicitTrans( double transmiss
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
void RigCompletionData::setCombinedValuesImplicitTransWPImult(
|
||||
double wpimult, double skinFactor, double diameter, CellDirection celldirection, CompletionType completionType )
|
||||
void RigCompletionData::setCombinedValuesImplicitTransWPImult( double wpimult,
|
||||
double skinFactor,
|
||||
double diameter,
|
||||
CellDirection celldirection,
|
||||
CompletionType completionType )
|
||||
{
|
||||
m_wpimult = wpimult;
|
||||
m_direction = celldirection;
|
||||
|
||||
@@ -98,11 +98,18 @@ public:
|
||||
void setDiameter( double diameter );
|
||||
void setTransmissibility( double transmissibility );
|
||||
|
||||
void setTransAndWPImultBackgroundDataFromFishbone(
|
||||
double transmissibility, double skinFactor, double diameter, CellDirection direction, bool isMainBore );
|
||||
void setTransAndWPImultBackgroundDataFromFishbone( double transmissibility,
|
||||
double skinFactor,
|
||||
double diameter,
|
||||
CellDirection direction,
|
||||
bool isMainBore );
|
||||
|
||||
void setTransAndWPImultBackgroundDataFromPerforation(
|
||||
double transmissibility, double skinFactor, double diameter, double dFactor, double kh, CellDirection direction );
|
||||
void setTransAndWPImultBackgroundDataFromPerforation( double transmissibility,
|
||||
double skinFactor,
|
||||
double diameter,
|
||||
double dFactor,
|
||||
double kh,
|
||||
CellDirection direction );
|
||||
|
||||
void setCombinedValuesExplicitTrans( double transmissibility,
|
||||
double skinFactor,
|
||||
@@ -110,8 +117,11 @@ public:
|
||||
CellDirection celldirection,
|
||||
CompletionType completionType );
|
||||
|
||||
void setCombinedValuesImplicitTransWPImult(
|
||||
double wpimult, double skinFactor, double diameter, CellDirection celldirection, CompletionType completionType );
|
||||
void setCombinedValuesImplicitTransWPImult( double wpimult,
|
||||
double skinFactor,
|
||||
double diameter,
|
||||
CellDirection celldirection,
|
||||
CompletionType completionType );
|
||||
|
||||
bool isNonDarcyFlow() const;
|
||||
void setDFactor( double dFactor );
|
||||
|
||||
@@ -154,8 +154,8 @@ double RigFractureTransmissibilityEquations::matrixToFractureTrans( double perm,
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
double RigFractureTransmissibilityEquations::effectiveInternalFractureToWellTransPDDHC(
|
||||
double sumScaledMatrixToFractureTrans, double scaledMatrixToWellTrans )
|
||||
double RigFractureTransmissibilityEquations::effectiveInternalFractureToWellTransPDDHC( double sumScaledMatrixToFractureTrans,
|
||||
double scaledMatrixToWellTrans )
|
||||
{
|
||||
double divisor = sumScaledMatrixToFractureTrans - scaledMatrixToWellTrans;
|
||||
if ( cvf::Math::abs( divisor ) > EPSILON )
|
||||
|
||||
@@ -68,7 +68,8 @@ RigVirtualPerforationTransmissibilities::~RigVirtualPerforationTransmissibilitie
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigVirtualPerforationTransmissibilities::setCompletionDataForWellPath(
|
||||
const RimWellPath* wellPath, const std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep )
|
||||
const RimWellPath* wellPath,
|
||||
const std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep )
|
||||
{
|
||||
auto item = m_mapFromWellToCompletionData.find( wellPath );
|
||||
|
||||
@@ -118,7 +119,8 @@ const std::map<size_t, std::vector<RigCompletionData>>&
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigVirtualPerforationTransmissibilities::setCompletionDataForSimWell(
|
||||
const RigSimWellData* simWellData, const std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep )
|
||||
const RigSimWellData* simWellData,
|
||||
const std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep )
|
||||
{
|
||||
m_mapFromSimWellToCompletionData[simWellData] = completionsPerTimeStep;
|
||||
}
|
||||
|
||||
@@ -676,8 +676,9 @@ std::vector<double> RigAccWellFlowCalculator::accumulatedDsBranchFlowPrTracer( c
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Calculate the flow pr tracer. If inconsistent flow, keep the existing fractions constant
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<double> RigAccWellFlowCalculator::calculateWellCellFlowPrTracer(
|
||||
const RigWellResultPoint& wellCell, const std::vector<double>& currentAccumulatedFlowPrTracer ) const
|
||||
std::vector<double>
|
||||
RigAccWellFlowCalculator::calculateWellCellFlowPrTracer( const RigWellResultPoint& wellCell,
|
||||
const std::vector<double>& currentAccumulatedFlowPrTracer ) const
|
||||
{
|
||||
std::vector<double> flowPrTracer( m_tracerNames.size(), 0.0 );
|
||||
|
||||
|
||||
@@ -1067,8 +1067,8 @@ bool RigCaseCellResultsData::ensureKnownResultLoaded( const RigEclipseResultAddr
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RigCaseCellResultsData::findAndLoadResultByName(
|
||||
const QString& resultName, const std::vector<RiaDefines::ResultCatType>& resultCategorySearchOrder )
|
||||
bool RigCaseCellResultsData::findAndLoadResultByName( const QString& resultName,
|
||||
const std::vector<RiaDefines::ResultCatType>& resultCategorySearchOrder )
|
||||
{
|
||||
RigEclipseResultAddress adr( resultName );
|
||||
|
||||
@@ -1368,7 +1368,8 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
size_t RigCaseCellResultsData::findOrLoadKnownScalarResultByResultTypeOrder(
|
||||
const RigEclipseResultAddress& resVarAddr, const std::vector<RiaDefines::ResultCatType>& resultCategorySearchOrder )
|
||||
const RigEclipseResultAddress& resVarAddr,
|
||||
const std::vector<RiaDefines::ResultCatType>& resultCategorySearchOrder )
|
||||
{
|
||||
std::set<RiaDefines::ResultCatType> otherResultTypesToSearch = {RiaDefines::STATIC_NATIVE,
|
||||
RiaDefines::DYNAMIC_NATIVE,
|
||||
|
||||
@@ -33,8 +33,10 @@ RigEclipseTimeStepInfo::RigEclipseTimeStepInfo( const QDateTime& date, int repor
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<RigEclipseTimeStepInfo> RigEclipseTimeStepInfo::createTimeStepInfos(
|
||||
std::vector<QDateTime> dates, std::vector<int> reportNumbers, std::vector<double> daysSinceSimulationStarts )
|
||||
std::vector<RigEclipseTimeStepInfo>
|
||||
RigEclipseTimeStepInfo::createTimeStepInfos( std::vector<QDateTime> dates,
|
||||
std::vector<int> reportNumbers,
|
||||
std::vector<double> daysSinceSimulationStarts )
|
||||
{
|
||||
CVF_ASSERT( dates.size() == reportNumbers.size() );
|
||||
CVF_ASSERT( dates.size() == daysSinceSimulationStarts.size() );
|
||||
|
||||
@@ -88,8 +88,10 @@ inline Opm::FlowDiagnostics::ConnectionValues
|
||||
return flux;
|
||||
}
|
||||
|
||||
inline Opm::FlowDiagnostics::ConnectionValues extractFluxFieldFromRestartFile(
|
||||
const Opm::ECLGraph& G, const Opm::ECLRestartData& rstrt, RigFlowDiagResultAddress::PhaseSelection phaseSelection )
|
||||
inline Opm::FlowDiagnostics::ConnectionValues
|
||||
extractFluxFieldFromRestartFile( const Opm::ECLGraph& G,
|
||||
const Opm::ECLRestartData& rstrt,
|
||||
RigFlowDiagResultAddress::PhaseSelection phaseSelection )
|
||||
{
|
||||
auto getFlux = [&G, &rstrt]( const Opm::ECLPhaseIndex p ) { return G.flux( rstrt, p ); };
|
||||
|
||||
|
||||
@@ -112,7 +112,8 @@ const std::vector<double>* RigFlowDiagResults::findOrCalculateResult( const RigF
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigFlowDiagResults::calculateNativeResultsIfNotPreviouslyAttempted(
|
||||
size_t timeStepIndex, RigFlowDiagResultAddress::PhaseSelection phaseSelection )
|
||||
size_t timeStepIndex,
|
||||
RigFlowDiagResultAddress::PhaseSelection phaseSelection )
|
||||
{
|
||||
if ( timeStepIndex >= m_hasAtemptedNativeResults.size() ) return;
|
||||
|
||||
@@ -899,8 +900,10 @@ RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame RigFlowDiagResults::flowCharacteristicsResults(
|
||||
int timeStepIndex, const std::vector<char>& visibleActiveCells, double max_pv_fraction )
|
||||
RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame
|
||||
RigFlowDiagResults::flowCharacteristicsResults( int timeStepIndex,
|
||||
const std::vector<char>& visibleActiveCells,
|
||||
double max_pv_fraction )
|
||||
{
|
||||
std::vector<QString> tracerNames = m_flowDiagSolution->tracerNames();
|
||||
|
||||
|
||||
@@ -101,8 +101,10 @@ public:
|
||||
double minCommunication,
|
||||
int maxTof );
|
||||
|
||||
RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame flowCharacteristicsResults(
|
||||
int timeStepIndex, const std::vector<char>& visibleActiveCells, double max_pv_fraction );
|
||||
RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame
|
||||
flowCharacteristicsResults( int timeStepIndex,
|
||||
const std::vector<char>& visibleActiveCells,
|
||||
double max_pv_fraction );
|
||||
|
||||
RimFlowDiagSolution* flowDiagSolution();
|
||||
|
||||
|
||||
@@ -864,8 +864,12 @@ std::vector<RigFlowDiagSolverInterface::PvtCurve>
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RigFlowDiagSolverInterface::calculatePvtDynamicPropertiesFvf(
|
||||
size_t activeCellIndex, double pressure, double rs, double rv, double* bo, double* bg )
|
||||
bool RigFlowDiagSolverInterface::calculatePvtDynamicPropertiesFvf( size_t activeCellIndex,
|
||||
double pressure,
|
||||
double rs,
|
||||
double rv,
|
||||
double* bo,
|
||||
double* bg )
|
||||
{
|
||||
if ( bo ) *bo = HUGE_VAL;
|
||||
if ( bg ) *bg = HUGE_VAL;
|
||||
@@ -927,8 +931,12 @@ bool RigFlowDiagSolverInterface::calculatePvtDynamicPropertiesFvf(
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RigFlowDiagSolverInterface::calculatePvtDynamicPropertiesViscosity(
|
||||
size_t activeCellIndex, double pressure, double rs, double rv, double* mu_o, double* mu_g )
|
||||
bool RigFlowDiagSolverInterface::calculatePvtDynamicPropertiesViscosity( size_t activeCellIndex,
|
||||
double pressure,
|
||||
double rs,
|
||||
double rv,
|
||||
double* mu_o,
|
||||
double* mu_g )
|
||||
{
|
||||
if ( mu_o ) *mu_o = HUGE_VAL;
|
||||
if ( mu_g ) *mu_g = HUGE_VAL;
|
||||
|
||||
@@ -151,10 +151,18 @@ public:
|
||||
|
||||
std::vector<RelPermCurve> calculateRelPermCurves( size_t activeCellIndex );
|
||||
std::vector<PvtCurve> calculatePvtCurves( PvtCurveType pvtCurveType, size_t activeCellIndex );
|
||||
bool calculatePvtDynamicPropertiesFvf(
|
||||
size_t activeCellIndex, double pressure, double rs, double rv, double* bo, double* bg );
|
||||
bool calculatePvtDynamicPropertiesViscosity(
|
||||
size_t activeCellIndex, double pressure, double rs, double rv, double* mu_o, double* mu_g );
|
||||
bool calculatePvtDynamicPropertiesFvf( size_t activeCellIndex,
|
||||
double pressure,
|
||||
double rs,
|
||||
double rv,
|
||||
double* bo,
|
||||
double* bg );
|
||||
bool calculatePvtDynamicPropertiesViscosity( size_t activeCellIndex,
|
||||
double pressure,
|
||||
double rs,
|
||||
double rv,
|
||||
double* mu_o,
|
||||
double* mu_g );
|
||||
|
||||
private:
|
||||
std::wstring getInitFileName() const;
|
||||
|
||||
@@ -404,8 +404,13 @@ size_t RigGridBase::addCoarseningBox( size_t i1, size_t i2, size_t j1, size_t j2
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigGridBase::coarseningBox(
|
||||
size_t coarseningBoxIndex, size_t* i1, size_t* i2, size_t* j1, size_t* j2, size_t* k1, size_t* k2 ) const
|
||||
void RigGridBase::coarseningBox( size_t coarseningBoxIndex,
|
||||
size_t* i1,
|
||||
size_t* i2,
|
||||
size_t* j1,
|
||||
size_t* j2,
|
||||
size_t* k1,
|
||||
size_t* k2 ) const
|
||||
{
|
||||
CVF_ASSERT( coarseningBoxIndex < m_coarseningBoxInfo.size() );
|
||||
|
||||
@@ -446,8 +451,11 @@ cvf::BoundingBox RigGridBase::boundingBox()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RigGridCellFaceVisibilityFilter::isFaceVisible(
|
||||
size_t i, size_t j, size_t k, cvf::StructGridInterface::FaceType face, const cvf::UByteArray* cellVisibility ) const
|
||||
bool RigGridCellFaceVisibilityFilter::isFaceVisible( size_t i,
|
||||
size_t j,
|
||||
size_t k,
|
||||
cvf::StructGridInterface::FaceType face,
|
||||
const cvf::UByteArray* cellVisibility ) const
|
||||
{
|
||||
CVF_TIGHT_ASSERT( m_grid );
|
||||
|
||||
|
||||
@@ -98,8 +98,8 @@ public:
|
||||
}
|
||||
size_t addCoarseningBox( size_t i1, size_t i2, size_t j1, size_t j2, size_t k1, size_t k2 );
|
||||
|
||||
void coarseningBox(
|
||||
size_t coarseningBoxIndex, size_t* i1, size_t* i2, size_t* j1, size_t* j2, size_t* k1, size_t* k2 ) const;
|
||||
void coarseningBox( size_t coarseningBoxIndex, size_t* i1, size_t* i2, size_t* j1, size_t* j2, size_t* k1, size_t* k2 )
|
||||
const;
|
||||
|
||||
cvf::BoundingBox boundingBox();
|
||||
|
||||
|
||||
@@ -279,8 +279,10 @@ std::vector<std::pair<QString, QString>> RigStimPlanFractureDefinition::getStimP
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<std::vector<double>> RigStimPlanFractureDefinition::conductivityValuesAtTimeStep(
|
||||
const QString& resultName, int activeTimeStepIndex, RiaEclipseUnitTools::UnitSystem requiredUnitSet ) const
|
||||
std::vector<std::vector<double>>
|
||||
RigStimPlanFractureDefinition::conductivityValuesAtTimeStep( const QString& resultName,
|
||||
int activeTimeStepIndex,
|
||||
RiaEclipseUnitTools::UnitSystem requiredUnitSet ) const
|
||||
{
|
||||
std::vector<std::vector<double>> conductivityValues;
|
||||
|
||||
|
||||
@@ -56,8 +56,10 @@ public:
|
||||
double wellPathAzimuthAngle( const cvf::Vec3d& position ) const;
|
||||
void twoClosestPoints( const cvf::Vec3d& position, cvf::Vec3d* p1, cvf::Vec3d* p2 ) const;
|
||||
|
||||
std::pair<std::vector<cvf::Vec3d>, std::vector<double>> clippedPointSubset(
|
||||
double startMD, double endMD, double* horizontalLengthAlongWellToStartClipPoint = nullptr ) const;
|
||||
std::pair<std::vector<cvf::Vec3d>, std::vector<double>>
|
||||
clippedPointSubset( double startMD,
|
||||
double endMD,
|
||||
double* horizontalLengthAlongWellToStartClipPoint = nullptr ) const;
|
||||
|
||||
std::vector<cvf::Vec3d> wellPathPointsIncludingInterpolatedIntersectionPoint( double intersectionMeasuredDepth ) const;
|
||||
|
||||
|
||||
@@ -33,8 +33,10 @@
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<WellPathCellIntersectionInfo> RigWellPathIntersectionTools::findCellIntersectionInfosAlongPath(
|
||||
const RigEclipseCaseData* caseData, const std::vector<cvf::Vec3d>& pathCoords, const std::vector<double>& pathMds )
|
||||
std::vector<WellPathCellIntersectionInfo>
|
||||
RigWellPathIntersectionTools::findCellIntersectionInfosAlongPath( const RigEclipseCaseData* caseData,
|
||||
const std::vector<cvf::Vec3d>& pathCoords,
|
||||
const std::vector<double>& pathMds )
|
||||
{
|
||||
std::vector<WellPathCellIntersectionInfo> intersectionInfos;
|
||||
|
||||
|
||||
@@ -636,8 +636,11 @@ inline double triArea3D( const cvf::Vec3d& v0, const cvf::Vec3d& v1, const cvf::
|
||||
/// a_i = Area(v_(i-1), v_i, v_(i+1))*Area(p, v_(i-2), v_(i-1))*Area(p, v_(i+1), v_(i+2))
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
cvf::Vec4d GeometryTools::barycentricCoords(
|
||||
const cvf::Vec3d& v0, const cvf::Vec3d& v1, const cvf::Vec3d& v2, const cvf::Vec3d& v3, const cvf::Vec3d& p )
|
||||
cvf::Vec4d GeometryTools::barycentricCoords( const cvf::Vec3d& v0,
|
||||
const cvf::Vec3d& v1,
|
||||
const cvf::Vec3d& v2,
|
||||
const cvf::Vec3d& v3,
|
||||
const cvf::Vec3d& p )
|
||||
{
|
||||
cvf::Vec4d w;
|
||||
cvf::Vec4d a;
|
||||
|
||||
@@ -53,8 +53,11 @@ public:
|
||||
bool* isLineDirDotNormalNegative );
|
||||
static cvf::Vec3d
|
||||
barycentricCoords( const cvf::Vec3d& t0, const cvf::Vec3d& t1, const cvf::Vec3d& t2, const cvf::Vec3d& p );
|
||||
static cvf::Vec4d barycentricCoords(
|
||||
const cvf::Vec3d& v0, const cvf::Vec3d& v1, const cvf::Vec3d& v2, const cvf::Vec3d& v3, const cvf::Vec3d& p );
|
||||
static cvf::Vec4d barycentricCoords( const cvf::Vec3d& v0,
|
||||
const cvf::Vec3d& v1,
|
||||
const cvf::Vec3d& v2,
|
||||
const cvf::Vec3d& v3,
|
||||
const cvf::Vec3d& p );
|
||||
template <typename DataType>
|
||||
static DataType interpolateQuad( const cvf::Vec3d& v1,
|
||||
DataType s1,
|
||||
@@ -163,8 +166,13 @@ private:
|
||||
double fractionAlongEdge2;
|
||||
};
|
||||
|
||||
void canonizeAddress(
|
||||
IndexType& e1P1, IndexType& e1P2, IndexType& e2P1, IndexType& e2P2, bool& flipE1, bool& flipE2, bool& flipE1E2 );
|
||||
void canonizeAddress( IndexType& e1P1,
|
||||
IndexType& e1P2,
|
||||
IndexType& e2P1,
|
||||
IndexType& e2P2,
|
||||
bool& flipE1,
|
||||
bool& flipE2,
|
||||
bool& flipE1E2 );
|
||||
|
||||
// A map containing the intersection data. The addressing is :
|
||||
// ( when leastVxIdxEdge1 < leastVxIdxEdge2 )
|
||||
|
||||
Reference in New Issue
Block a user