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

Refactor grid export and fault export

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-03-19 13:52:48 +01:00
parent 2166d0834e
commit 88d2ad2c35
9 changed files with 426 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Commands/ExportCommands/RicExportEclipseInputGridFeature.cpp
View File

@@ -24,6 +24,7 @@
#include "RicExportFeatureImpl.h"
#include "RicExportEclipseInputGridUi.h"
#include "RifEclipseInputFileTools.h"
#include "RifReaderEclipseOutput.h"
#include "RimEclipseCase.h"
@@ -85,7 +86,7 @@ void RicExportEclipseInputGridFeature::executeCommand(RimEclipseView* view,
if (exportSettings.exportGrid())
{
auto task = progress.task("Export Input Grid", gridProgressPercentage);
bool worked = RifReaderEclipseOutput::saveEclipseGrid(exportSettings.exportGridFilename(), view->eclipseCase()->eclipseCaseData(), min, max, refinement);
bool worked = RifEclipseInputFileTools::exportGrid(exportSettings.exportGridFilename(), view->eclipseCase()->eclipseCaseData(), min, max, refinement);
if (!worked)
{
RiaLogging::error(
@@ -106,7 +107,7 @@ void RicExportEclipseInputGridFeature::executeCommand(RimEclipseView* view,
for (QString keyword : keywords)
{
QString fileName = dirPath.absoluteFilePath(keyword + ".GRDECL");
bool worked = RifReaderEclipseOutput::saveEclipseResults(fileName,
bool worked = RifEclipseInputFileTools::exportKeywords(fileName,
view->eclipseCase()->eclipseCaseData(),
{keyword},
fileWriteMode,
@@ -129,7 +130,7 @@ void RicExportEclipseInputGridFeature::executeCommand(RimEclipseView* view,
fileName = exportSettings.exportGridFilename();
}
bool worked = RifReaderEclipseOutput::saveEclipseResults(fileName,
bool worked = RifEclipseInputFileTools::exportKeywords(fileName,
view->eclipseCase()->eclipseCaseData(),
keywords,
fileWriteMode,

146
ApplicationCode/Commands/ExportCommands/RicExportFaultsFeature.cpp
View File

@@ -26,6 +26,8 @@
#include "RigFault.h"
#include "RigMainGrid.h"
#include "RifEclipseInputFileTools.h"
#include "RimEclipseCase.h"
#include "RimFaultInView.h"
@@ -91,7 +93,7 @@ void RicExportFaultsFeature::onActionTriggered(bool isChecked)
QString completeFilename = selectedDir + "/" + baseFilename + ".grdecl";
RicExportFaultsFeature::saveFault(
RifEclipseInputFileTools::saveFault(
completeFilename, eclCase->eclipseCaseData()->mainGrid(), rimFault->faultGeometry()->faultFaces(), faultName);
}
}
@@ -110,145 +112,3 @@ void RicExportFaultsFeature::setupActionLook(QAction* actionToSetup)
actionToSetup->setText("Export Faults ...");
actionToSetup->setIcon(QIcon(":/Save.png"));
}
//--------------------------------------------------------------------------------------------------
/// Order FaultCellAndFace by i, j, face then k.
//--------------------------------------------------------------------------------------------------
bool RicExportFaultsFeature::faultOrdering(FaultCellAndFace first, FaultCellAndFace second)
{
size_t i1, i2, j1, j2, k1, k2;
cvf::StructGridInterface::FaceType f1, f2;
std::tie(i1, j1, k1, f1) = first;
std::tie(i2, j2, k2, f2) = second;
if (i1 == i2)
{
if (j1 == j2)
{
if (f1 == f2)
{
return k1 < k2;
}
else
{
return f1 < f2;
}
}
else
{
return j1 < j2;
}
}
else
{
return i1 < i2;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RicExportFaultsFeature::faceText(cvf::StructGridInterface::FaceType faceType)
{
switch (faceType)
{
case cvf::StructGridInterface::POS_I: return QString(" I");
case cvf::StructGridInterface::NEG_I: return QString("-I");
case cvf::StructGridInterface::POS_J: return QString(" J");
case cvf::StructGridInterface::NEG_J: return QString("-J");
case cvf::StructGridInterface::POS_K: return QString(" K");
case cvf::StructGridInterface::NEG_K: return QString("-K");
default: CVF_ASSERT(false);
}
return "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportFaultsFeature::writeLine(QTextStream & stream, QString faultName, size_t i, size_t j, size_t startK, size_t endK, cvf::StructGridInterface::FaceType faceType)
{
// Convert indices to eclipse format
i++;
j++;
startK++;
endK++;
stream << "'" << faultName << "'" << " " << i << " " << i
<< " " << j << " " << j
<< " " << startK << " " << endK
<< " " << RicExportFaultsFeature::faceText(faceType) << " / ";
stream << endl;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportFaultsFeature::saveFault(QString completeFilename, const RigMainGrid* mainGrid, const std::vector<RigFault::FaultFace>& faultFaces, QString faultName)
{
QFile exportFile(completeFilename);
if (!exportFile.open(QIODevice::WriteOnly | QIODevice::Text) )
{
RiaLogging::error("Could not open the file : " + completeFilename);
}
QTextStream stream(&exportFile);
stream << "FAULTS" << endl;
stream << "-- Name I1 I2 J1 J2 K1 K2 Face ( I/J/K )" << endl;
// 'NAME' 1 1 1 1 1 2 J /
std::vector<FaultCellAndFace> faultCellAndFaces;
for (const RigFault::FaultFace& faultCellAndFace : faultFaces)
{
size_t i, j, k;
bool ok = mainGrid->ijkFromCellIndex(faultCellAndFace.m_nativeReservoirCellIndex, &i, &j, &k);
if (!ok) continue;
faultCellAndFaces.push_back(std::make_tuple(i, j, k, faultCellAndFace.m_nativeFace));
}
// Sort order: i, j, face then k.
std::sort(faultCellAndFaces.begin(), faultCellAndFaces.end(), RicExportFaultsFeature::faultOrdering);
size_t lastI = std::numeric_limits<size_t>::max();
size_t lastJ = std::numeric_limits<size_t>::max();
size_t lastK = std::numeric_limits<size_t>::max();
size_t startK = std::numeric_limits<size_t>::max();
cvf::StructGridInterface::FaceType lastFaceType = cvf::StructGridInterface::FaceType::NO_FACE;
for (const FaultCellAndFace &faultCellAndFace : faultCellAndFaces)
{
size_t i, j, k;
cvf::StructGridInterface::FaceType faceType;
std::tie(i, j, k, faceType) = faultCellAndFace;
if (i != lastI || j != lastJ || lastFaceType != faceType || k != lastK+1)
{
// No fault should have no face
if (lastFaceType != cvf::StructGridInterface::FaceType::NO_FACE)
{
RicExportFaultsFeature::writeLine(stream, faultName, lastI, lastJ, startK, lastK, lastFaceType);
}
lastI = i;
lastJ = j;
lastK = k;
lastFaceType = faceType;
startK = k;
}
else
{
lastK = k;
}
}
// No fault should have no face
if (lastFaceType != cvf::StructGridInterface::FaceType::NO_FACE)
{
RicExportFaultsFeature::writeLine(stream, faultName, lastI, lastJ, startK, lastK, lastFaceType);
}
stream << "/" << endl;
}

10
ApplicationCode/Commands/ExportCommands/RicExportFaultsFeature.h
View File

@@ -20,13 +20,13 @@
#include "cafCmdFeature.h"
#include "RigFault.h"
#include <QString>
#include <vector>
#include "RigFault.h"
class RigMainGrid;
typedef std::tuple<size_t, size_t, size_t, cvf::StructGridInterface::FaceType> FaultCellAndFace;
//==================================================================================================
///
@@ -40,11 +40,5 @@ protected:
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook( QAction* actionToSetup ) override;
private:
static void saveFault(QString completeFilename, const RigMainGrid* mainGrid, const std::vector<RigFault::FaultFace>& faultFaces, QString faultName);
static bool faultOrdering(FaultCellAndFace first, FaultCellAndFace second);
static QString faceText(cvf::StructGridInterface::FaceType faceType);
static void writeLine(QTextStream &stream, QString faultName, size_t i, size_t j, size_t startK, size_t endK, cvf::StructGridInterface::FaceType faceType);
};