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

#3588 Intersect : Add support for import of Intersect data

Browse Source
This commit is contained in:
Magne Sjaastad
2018-11-13 09:28:13 +01:00
parent 1215235255
commit 3b9cdf5a92
6 changed files with 135 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -382,9 +382,18 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigEclipseCaseData* e
// Keep the set of files of interest
m_filesWithSameBaseName = fileSet;
openInitFile();
// Read geometry
// Todo: Needs to check existence of file before calling ert, else it will abort
ecl_grid_type * mainEclGrid = ecl_grid_alloc( RiaStringEncodingTools::toNativeEncoded(fileName).data() );
ecl_grid_type* mainEclGrid = createMainGrid();
if (!mainEclGrid)
{
QString errorMessage = QString(" Failed to create a main grid from file\n%1").arg(m_fileName);
RiaLogging::error(errorMessage);
return false;
}
progInfo.incrementProgress();
@@ -2182,6 +2191,36 @@ bool RifReaderEclipseOutput::isEclipseAndSoursimTimeStepsEqual(const QDateTime&
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ecl_grid_type* RifReaderEclipseOutput::createMainGrid() const
{
ecl_grid_type* mainEclGrid = nullptr;
{
if (m_ecl_init_file && RifEclipseOutputFileTools::isExportedFromIntersect(m_ecl_init_file))
{
ecl_kw_type* actnumFromPorv = RifEclipseOutputFileTools::createActnumFromPorv(m_ecl_init_file);
if (actnumFromPorv)
{
int* actnum_values = ecl_kw_get_int_ptr(actnumFromPorv);
mainEclGrid = ecl_grid_alloc_ext_actnum(RiaStringEncodingTools::toNativeEncoded(m_fileName).data(), actnum_values);
ecl_kw_free(actnumFromPorv);
}
}
if (!mainEclGrid)
{
mainEclGrid = ecl_grid_alloc(RiaStringEncodingTools::toNativeEncoded(m_fileName).data());
}
}
return mainEclGrid;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------