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

#3106 Ensemble calculations. Hash only ensemble parameters common to all cases. Move cases validation

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-07-04 14:36:14 +02:00
parent 224f379ea6
commit cc87da2ae0
9 changed files with 193 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
ApplicationCode/Commands/RicImportEnsembleFeature.cpp
View File

@@ -49,66 +49,6 @@
CAF_CMD_SOURCE_INIT(RicImportEnsembleFeature, "RicImportEnsembleFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicImportEnsembleFeature::validateEnsembleCases(std::vector<RimSummaryCase*> cases)
{
// Validate ensemble parameters
try
{
QString errors;
std::hash<std::string> paramsHasher;
size_t paramsHash = 0;
for (RimSummaryCase* rimCase : cases)
{
if (rimCase->caseRealizationParameters() == nullptr || rimCase->caseRealizationParameters()->parameters().empty())
{
errors.append(QString("The case %1 has no ensemble parameters\n").arg(QFileInfo(rimCase->summaryHeaderFilename()).fileName()));
}
else
{
QString paramNames;
for (std::pair<QString, RigCaseRealizationParameters::Value> paramPair : rimCase->caseRealizationParameters()->parameters())
{
paramNames.append(paramPair.first);
}
size_t currHash = paramsHasher(paramNames.toStdString());
if (paramsHash == 0)
{
paramsHash = currHash;
}
else if (paramsHash != currHash)
{
throw QString("Ensemble parameters differ between cases");
}
}
}
if (!errors.isEmpty())
{
errors.append("\n");
errors.append("No parameters file (parameters.txt or runspecification.xml) was found in \n");
errors.append("the searched folders. ResInsight searches the home folder of the summary \n");
errors.append("case file and the three folder levels above that.\n");
throw errors;
}
return true;
}
catch (QString errorMessage)
{
QMessageBox mbox;
mbox.setIcon(QMessageBox::Icon::Warning);
mbox.setInformativeText(errorMessage);
mbox.exec();
return false;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -133,8 +73,6 @@ void RicImportEnsembleFeature::onActionTriggered(bool isChecked)
std::vector<RimSummaryCase*> cases;
RicImportSummaryCasesFeature::createSummaryCasesFromFiles(fileNames, &cases, true);
validateEnsembleCases(cases);
RicImportSummaryCasesFeature::addSummaryCases(cases);
auto newGroup = RicCreateSummaryCaseCollectionFeature::groupSummaryCases(cases, ensembleName, true);