mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Various linux fixes and missing includes
p4#: 20976
This commit is contained in:
@@ -102,12 +102,12 @@ void RifEclipseOutputFileTools::timeSteps(ecl_file_type* ecl_file, std::vector<Q
|
|||||||
double floorDayValue = cvf::Math::floor(dayValue);
|
double floorDayValue = cvf::Math::floor(dayValue);
|
||||||
double dayFraction = dayValue - floorDayValue;
|
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);
|
QTime time(0, 0);
|
||||||
time = time.addSecs(seconds);
|
time = time.addSecs(seconds);
|
||||||
|
|
||||||
QDate reportDate = simulationStart;
|
QDate reportDate = simulationStart;
|
||||||
reportDate = reportDate.addDays(floorDayValue);
|
reportDate = reportDate.addDays(static_cast<int>(floorDayValue));
|
||||||
|
|
||||||
QDateTime reportDateTime(reportDate, time);
|
QDateTime reportDateTime(reportDate, time);
|
||||||
if (std::find(timeStepsFound.begin(), timeStepsFound.end(), reportDateTime) == timeStepsFound.end())
|
if (std::find(timeStepsFound.begin(), timeStepsFound.end(), reportDateTime) == timeStepsFound.end())
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ void RigStatistics::addNamedResult(RigReservoirCellResults* destinationCellResul
|
|||||||
|
|
||||||
|
|
||||||
// Initializes the size of the destination dataset to active union cell count
|
// 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);
|
dataValues[i].resize(activeUnionCellCount, HUGE_VAL);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
|
|
||||||
#include "cafPdmObject.h"
|
#include "cafPdmObject.h"
|
||||||
#include "cafPdmPointer.h"
|
#include "cafPdmPointer.h"
|
||||||
|
#include "cafPdmDocument.h"
|
||||||
#include "cafUiTreeModelPdm.h"
|
#include "cafUiTreeModelPdm.h"
|
||||||
|
|
||||||
#include <QMimeData>
|
#include <QMimeData>
|
||||||
@@ -45,7 +46,8 @@ public:
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
MimeDataWithIndexes(const MimeDataWithIndexes & other)
|
|
||||||
|
MimeDataWithIndexes(const MimeDataWithIndexes & other) : QMimeData()
|
||||||
{
|
{
|
||||||
setIndexes(other.indexes());
|
setIndexes(other.indexes());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,8 @@
|
|||||||
|
|
||||||
#include "RIStdInclude.h"
|
#include "RIStdInclude.h"
|
||||||
|
|
||||||
|
#include "cafPdmDocument.h"
|
||||||
|
|
||||||
#include "RimUiTreeView.h"
|
#include "RimUiTreeView.h"
|
||||||
#include "RimUiTreeModelPdm.h"
|
#include "RimUiTreeModelPdm.h"
|
||||||
#include "RimReservoirView.h"
|
#include "RimReservoirView.h"
|
||||||
|
|||||||
@@ -23,7 +23,10 @@
|
|||||||
#include <QTreeView>
|
#include <QTreeView>
|
||||||
|
|
||||||
class QItemSelection;
|
class QItemSelection;
|
||||||
class PdmObjectGroup;
|
|
||||||
|
namespace caf {
|
||||||
|
class PdmObjectGroup;
|
||||||
|
}
|
||||||
|
|
||||||
//==================================================================================================
|
//==================================================================================================
|
||||||
///
|
///
|
||||||
|
|||||||
@@ -441,4 +441,4 @@ void RigEclipseCase::closeReaderInterface()
|
|||||||
readerInterface->close();
|
readerInterface->close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ void RigWellResults::computeMappingFromResultTimeIndicesToWellTimeIndices(const
|
|||||||
}
|
}
|
||||||
|
|
||||||
qDebug() << "Result TimeStamps";
|
qDebug() << "Result TimeStamps";
|
||||||
for (int i = 0; i < resultTimes.size(); i++)
|
for (size_t i = 0; i < resultTimes.size(); i++)
|
||||||
{
|
{
|
||||||
qDebug() << resultTimes[i].toString();
|
qDebug() << resultTimes[i].toString();
|
||||||
}
|
}
|
||||||
@@ -65,7 +65,7 @@ void RigWellResults::computeMappingFromResultTimeIndicesToWellTimeIndices(const
|
|||||||
size_t wellIdx = 0;
|
size_t wellIdx = 0;
|
||||||
size_t activeWellIdx = cvf::UNDEFINED_SIZE_T;
|
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])
|
if (wellIdx < m_wellCellsTimeSteps.size() && m_wellCellsTimeSteps[wellIdx].m_timestamp <= resultTimes[resultIdx])
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -548,7 +548,7 @@ void RIMainWindow::refreshAnimationActions()
|
|||||||
{
|
{
|
||||||
std::vector<QDateTime> timeStepDates = app->activeReservoirView()->currentGridCellResults()->cellResults()->timeStepDates(0);
|
std::vector<QDateTime> timeStepDates = app->activeReservoirView()->currentGridCellResults()->cellResults()->timeStepDates(0);
|
||||||
bool showHoursAndMinutes = false;
|
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)
|
if (timeStepDates[i].time().hour() != 0.0 || timeStepDates[i].time().minute() != 0.0)
|
||||||
{
|
{
|
||||||
@@ -562,7 +562,7 @@ void RIMainWindow::refreshAnimationActions()
|
|||||||
formatString += " - hh:mm";
|
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);
|
timeStepStrings += timeStepDates[i].toString(formatString);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user