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

#5717 Properly reload input properties when reading eclipse result case.

Browse Source
This commit is contained in:
Kristian Bendiksen
2020-03-26 13:04:57 +01:00
committed by Magne Sjaastad
parent b566ddbd4b
commit b5c97ec750
5 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp
View File

@@ -216,7 +216,7 @@ bool RimEclipseInputCase::openEclipseGridFile()
this->eclipseCaseData()->mainGrid()->setFlipAxis( m_flipXAxis, m_flipYAxis );
computeCachedData();
loadAndSyncronizeInputProperties();
loadAndSyncronizeInputProperties( true );
}
RiaApplication* app = RiaApplication::instance();
@@ -240,29 +240,6 @@ void RimEclipseInputCase::reloadEclipseGridFile()
openReserviorCase();
}
//--------------------------------------------------------------------------------------------------
/// Loads input property data from the gridFile and additional files
/// Creates new InputProperties if necessary, and flags the unused ones as obsolete
//--------------------------------------------------------------------------------------------------
void RimEclipseInputCase::loadAndSyncronizeInputProperties()
{
// Make sure we actually have reservoir data
CVF_ASSERT( this->eclipseCaseData() );
CVF_ASSERT( this->eclipseCaseData()->mainGrid()->gridPointDimensions() != cvf::Vec3st( 0, 0, 0 ) );
// Then read the properties from all the files referenced by the InputReservoir
std::vector<QString> filenames;
for ( const QString& fileName : additionalFiles() )
{
filenames.push_back( fileName );
}
filenames.push_back( gridFileName() );
RifEclipseInputPropertyLoader::loadAndSyncronizeInputProperties( inputPropertyCollection(), eclipseCaseData(), filenames );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -372,19 +349,3 @@ void RimEclipseInputCase::updateAdditionalFileFolder( const QString& newFolder )
inputProperty->fileName = newFilePath.absoluteFilePath();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<QString> RimEclipseInputCase::additionalFiles() const
{
std::vector<QString> additionalFiles;
for ( const RimEclipseInputProperty* inputProperty : m_inputPropertyCollection()->inputProperties() )
{
if ( inputProperty->fileName == gridFileName() ) continue;
additionalFiles.push_back( inputProperty->fileName().path() );
}
return additionalFiles;
}