#4683 clang-format on all files in ApplicationCode

This commit is contained in:
Magne Sjaastad
2019-09-06 10:40:57 +02:00
parent 3a317504bb
commit fe9e567825
2092 changed files with 117952 additions and 111846 deletions

View File

@@ -24,23 +24,25 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigTransmissibilityEquations::wellBoreTransmissibilityComponent(double cellPerforationVectorComponent,
double permeabilityNormalDirection1,
double permeabilityNormalDirection2,
double cellSizeNormalDirection1,
double cellSizeNormalDirection2,
double wellRadius,
double skinFactor,
double cDarcyForRelevantUnit)
double RigTransmissibilityEquations::wellBoreTransmissibilityComponent( double cellPerforationVectorComponent,
double permeabilityNormalDirection1,
double permeabilityNormalDirection2,
double cellSizeNormalDirection1,
double cellSizeNormalDirection2,
double wellRadius,
double skinFactor,
double cDarcyForRelevantUnit )
{
double K = cvf::Math::sqrt(permeabilityNormalDirection1 * permeabilityNormalDirection2);
double K = cvf::Math::sqrt( permeabilityNormalDirection1 * permeabilityNormalDirection2 );
double nominator = cDarcyForRelevantUnit * 2 * cvf::PI_D * K * cellPerforationVectorComponent;
double peaceManRad = peacemanRadius(
permeabilityNormalDirection1, permeabilityNormalDirection2, cellSizeNormalDirection1, cellSizeNormalDirection2);
double peaceManRad = peacemanRadius( permeabilityNormalDirection1,
permeabilityNormalDirection2,
cellSizeNormalDirection1,
cellSizeNormalDirection2 );
double denominator = log(peaceManRad / wellRadius) + skinFactor;
double denominator = log( peaceManRad / wellRadius ) + skinFactor;
double trans = nominator / denominator;
return trans;
@@ -49,28 +51,28 @@ double RigTransmissibilityEquations::wellBoreTransmissibilityComponent(double ce
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigTransmissibilityEquations::totalConnectionFactor(double transX, double transY, double transZ)
double RigTransmissibilityEquations::totalConnectionFactor( double transX, double transY, double transZ )
{
return cvf::Math::sqrt(pow(transX, 2.0) + pow(transY, 2.0) + pow(transZ, 2.0));
return cvf::Math::sqrt( pow( transX, 2.0 ) + pow( transY, 2.0 ) + pow( transZ, 2.0 ) );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigTransmissibilityEquations::totalKh(double cellPermX,
double cellPermY,
double cellPermZ,
const cvf::Vec3d& internalCellLengths,
double lateralNtg,
double ntg)
double RigTransmissibilityEquations::totalKh( double cellPermX,
double cellPermY,
double cellPermZ,
const cvf::Vec3d& internalCellLengths,
double lateralNtg,
double ntg )
{
// Compute kh for each local grid cell axis
// Use permeability values for the two other axis
double khx = sqrt(cellPermY * cellPermZ) * internalCellLengths.x() * lateralNtg;
double khy = sqrt(cellPermX * cellPermZ) * internalCellLengths.y() * lateralNtg;
double khz = sqrt(cellPermX * cellPermY) * internalCellLengths.z() * ntg;
double khx = sqrt( cellPermY * cellPermZ ) * internalCellLengths.x() * lateralNtg;
double khy = sqrt( cellPermX * cellPermZ ) * internalCellLengths.y() * lateralNtg;
double khz = sqrt( cellPermX * cellPermY ) * internalCellLengths.z() * ntg;
const double totKh = cvf::Math::sqrt(khx * khx + khy * khy + khz * khz);
const double totKh = cvf::Math::sqrt( khx * khx + khy * khy + khz * khz );
return totKh;
}
@@ -78,12 +80,12 @@ double RigTransmissibilityEquations::totalKh(double cellPermX,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigTransmissibilityEquations::effectiveK(double cellPermX,
double cellPermY,
double cellPermZ,
const cvf::Vec3d& internalCellLengths,
double lateralNtg,
double ntg)
double RigTransmissibilityEquations::effectiveK( double cellPermX,
double cellPermY,
double cellPermZ,
const cvf::Vec3d& internalCellLengths,
double lateralNtg,
double ntg )
{
// Compute kh for each local grid cell axis
// Use permeability values for the two other axis
@@ -92,9 +94,9 @@ double RigTransmissibilityEquations::effectiveK(double cellPermX,
double ly = internalCellLengths.y() * lateralNtg;
double lz = internalCellLengths.z() * ntg;
double khx = sqrt(cellPermY * cellPermZ) * lx;
double khy = sqrt(cellPermX * cellPermZ) * ly;
double khz = sqrt(cellPermX * cellPermY) * lz;
double khx = sqrt( cellPermY * cellPermZ ) * lx;
double khy = sqrt( cellPermX * cellPermZ ) * ly;
double khz = sqrt( cellPermX * cellPermY ) * lz;
double nominator = khx + khy + khz;
double denominator = lx + ly + lz;
@@ -105,15 +107,15 @@ double RigTransmissibilityEquations::effectiveK(double cellPermX,
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
double RigTransmissibilityEquations::effectiveH(const cvf::Vec3d& internalCellLengths, double lateralNtg, double ntg)
double RigTransmissibilityEquations::effectiveH( const cvf::Vec3d& internalCellLengths, double lateralNtg, double ntg )
{
double lx = internalCellLengths.x() * lateralNtg;
double ly = internalCellLengths.y() * lateralNtg;
double lz = internalCellLengths.z() * ntg;
double effH = cvf::Math::sqrt(lx*lx + ly*ly + lz*lz);
double effH = cvf::Math::sqrt( lx * lx + ly * ly + lz * lz );
return effH;
}
@@ -121,11 +123,11 @@ double RigTransmissibilityEquations::effectiveH(const cvf::Vec3d& internalCellLe
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigTransmissibilityEquations::permeability(const double conductivity, const double width)
double RigTransmissibilityEquations::permeability( const double conductivity, const double width )
{
double threshold = 1e-7;
if (std::fabs(width) > threshold)
if ( std::fabs( width ) > threshold )
{
double perm = conductivity / width;
@@ -140,17 +142,17 @@ double RigTransmissibilityEquations::permeability(const double conductivity, con
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigTransmissibilityEquations::peacemanRadius(double permeabilityNormalDirection1,
double permeabilityNormalDirection2,
double cellSizeNormalDirection1,
double cellSizeNormalDirection2)
double RigTransmissibilityEquations::peacemanRadius( double permeabilityNormalDirection1,
double permeabilityNormalDirection2,
double cellSizeNormalDirection1,
double cellSizeNormalDirection2 )
{
double numerator = cvf::Math::sqrt(
pow(cellSizeNormalDirection2, 2.0) * pow(permeabilityNormalDirection1 / permeabilityNormalDirection2, 0.5) +
pow(cellSizeNormalDirection1, 2.0) * pow(permeabilityNormalDirection2 / permeabilityNormalDirection1, 0.5));
pow( cellSizeNormalDirection2, 2.0 ) * pow( permeabilityNormalDirection1 / permeabilityNormalDirection2, 0.5 ) +
pow( cellSizeNormalDirection1, 2.0 ) * pow( permeabilityNormalDirection2 / permeabilityNormalDirection1, 0.5 ) );
double denominator = pow((permeabilityNormalDirection1 / permeabilityNormalDirection2), 0.25) +
pow((permeabilityNormalDirection2 / permeabilityNormalDirection1), 0.25);
double denominator = pow( ( permeabilityNormalDirection1 / permeabilityNormalDirection2 ), 0.25 ) +
pow( ( permeabilityNormalDirection2 / permeabilityNormalDirection1 ), 0.25 );
double r0 = 0.28 * numerator / denominator;