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

Remove compiler warnings

Browse Source
This commit is contained in:
Jacob Støren 2019-01-23 14:05:02 +01:00
parent 1d8e31fe91
commit 726f5ee596
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.cpp
View File

@ -203,7 +203,7 @@ public:
std::array<FaceType, 4> adjacentFaces(FaceType face) std::array<FaceType, 4> adjacentFaces(FaceType face)
{ {
std::array<FaceType, 4> clipFaces; std::array<FaceType, 4> clipFaces = {FaceType::NO_FACE, FaceType::NO_FACE, FaceType::NO_FACE, FaceType::NO_FACE} ;
FaceType oppFace = cvf::StructGridInterface::oppositeFace(face); FaceType oppFace = cvf::StructGridInterface::oppositeFace(face);
int clipFaceCount = 0; int clipFaceCount = 0;
for (int faceCand = 0; faceCand < 6; ++faceCand ) for (int faceCand = 0; faceCand < 6; ++faceCand )

3
ApplicationCode/ReservoirDataModel/RigCell.cpp
View File

@ -125,6 +125,8 @@ bool RigCell::isLongPyramidCell(double maxHeightFactor, double nodeNearTolerance
if (zeroLengthEdgeCount == 3) if (zeroLengthEdgeCount == 3)
{ {
return true; return true;
#if 0 // More advanced checks turned off since the start. Why did I do that ?
// Collapse of a complete face is detected. This is possibly the top of a pyramid // Collapse of a complete face is detected. This is possibly the top of a pyramid
// "face" has the index to the collapsed face. We need the size of the opposite face // "face" has the index to the collapsed face. We need the size of the opposite face
@ -193,6 +195,7 @@ bool RigCell::isLongPyramidCell(double maxHeightFactor, double nodeNearTolerance
return true; return true;
} }
} }
#endif
} }
// Check the ratio of the length of opposite edges. // Check the ratio of the length of opposite edges.