mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Linux compile fixes
This commit is contained in:
parent
3bca03a722
commit
c2eff1b733
@ -22,6 +22,7 @@
|
||||
#include "cafCmdExecuteCommand.h"
|
||||
#include "cafPdmPointer.h"
|
||||
|
||||
class RimIntersectionBoxCollection;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
|
@ -902,7 +902,7 @@ RigWellResultPoint RifReaderEclipseOutput::createWellResultPoint(const RigGridBa
|
||||
}
|
||||
|
||||
// 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);
|
||||
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));
|
||||
|
@ -18,6 +18,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "cvfBase.h"
|
||||
#include "cvfObject.h"
|
||||
#include "cvfVector3.h"
|
||||
#include "cvfBoundingBox.h"
|
||||
|
@ -40,7 +40,7 @@ RigFormationNames::~RigFormationNames()
|
||||
QString RigFormationNames::formationNameFromKLayerIdx(size_t Kidx)
|
||||
{
|
||||
int idx = formationIndexFromKLayerIdx(Kidx);
|
||||
if(idx >= m_formationNames.size()) return "";
|
||||
if(idx >= static_cast<int>(m_formationNames.size())) return "";
|
||||
if(idx == -1) return "";
|
||||
|
||||
return m_formationNames[idx];
|
||||
|
@ -2,6 +2,7 @@
|
||||
#include "cafHexGridIntersectionTools.h"
|
||||
|
||||
#include "cvfPlane.h"
|
||||
#include <math.h>
|
||||
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user