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

#4248 Add option for making invisible cells inactive in Export Sector Model

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-03-29 14:26:49 +01:00
parent 0df03e4886
commit 3b8daa4939
6 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -231,11 +231,12 @@ bool RifEclipseInputFileTools::openGridFile(const QString& fileName,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifEclipseInputFileTools::exportGrid(const QString& fileName,
RigEclipseCaseData* eclipseCase,
const cvf::Vec3st& min,
const cvf::Vec3st& maxIn,
const cvf::Vec3st& refinement)
bool RifEclipseInputFileTools::exportGrid(const QString& fileName,
RigEclipseCaseData* eclipseCase,
const cvf::UByteArray* cellVisibilityOverrideForActnum,
const cvf::Vec3st& min,
const cvf::Vec3st& maxIn,
const cvf::Vec3st& refinement)
{
if (!eclipseCase)
{
@@ -289,6 +290,10 @@ bool RifEclipseInputFileTools::exportGrid(const QString& fileName,
size_t mainIndex = mainGrid->cellIndexFromIJK(mainI, mainJ, mainK);
int active = activeCellInfo->isActive(mainIndex) ? 1 : 0;
if (active && cellVisibilityOverrideForActnum)
{
active = (*cellVisibilityOverrideForActnum)[mainIndex];
}
int* ecl_cell_coords = new int[5];
ecl_cell_coords[0] = (int)(i0 + 1);
@@ -322,7 +327,7 @@ bool RifEclipseInputFileTools::exportGrid(const QString& fileName,
}
if (incrementalIndex % cellProgressInterval == 0)
{
progress.setProgress(incrementalIndex);
progress.setProgress(incrementalIndex / cellsPerOriginal);
}
}

13
ApplicationCode/FileInterface/RifEclipseInputFileTools.h
View File

@@ -60,12 +60,13 @@ public:
~RifEclipseInputFileTools() override;
static bool openGridFile(const QString& fileName, RigEclipseCaseData* eclipseCase, bool readFaultData, QString* errorMessages);
static bool exportGrid(const QString& gridFileName,
RigEclipseCaseData* eclipseCase,
const cvf::Vec3st& min = cvf::Vec3st::ZERO,
const cvf::Vec3st& max = cvf::Vec3st::UNDEFINED,
const cvf::Vec3st& refinement = cvf::Vec3st(1, 1, 1));
static bool exportGrid(const QString& gridFileName,
RigEclipseCaseData* eclipseCase,
const cvf::UByteArray* cellVisibilityOverrideForActnum = nullptr,
const cvf::Vec3st& min = cvf::Vec3st::ZERO,
const cvf::Vec3st& max = cvf::Vec3st::UNDEFINED,
const cvf::Vec3st& refinement = cvf::Vec3st(1, 1, 1));
static bool exportKeywords(const QString& resultFileName,
RigEclipseCaseData* eclipseCase,