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

59
ApplicationLibCode/FileInterface/RifEclipseInputPropertyLoader.cpp
View File

@@ -31,65 +31,6 @@
#include "RimEclipseInputProperty.h"
#include "RimEclipseInputPropertyCollection.h"
#include "RimTools.h"
#include "cafProgressInfo.h"
#include <QFile>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifEclipseInputPropertyLoader::loadAndSyncronizeInputProperties( RimEclipseInputPropertyCollection* inputPropertyCollection,
RigEclipseCaseData* eclipseCaseData,
const std::vector<QString>& filenames,
bool allowImportOfFaults )
{
std::vector<RimEclipseInputProperty*> existingProperties = inputPropertyCollection->inputProperties.children();
caf::ProgressInfo progInfo( static_cast<int>( filenames.size() ), "Reading Input properties" );
for ( const auto& filename : filenames )
{
progInfo.setProgressDescription( filename );
auto resultNamesEclipseKeywords = RifEclipseInputPropertyLoader::readProperties( filename, eclipseCaseData );
for ( const auto& [resultName, eclipseKeyword] : resultNamesEclipseKeywords )
{
bool isProperyPresent = false;
bool isFaultKeywordPresent = false;
for ( const auto* propertyObj : existingProperties )
{
if ( propertyObj->resultName() == resultName )
{
isProperyPresent = true;
}
else if ( propertyObj->resultName() == "FAULTS" )
{
isFaultKeywordPresent = true;
}
}
if ( !isProperyPresent )
{
RimEclipseInputProperty* inputProperty = new RimEclipseInputProperty;
inputProperty->resultName = resultName;
inputProperty->eclipseKeyword = eclipseKeyword;
inputProperty->fileName = filename;
inputProperty->resolvedState = RimEclipseInputProperty::RESOLVED;
inputPropertyCollection->inputProperties.push_back( inputProperty );
}
if ( allowImportOfFaults && isFaultKeywordPresent )
{
RifEclipseInputFileTools::importFaultsFromFile( eclipseCaseData, filename );
}
}
progInfo.incrementProgress();
}
}
//--------------------------------------------------------------------------------------------------
///