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 linux compile issues

Browse Source
This commit is contained in:
Jacob Støren 2016-12-20 15:33:39 +01:00
parent 39ff269e5f
commit bd30649a3c
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/RimFlowDiagSolution.h
View File

@ -23,6 +23,9 @@
#include "cafPdmPointer.h"
#include "cafAppEnum.h"
#include "cvfBase.h"
#include "cvfObject.h"
class RimEclipseWell;
class RigFlowDiagResults;
//==================================================================================================

1
ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h
View File

@ -32,6 +32,7 @@
class RigFlowDiagSolverInterface;
class RimFlowDiagSolution;
class RigActiveCellInfo;
class RigFlowDiagResults: public cvf::Object
{

7
ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp
View File

@ -147,7 +147,11 @@ RigFlowDiagTimeStepResult RigFlowDiagSolverInterface::calculate(size_t timeStepI
QStringList restartFileNames;
restartFileNames = RifEclipseOutputFileTools::filterFileNamesOfType(m_filesWithSameBaseName, ECL_RESTART_FILE);
if (restartFileNames.size() <= timeStepIndex && restartFileNames.size() != m_eclipseCase->reservoirData()->results(RifReaderInterface::MATRIX_RESULTS)->maxTimeStepCount() )
size_t restartFileCount = static_cast<size_t>(restartFileNames.size());
size_t maxTimeStepCount = m_eclipseCase->reservoirData()->results(RifReaderInterface::MATRIX_RESULTS)->maxTimeStepCount();
if (restartFileCount <= timeStepIndex && restartFileCount != maxTimeStepCount )
{
QMessageBox::critical(nullptr, "ResInsight", "Flow Diagnostics: Could not find all the restart files. Results will not be loaded.");
return result;
@ -157,7 +161,6 @@ RigFlowDiagTimeStepResult RigFlowDiagSolverInterface::calculate(size_t timeStepI
restartFileName = restartFileNames[static_cast<int>(timeStepIndex)];
}
std::string casePath;
graph.assignFluxDataSource(restartFileName.toStdString());
if ( ! graph.selectReportStep(static_cast<int>(timeStepIndex)) )

1
ApplicationCode/ReservoirDataModel/RigFlowDiagVisibleCellsStatCalc.cpp
View File

@ -19,6 +19,7 @@
#include "RigFlowDiagVisibleCellsStatCalc.h"
#include "RigActiveCellInfo.h"
#include <math.h>
#include "RigStatisticsMath.h"

3
ApplicationCode/ReservoirDataModel/RigFlowDiagVisibleCellsStatCalc.h
View File

@ -25,11 +25,12 @@
#include "RigStatisticsCalculator.h"
#include "RigFlowDiagResultAddress.h"
#include "RigFlowDiagResults.h"
#include "RigActiveCellInfo.h"
#include "cvfArray.h"
class RigFlowDiagResults;
class RigActiveCellInfo;
class RigFlowDiagVisibleCellsStatCalc : public RigStatisticsCalculator
{