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

This commit is contained in:
Bjørn Erik Jensen
2018-04-26 09:47:43 +02:00
parent fa6edf14e6
commit 93304360fa

View File

@@ -102,6 +102,7 @@ bool RicImportEnsembleFeature::validateEnsembleCases(std::vector<RimSummaryCase*
// Validate ensemble parameters
try
{
QString errors;
std::hash<std::string> paramsHasher;
size_t paramsHash = 0;
@@ -109,7 +110,7 @@ bool RicImportEnsembleFeature::validateEnsembleCases(std::vector<RimSummaryCase*
{
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
{
@@ -130,6 +131,11 @@ bool RicImportEnsembleFeature::validateEnsembleCases(std::vector<RimSummaryCase*
}
}
}
if (!errors.isEmpty())
{
throw errors;
}
return true;
}
catch (QString errorMessage)