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

Fixed missing includes on Linux

Browse Source
This commit is contained in:
Magne Sjaastad
2017-03-28 09:47:06 +02:00
parent dec65d0af4
commit a6ce3c9ef4
4 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp
View File

@@ -29,6 +29,8 @@
#include "RigFlowDiagResultFrames.h"
#include "RigStatisticsDataCache.h"
#include <cmath> // Needed for HUGE_VAL on Linux
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -673,3 +675,12 @@ std::vector<int> RigFlowDiagResults::calculatedTimeSteps()
return timestepIndices;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigFlowDiagResults::FlowCharacteristicsResultFrame::FlowCharacteristicsResultFrame()
: m_lorenzCoefficient(HUGE_VAL)
{
}

9
ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h
View File

@@ -19,6 +19,10 @@
#include "RigFlowDiagResultAddress.h"
#include "RimFlowDiagSolution.h"
#include "cafPdmPointer.h"
#include "cvfBase.h"
#include "cvfObject.h"
@@ -26,9 +30,6 @@
#include <map>
#include <string>
#include "cafPdmPointer.h"
#include "RimFlowDiagSolution.h"
class RigFlowDiagResultFrames;
class RigStatisticsDataCache;
class RigFlowDiagSolverInterface;
@@ -66,7 +67,7 @@ public:
struct FlowCharacteristicsResultFrame
{
FlowCharacteristicsResultFrame() : m_lorenzCoefficient(HUGE_VAL) {}
FlowCharacteristicsResultFrame();
using Curve = std::pair< std::vector<double>, std::vector<double> >;