OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#4195 Grid Cross Plot: Adjustments

Browse Source
This commit is contained in:
Magne Sjaastad
2019-03-12 22:49:31 +01:00
parent 0527fd8030
commit 75688703d4
7 changed files with 225 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
+5 -5
View File
@@ -403,7 +403,7 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigEclipseCaseData* e
}
{
auto task = progress.task("Reading faults", 10);
auto task = progress.task("Reading faults", 5);
if (isFaultImportEnabled())
{
@@ -417,9 +417,9 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigEclipseCaseData* e
}
{
auto task = progress.task("Reading EQUIL", 10);
auto task = progress.task("Reading EQUIL", 5);
importEquilData(fileSet);
importEquilData(fileSet, eclipseCase);
}
m_eclipseCase = eclipseCase;
@@ -632,7 +632,7 @@ void RifReaderEclipseOutput::importFaults(const QStringList& fileSet, cvf::Colle
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseOutput::importEquilData(const QStringList& fileSet)
void RifReaderEclipseOutput::importEquilData(const QStringList& fileSet, RigEclipseCaseData* eclipseCase)
{
QString dataFileName;
@@ -675,7 +675,7 @@ void RifReaderEclipseOutput::importEquilData(const QStringList& fileSet)
equilItems.push_back(equilRec);
}
m_eclipseCase->setEquilData(equilItems);
eclipseCase->setEquilData(equilItems);
}
}
}
ApplicationCode/FileInterface/RifReaderEclipseOutput.h
+1 -1
View File
@@ -80,7 +80,7 @@ private:
RigWellResultPoint createWellResultPoint(const RigGridBase* grid, const well_conn_type* ert_connection, int ertBranchId, int ertSegmentId, const char* wellName);
void importFaults(const QStringList& fileSet, cvf::Collection<RigFault>* faults);
void importEquilData(const QStringList& fileSet);
void importEquilData(const QStringList& fileSet, RigEclipseCaseData* eclipseCase);
void openInitFile();