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

#3455 ExportProperty. Display error message for several situations

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-10-05 10:58:37 +02:00
parent e01456f40b
commit 677914a338
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/CommandFileInterface/RicfExportProperty.cpp
View File

@@ -116,7 +116,12 @@ void RicfExportProperty::execute()
auto resultAccessor = findResult(view, timeStepIndex, propertyType, propertyName);
if (!resultAccessor.isNull())
{
RifEclipseInputFileTools::writeResultToTextFile(filePath, eclipseCase->eclipseCaseData(), resultAccessor, eclipseKeyword, m_undefinedValue);
RifEclipseInputFileTools::writeResultToTextFile(filePath, eclipseCase->eclipseCaseData(), resultAccessor, eclipseKeyword, m_undefinedValue, "exportProperty");
}
else
{
RiaLogging::error(QString("exportProperty: Could not find property. Case ID %1, time step %2, property '%3'")
.arg(m_caseId).arg(timeStepIndex).arg(propertyName));
}
if (fullySpecified) break;
@@ -124,8 +129,7 @@ void RicfExportProperty::execute()
if (!anyViewsFound)
{
RiaLogging::error(QString("exportProperty: Could not find a view for case with ID %1").arg(m_caseId()));
return;
RiaLogging::error(QString("exportProperty: Could not find any views for case ID %1").arg(m_caseId()));
}
}

2
ApplicationCode/Commands/ExportCommands/RicSaveEclipseResultAsInputPropertyExec.cpp
View File

@@ -99,7 +99,7 @@ void RicSaveEclipseResultAsInputPropertyExec::redo()
{
size_t timeStep = m_cellColors->reservoirView()->currentTimeStep();
bool isOk = RifEclipseInputFileTools::writeBinaryResultToTextFile(exportSettings.fileName, m_cellColors->reservoirView()->eclipseCase()->eclipseCaseData(), timeStep, m_cellColors, exportSettings.eclipseKeyword, exportSettings.undefinedValue);
bool isOk = RifEclipseInputFileTools::writeBinaryResultToTextFile(exportSettings.fileName, m_cellColors->reservoirView()->eclipseCase()->eclipseCaseData(), timeStep, m_cellColors, exportSettings.eclipseKeyword, exportSettings.undefinedValue, "saveEclipseResultAsInputPropertyExec");
if (!isOk)
{
RiaLogging::error("Failed to exported current result to " + exportSettings.fileName);

9
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -511,7 +511,8 @@ bool RifEclipseInputFileTools::writeBinaryResultToTextFile(const QString& fileNa
size_t timeStep,
RimEclipseResultDefinition* resultDefinition,
const QString& eclipseKeyWord,
const double undefinedValue)
const double undefinedValue,
const QString& logPrefix)
{
CVF_ASSERT(eclipseCase);
@@ -521,7 +522,7 @@ bool RifEclipseInputFileTools::writeBinaryResultToTextFile(const QString& fileNa
return false;
}
return writeResultToTextFile(fileName, eclipseCase, resultAccessor, eclipseKeyWord, undefinedValue);
return writeResultToTextFile(fileName, eclipseCase, resultAccessor, eclipseKeyWord, undefinedValue, logPrefix);
}
//--------------------------------------------------------------------------------------------------
@@ -531,11 +532,13 @@ bool RifEclipseInputFileTools::writeResultToTextFile(const QString& fileName,
RigEclipseCaseData* eclipseCase,
cvf::ref<RigResultAccessor> resultAccessor,
const QString& eclipseKeyWord,
const double undefinedValue)
const double undefinedValue,
const QString& logPrefix)
{
QFile file(fileName);
if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
{
RiaLogging::error(QString("Could not open file '%1'. Do the folder exist?"). arg(fileName));
return false;
}

4
ApplicationCode/FileInterface/RifEclipseInputFileTools.h
View File

@@ -77,8 +77,8 @@ public:
static bool writePropertyToTextFile(const QString& fileName, RigEclipseCaseData* eclipseCase, size_t timeStep, const QString& resultName, const QString& eclipseKeyWord);
static bool writeBinaryResultToTextFile(const QString& fileName, RigEclipseCaseData* eclipseCase, size_t timeStep, RimEclipseResultDefinition* resultdefinition, const QString& eclipseKeyWord, const double undefinedValue);
static bool writeResultToTextFile(const QString& fileName, RigEclipseCaseData* eclipseCase, cvf::ref<RigResultAccessor> resultAccessor, const QString& eclipseKeyWord, const double undefinedValue);
static bool writeBinaryResultToTextFile(const QString& fileName, RigEclipseCaseData* eclipseCase, size_t timeStep, RimEclipseResultDefinition* resultdefinition, const QString& eclipseKeyWord, const double undefinedValue, const QString& logPrefix);
static bool writeResultToTextFile(const QString& fileName, RigEclipseCaseData* eclipseCase, cvf::ref<RigResultAccessor> resultAccessor, const QString& eclipseKeyWord, const double undefinedValue, const QString& logPrefix);
static bool readFaultsAndParseIncludeStatementsRecursively( QFile& file,
qint64 startPos,