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

Linux compile fixes

Browse Source
This commit is contained in:
Jacob Støren 2016-09-28 15:07:19 +02:00
parent 3bca03a722
commit c2eff1b733
5 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.h
View File

@ -22,6 +22,7 @@
#include "cafCmdExecuteCommand.h" #include "cafCmdExecuteCommand.h"
#include "cafPdmPointer.h" #include "cafPdmPointer.h"
class RimIntersectionBoxCollection;
//================================================================================================== //==================================================================================================
/// ///

2
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -902,7 +902,7 @@ RigWellResultPoint RifReaderEclipseOutput::createWellResultPoint(const RigGridBa
} }
// Introduced based on discussion with Håkon Høgstøl 08.09.2016 // Introduced based on discussion with Håkon Høgstøl 08.09.2016
if (cellK >= grid->cellCountK()) if (cellK >= static_cast<int>(grid->cellCountK()))
{ {
int maxCellKIndex = static_cast<int>(grid->cellCountK() - 1); int maxCellKIndex = static_cast<int>(grid->cellCountK() - 1);
cvf::Trace::show("Well Connection for grid " + cvf::String(grid->gridName()) + "\n - Detected invalid K value (K=" + cvf::String(cellK) + ") for well : " + cvf::String(wellName) + " K clamped to " + cvf::String(maxCellKIndex)); cvf::Trace::show("Well Connection for grid " + cvf::String(grid->gridName()) + "\n - Detected invalid K value (K=" + cvf::String(cellK) + ") for well : " + cvf::String(wellName) + " K clamped to " + cvf::String(maxCellKIndex));

1
ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h
View File

@ -18,6 +18,7 @@
#pragma once #pragma once
#include "cvfBase.h"
#include "cvfObject.h" #include "cvfObject.h"
#include "cvfVector3.h" #include "cvfVector3.h"
#include "cvfBoundingBox.h" #include "cvfBoundingBox.h"

2
ApplicationCode/ReservoirDataModel/RigFormationNames.cpp
View File

@ -40,7 +40,7 @@ RigFormationNames::~RigFormationNames()
QString RigFormationNames::formationNameFromKLayerIdx(size_t Kidx) QString RigFormationNames::formationNameFromKLayerIdx(size_t Kidx)
{ {
int idx = formationIndexFromKLayerIdx(Kidx); int idx = formationIndexFromKLayerIdx(Kidx);
if(idx >= m_formationNames.size()) return ""; if(idx >= static_cast<int>(m_formationNames.size())) return "";
if(idx == -1) return ""; if(idx == -1) return "";
return m_formationNames[idx]; return m_formationNames[idx];

1
Fwk/AppFwk/cafVizExtensions/cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp
View File

@ -2,6 +2,7 @@
#include "cafHexGridIntersectionTools.h" #include "cafHexGridIntersectionTools.h"
#include "cvfPlane.h" #include "cvfPlane.h"
#include <math.h>