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

Various linux fixes and missing includes

Browse Source 
p4#: 20976
This commit is contained in:
Magne Sjaastad
2013-03-20 06:11:45 +01:00
parent 27dee4d4e2
commit 50206b9dc4
8 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
View File

@@ -102,12 +102,12 @@ void RifEclipseOutputFileTools::timeSteps(ecl_file_type* ecl_file, std::vector<Q
double floorDayValue = cvf::Math::floor(dayValue);
double dayFraction = dayValue - floorDayValue;
int seconds = (dayFraction * 24.0 * 60.0 * 60.0);
int seconds = static_cast<int>(dayFraction * 24.0 * 60.0 * 60.0);
QTime time(0, 0);
time = time.addSecs(seconds);
QDate reportDate = simulationStart;
reportDate = reportDate.addDays(floorDayValue);
reportDate = reportDate.addDays(static_cast<int>(floorDayValue));
QDateTime reportDateTime(reportDate, time);
if (std::find(timeStepsFound.begin(), timeStepsFound.end(), reportDateTime) == timeStepsFound.end())

2
ApplicationCode/ProjectDataModel/RigStatistics.cpp
View File

@@ -46,7 +46,7 @@ void RigStatistics::addNamedResult(RigReservoirCellResults* destinationCellResul
// Initializes the size of the destination dataset to active union cell count
for (int i = 0; i < sourceTimeStepDates.size(); i++)
for (size_t i = 0; i < sourceTimeStepDates.size(); i++)
{
dataValues[i].resize(activeUnionCellCount, HUGE_VAL);
}

4
ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.h
View File

@@ -20,6 +20,7 @@
#include "cafPdmObject.h"
#include "cafPdmPointer.h"
#include "cafPdmDocument.h"
#include "cafUiTreeModelPdm.h"
#include <QMimeData>
@@ -45,7 +46,8 @@ public:
{
}
MimeDataWithIndexes(const MimeDataWithIndexes & other)
MimeDataWithIndexes(const MimeDataWithIndexes & other) : QMimeData()
{
setIndexes(other.indexes());
}

2
ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
View File

@@ -18,6 +18,8 @@
#include "RIStdInclude.h"
#include "cafPdmDocument.h"
#include "RimUiTreeView.h"
#include "RimUiTreeModelPdm.h"
#include "RimReservoirView.h"

5
ApplicationCode/ProjectDataModel/RimUiTreeView.h
View File

@@ -23,7 +23,10 @@
#include <QTreeView>
class QItemSelection;
class PdmObjectGroup;
namespace caf {
class PdmObjectGroup;
}
//==================================================================================================
///

2
ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp
View File

@@ -441,4 +441,4 @@ void RigEclipseCase::closeReaderInterface()
readerInterface->close();
}
}
*/
*/

4
ApplicationCode/ReservoirDataModel/RigWellResults.cpp
View File

@@ -54,7 +54,7 @@ void RigWellResults::computeMappingFromResultTimeIndicesToWellTimeIndices(const
}
qDebug() << "Result TimeStamps";
for (int i = 0; i < resultTimes.size(); i++)
for (size_t i = 0; i < resultTimes.size(); i++)
{
qDebug() << resultTimes[i].toString();
}
@@ -65,7 +65,7 @@ void RigWellResults::computeMappingFromResultTimeIndicesToWellTimeIndices(const
size_t wellIdx = 0;
size_t activeWellIdx = cvf::UNDEFINED_SIZE_T;
while (wellIdx <= m_wellCellsTimeSteps.size() && resultIdx < resultTimes.size())
while (wellIdx <= m_wellCellsTimeSteps.size() && resultIdx < static_cast<int>(resultTimes.size()))
{
if (wellIdx < m_wellCellsTimeSteps.size() && m_wellCellsTimeSteps[wellIdx].m_timestamp <= resultTimes[resultIdx])
{

4
ApplicationCode/UserInterface/RIMainWindow.cpp
View File

@@ -548,7 +548,7 @@ void RIMainWindow::refreshAnimationActions()
{
std::vector<QDateTime> timeStepDates = app->activeReservoirView()->currentGridCellResults()->cellResults()->timeStepDates(0);
bool showHoursAndMinutes = false;
for (int i = 0; i < timeStepDates.size(); i++)
for (size_t i = 0; i < timeStepDates.size(); i++)
{
if (timeStepDates[i].time().hour() != 0.0 || timeStepDates[i].time().minute() != 0.0)
{
@@ -562,7 +562,7 @@ void RIMainWindow::refreshAnimationActions()
formatString += " - hh:mm";
}
for (int i = 0; i < timeStepDates.size(); i++)
for (size_t i = 0; i < timeStepDates.size(); i++)
{
timeStepStrings += timeStepDates[i].toString(formatString);
}