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

#2810 import ensemble. Import all summary files even though some files miss ensemble parameters

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-04-26 09:47:43 +02:00
parent fa6edf14e6
commit 93304360fa
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Commands/RicImportEnsembleFeature.cpp
View File

@@ -102,6 +102,7 @@ bool RicImportEnsembleFeature::validateEnsembleCases(std::vector<RimSummaryCase*
// Validate ensemble parameters // Validate ensemble parameters
try try
{ {
QString errors;
std::hash<std::string> paramsHasher; std::hash<std::string> paramsHasher;
size_t paramsHash = 0; size_t paramsHash = 0;
@@ -109,7 +110,7 @@ bool RicImportEnsembleFeature::validateEnsembleCases(std::vector<RimSummaryCase*
{ {
if (rimCase->caseRealizationParameters().isNull() || rimCase->caseRealizationParameters()->parameters().empty()) if (rimCase->caseRealizationParameters().isNull() || rimCase->caseRealizationParameters()->parameters().empty())
{ {
throw QString("The case %1 has no ensemble parameters").arg(rimCase->summaryHeaderFilename()); errors.append(QString("The case %1 has no ensemble parameters\n").arg(QFileInfo(rimCase->summaryHeaderFilename()).fileName()));
} }
else else
{ {
@@ -130,6 +131,11 @@ bool RicImportEnsembleFeature::validateEnsembleCases(std::vector<RimSummaryCase*
} }
} }
} }
if (!errors.isEmpty())
{
throw errors;
}
return true; return true;
} }
catch (QString errorMessage) catch (QString errorMessage)