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

Fixes by clang-format

Browse Source
This commit is contained in:
github-actions[bot]
2020-06-08 09:09:11 +00:00
committed by Magne Sjaastad
parent 64a719b1f4
commit 6b5f4dddc9
58 changed files with 202 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ReservoirDataModel/RigCellFaceGeometryTools.cpp
View File

@@ -43,7 +43,7 @@ cvf::StructGridInterface::FaceType
{
// Try to find the shared face
bool isPossibleNeighborInDirection[6] = { true, true, true, true, true, true };
bool isPossibleNeighborInDirection[6] = {true, true, true, true, true, true};
if ( c1.hostGrid() == c2.hostGrid() )
{

5
ApplicationCode/ReservoirDataModel/RigFishbonesGeometry.cpp
View File

@@ -107,10 +107,11 @@ void RigFisbonesGeometry::computeLateralPositionAndOrientation( size_t subI
}
{
double initialRotationAngle = m_fishbonesSub->rotationAngle( subIndex );
double initialRotationAngle = m_fishbonesSub->rotationAngle( subIndex );
double lateralOffsetDegrees = 360.0 / m_fishbonesSub->lateralLengths().size();
double lateralOffsetRadians = cvf::Math::toRadians( initialRotationAngle + lateralOffsetDegrees * lateralIndex );
double lateralOffsetRadians =
cvf::Math::toRadians( initialRotationAngle + lateralOffsetDegrees * lateralIndex );
cvf::Mat4d lateralOffsetMatrix = cvf::Mat4d::fromRotation( alongWellPath, lateralOffsetRadians );

8
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@@ -910,10 +910,10 @@ void RigMainGrid::setDualPorosity( bool enable )
//--------------------------------------------------------------------------------------------------
std::array<double, 6> RigMainGrid::defaultMapAxes()
{
const double origin[2] = { 0.0, 0.0 };
const double xPoint[2] = { 1.0, 0.0 };
const double yPoint[2] = { 0.0, 1.0 };
const double origin[2] = {0.0, 0.0};
const double xPoint[2] = {1.0, 0.0};
const double yPoint[2] = {0.0, 1.0};
// Order (see Elipse Reference Manual for keyword MAPAXES): Y_x, Y_y, O_x, O_y, X_x, X_y
return { yPoint[0], yPoint[1], origin[0], origin[1], xPoint[0], xPoint[1] };
return {yPoint[0], yPoint[1], origin[0], origin[1], xPoint[0], xPoint[1]};
}