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 AllowAllParametersOfDeclarationOnNextLine to false

Browse Source
This commit is contained in:
Magne Sjaastad
2019-11-04 14:35:41 +01:00
parent 946f9e7f91
commit 7c8cf60dba
83 changed files with 495 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/ReservoirDataModel/Completions/RigCompletionData.cpp
View File

@@ -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;

22
ApplicationCode/ReservoirDataModel/Completions/RigCompletionData.h
View File

@@ -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 );

4
ApplicationCode/ReservoirDataModel/Completions/RigFractureTransmissibilityEquations.cpp
View File

@@ -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 )

6
ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.cpp
View File

@@ -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;
}