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

10
ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -31,7 +31,7 @@
#include "CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h"
#include "RicfCommandObject.h"
#include "RifEclipseInputPropertyLoader.h"
#include "RifInputPropertyLoader.h"
#include "RifReaderSettings.h"
#include "RigActiveCellInfo.h"
@@ -739,10 +739,10 @@ void RimEclipseCase::loadAndSyncronizeInputProperties( bool importGridOrFaultDat
filenames.push_back( fileName );
}
RifEclipseInputPropertyLoader::loadAndSyncronizeInputProperties( inputPropertyCollection(),
eclipseCaseData(),
filenames,
importGridOrFaultData );
RifInputPropertyLoader::loadAndSyncronizeInputProperties( inputPropertyCollection(),
eclipseCaseData(),
filenames,
importGridOrFaultData );
}
//--------------------------------------------------------------------------------------------------

10
ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp
View File

@@ -26,7 +26,7 @@
#include "RiaPreferences.h"
#include "RifEclipseInputFileTools.h"
#include "RifEclipseInputPropertyLoader.h"
#include "RifInputPropertyLoader.h"
#include "RifReaderEclipseInput.h"
#include "RifReaderInterface.h"
#include "RifReaderMockModel.h"
@@ -174,10 +174,10 @@ bool RimEclipseInputCase::openDataFileSet( const QStringList& fileNames )
}
}
RifEclipseInputPropertyLoader::loadAndSyncronizeInputProperties( m_inputPropertyCollection,
this->eclipseCaseData(),
filesToRead,
importFaults );
RifInputPropertyLoader::loadAndSyncronizeInputProperties( m_inputPropertyCollection,
this->eclipseCaseData(),
filesToRead,
importFaults );
if ( importFaults )
{

11
ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@@ -28,8 +28,8 @@
#include "RicfCommandObject.h"
#include "RifEclipseInputPropertyLoader.h"
#include "RifEclipseOutputFileTools.h"
#include "RifInputPropertyLoader.h"
#include "RifReaderEclipseOutput.h"
#include "RifReaderEclipseRft.h"
#include "RifReaderMockModel.h"
@@ -236,11 +236,10 @@ bool RimEclipseResultCase::importGridAndResultMetaData( bool showTimeStepFilter
bool RimEclipseResultCase::importAsciiInputProperties( const QStringList& fileNames )
{
bool importFaults = false;
RifEclipseInputPropertyLoader::loadAndSyncronizeInputProperties( m_inputPropertyCollection,
this->eclipseCaseData(),
std::vector<QString>( fileNames.begin(),
fileNames.end() ),
importFaults );
RifInputPropertyLoader::loadAndSyncronizeInputProperties( m_inputPropertyCollection,
this->eclipseCaseData(),
std::vector<QString>( fileNames.begin(), fileNames.end() ),
importFaults );
return true;
}

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;
}

3
ApplicationLibCode/ProjectDataModel/RimRoffCase.h
View File

@@ -37,11 +37,10 @@ public:
RimRoffCase();
~RimRoffCase() override;
// RimCase overrides
bool openEclipseGridFile() override;
void reloadEclipseGridFile() override;
bool importAsciiInputProperties( const QStringList& fileNames ) override;
// Overrides from RimCase
QString locationOnDisc() const override;
protected: