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

WBS: Fix crash when importing CSV into existing WBS.

Browse Source
This commit is contained in:
Kristian Bendiksen 2024-02-28 08:32:49 +01:00 committed by jonjenssen
parent b33d117784
commit 2f3a20c73c
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp
View File

@ -117,22 +117,25 @@ std::vector<std::pair<double, double>> RimWellLogCsvFile::findMdAndChannelValues
std::vector<RimWellLogCsvFile*> wellLogFiles = wellPath.descendantsIncludingThisOfType<RimWellLogCsvFile>(); std::vector<RimWellLogCsvFile*> wellLogFiles = wellPath.descendantsIncludingThisOfType<RimWellLogCsvFile>();
for ( RimWellLogCsvFile* wellLogFile : wellLogFiles ) for ( RimWellLogCsvFile* wellLogFile : wellLogFiles )
{ {
RigWellLogCsvFile* fileData = wellLogFile->wellLogFileData(); RigWellLogCsvFile* fileData = wellLogFile->wellLogFileData();
std::vector<double> channelValues = fileData->values( channelName ); if ( fileData )
if ( !channelValues.empty() )
{ {
if ( unitString ) std::vector<double> channelValues = fileData->values( channelName );
if ( !channelValues.empty() )
{ {
*unitString = fileData->wellLogChannelUnitString( channelName ); if ( unitString )
{
*unitString = fileData->wellLogChannelUnitString( channelName );
}
std::vector<double> depthValues = fileData->depthValues();
CVF_ASSERT( depthValues.size() == channelValues.size() );
std::vector<std::pair<double, double>> depthValuePairs;
for ( size_t i = 0; i < depthValues.size(); ++i )
{
depthValuePairs.push_back( std::make_pair( depthValues[i], channelValues[i] ) );
}
return depthValuePairs;
} }
std::vector<double> depthValues = fileData->depthValues();
CVF_ASSERT( depthValues.size() == channelValues.size() );
std::vector<std::pair<double, double>> depthValuePairs;
for ( size_t i = 0; i < depthValues.size(); ++i )
{
depthValuePairs.push_back( std::make_pair( depthValues[i], channelValues[i] ) );
}
return depthValuePairs;
} }
} }
return std::vector<std::pair<double, double>>(); return std::vector<std::pair<double, double>>();