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

#4267 Fix crash when exporting sector model from grid that was imported from GRDECL

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-04-01 11:37:33 +02:00
parent 3b8daa4939
commit 8f6a0f8177
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
View File

@ -91,7 +91,10 @@ RicExportEclipseSectorModelUi::RicExportEclipseSectorModelUi(RigEclipseCaseData*
for (QString keyword : mainKeywords()) for (QString keyword : mainKeywords())
{ {
exportMainKeywords.v().push_back(keyword); if (caseData->results(RiaDefines::MATRIX_MODEL)->hasResultEntry(RigEclipseResultAddress(RiaDefines::STATIC_NATIVE, keyword)))
{
exportMainKeywords.v().push_back(keyword);
}
} }
} }
@ -255,10 +258,13 @@ QList<caf::PdmOptionItemInfo>
std::set<QString> mainKeywords = this->mainKeywords(); std::set<QString> mainKeywords = this->mainKeywords();
for (caf::PdmOptionItemInfo option : allOptions) for (caf::PdmOptionItemInfo option : allOptions)
{ {
if (mainKeywords.count(option.optionUiText())) if (mainKeywords.count(option.optionUiText()))
{ {
options.push_back(option); if (resultData->hasResultEntry(RigEclipseResultAddress(RiaDefines::STATIC_NATIVE, option.optionUiText())))
{
options.push_back(option);
}
} }
} }
} }
@ -273,14 +279,17 @@ QList<caf::PdmOptionItemInfo>
{ {
if (!mainKeywords.count(option.optionUiText()) && option.optionUiText() != "None") if (!mainKeywords.count(option.optionUiText()) && option.optionUiText() != "None")
{ {
if (option.optionUiText() == "ACTNUM" && exportGrid()) if (resultData->hasResultEntry(RigEclipseResultAddress(RiaDefines::STATIC_NATIVE, option.optionUiText())))
{ {
if (exportResults() != EXPORT_TO_GRID_FILE) if (option.optionUiText() == "ACTNUM" && exportGrid())
options.push_back(caf::PdmOptionItemInfo("ACTNUM (included in Grid File)", "ACTNUM")); {
} if (exportResults() != EXPORT_TO_GRID_FILE)
else options.push_back(caf::PdmOptionItemInfo("ACTNUM (included in Grid File)", "ACTNUM"));
{ }
options.push_back(option); else
{
options.push_back(option);
}
} }
} }
} }