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

#4827 Completion Data : Support Eclipse input text files as data source

Browse Source
This commit is contained in:
Magne Sjaastad
2019-10-04 15:55:31 +02:00
parent 3d3ad421dd
commit 8a11c565f3
6 changed files with 109 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -699,30 +699,6 @@ const RigCaseCellResultsData* RimEclipseCase::results( RiaDefines::PorosityModel
return nullptr;
}
//--------------------------------------------------------------------------------------------------
/// Convenience function used to pre-load data before const access of data
/// Used when implementing calculations in a parallelized loop
//--------------------------------------------------------------------------------------------------
bool RimEclipseCase::loadStaticResultsByName( const std::vector<QString>& resultNames )
{
bool foundDataForAllResults = true;
RigCaseCellResultsData* cellResultsData = this->results( RiaDefines::MATRIX_MODEL );
if ( cellResultsData )
{
for ( const auto& resultName : resultNames )
{
if ( !cellResultsData->ensureKnownResultLoaded(
RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, resultName ) ) )
{
foundDataForAllResults = false;
}
}
}
return foundDataForAllResults;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/RimEclipseCase.h
View File

@@ -81,7 +81,6 @@ public:
RigCaseCellResultsData* results( RiaDefines::PorosityModelType porosityModel );
const RigCaseCellResultsData* results( RiaDefines::PorosityModelType porosityModel ) const;
bool loadStaticResultsByName( const std::vector<QString>& resultNames );
RimReservoirCellResultsStorage* resultsStorage( RiaDefines::PorosityModelType porosityModel );
const RimReservoirCellResultsStorage* resultsStorage( RiaDefines::PorosityModelType porosityModel ) const;