OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-01 16:43:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

#13258 Add support for more surface file type in Import ensemble surface

Browse Source
This commit is contained in:
Kristian Bendiksen authored and Magne Sjaastad committed 2025-12-06 12:55:38 +01:00
1 parent 53bb11b7f3
commit 4f5d7b65a5
7 files changed
+72 -54
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/Commands/RicImportEnsembleSurfaceFeature.cpp
+8 -9
View File
@@ -109,10 +109,10 @@ void RicImportEnsembleSurfaceFeature::importSingleEnsembleSurfaceFromFiles( cons
std::map<QString, QStringList> keyFileComponentsForAllFiles = RiaFilePathTools::keyPathComponentsForEachFilePath( layerFileNames );
std::vector<RimFileSurface*> surfaces;
std::vector<RimSurface*> surfaces;
for ( int i = 0; i < layerFileNames.size(); i++ )
{
surfaces.push_back( new RimFileSurface );
surfaces.push_back( RimSurfaceCollection::createSurfaceFromFile( layerFileNames[i] ) );
}
auto fileCount = static_cast<int>( layerFileNames.size() );
@@ -121,23 +121,22 @@ void RicImportEnsembleSurfaceFeature::importSingleEnsembleSurfaceFromFiles( cons
{
auto fileName = layerFileNames[i];
auto fileSurface = surfaces[i];
fileSurface->setSurfaceFilePath( fileName );
auto surface = surfaces[i];
auto shortName = RiaEnsembleNameTools::uniqueShortNameFromComponents( fileName, keyFileComponentsForAllFiles, ensembleName );
fileSurface->setUserDescription( shortName );
surface->setUserDescription( shortName );
auto isOk = fileSurface->onLoadData();
auto isOk = surface->onLoadData();
if ( !isOk )
{
delete fileSurface;
delete surface;
surfaces[i] = nullptr;
}
}
{
// Remove null pointers from vector of surfaces
std::vector<RimFileSurface*> tmp;
std::vector<RimSurface*> tmp;
for ( auto s : surfaces )
{
if ( s != nullptr ) tmp.push_back( s );
@@ -151,7 +150,7 @@ void RicImportEnsembleSurfaceFeature::importSingleEnsembleSurfaceFromFiles( cons
auto ensemble = new RimEnsembleSurface;
ensemble->setCollectionName( ensembleName );
for ( auto surface : surfaces )
ensemble->addFileSurface( surface );
ensemble->addSurface( surface );
ensemble->loadDataAndUpdate();