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

Roff: allow roff files in input property import

Browse Source
This commit is contained in:
Kristian Bendiksen
2022-12-21 11:16:35 +01:00
parent 264ad01e9e
commit fc4294a6ad
13 changed files with 201 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationLibCode/ProjectDataModel/RimRoffCase.cpp
View File

@@ -22,6 +22,7 @@
#include "RiaLogging.h"
#include "RiaPreferences.h"
#include "RifInputPropertyLoader.h"
#include "RifRoffFileTools.h"
#include "RigActiveCellInfo.h"
@@ -100,8 +101,12 @@ bool RimRoffCase::openEclipseGridFile()
results( RiaDefines::PorosityModelType::MATRIX_MODEL )->computeCellVolumes();
// Read properties from grid file
RifRoffFileTools::createInputProperties( fileName, eclipseCaseData() );
// Read properties from input property collection
loadAndSyncronizeInputProperties( false );
return true;
}
@@ -140,3 +145,17 @@ QString RimRoffCase::locationOnDisc() const
QFileInfo fi( gridFileName() );
return fi.absolutePath();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimRoffCase::importAsciiInputProperties( const QStringList& fileNames )
{
bool importFaults = false;
RifInputPropertyLoader::loadAndSyncronizeInputProperties( m_inputPropertyCollection,
this->eclipseCaseData(),
std::vector<QString>( fileNames.begin(), fileNames.end() ),
importFaults );
return true;
}