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

#1943 Curve creator. RimProject::allSummaryCases also returns observed data

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-09-28 14:42:06 +02:00
parent 5ce6034a61
commit 9db96cbb1b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -537,16 +537,23 @@ void RimProject::allCases(std::vector<RimCase*>& cases)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimProject::allSummaryCases(std::vector<RimSummaryCase*>& sumCases) void RimProject::allSummaryCases(std::vector<RimSummaryCase*>& sumCases)
{ {
sumCases.clear();
for (RimOilField* oilField: oilFields) for (RimOilField* oilField: oilFields)
{ {
if(!oilField) continue; if(!oilField) continue;
RimSummaryCaseMainCollection* sumCaseMainColl = oilField->summaryCaseMainCollection(); RimSummaryCaseMainCollection* sumCaseMainColl = oilField->summaryCaseMainCollection();
if(sumCaseMainColl) if(sumCaseMainColl)
{ {
sumCases.clear();
std::vector<RimSummaryCase*> allSummaryCases = sumCaseMainColl->allSummaryCases(); std::vector<RimSummaryCase*> allSummaryCases = sumCaseMainColl->allSummaryCases();
sumCases.insert(sumCases.end(), allSummaryCases.begin(), allSummaryCases.end()); sumCases.insert(sumCases.end(), allSummaryCases.begin(), allSummaryCases.end());
} }
auto observedDataColl = oilField->observedDataCollection();
if (observedDataColl != nullptr && observedDataColl->allObservedData().size() > 0)
{
auto observedData = observedDataColl->allObservedData();
sumCases.insert(sumCases.end(), observedData.begin(), observedData.end());
}
} }
} }