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

Whitespace

Browse Source
This commit is contained in:
Magne Sjaastad 2018-11-06 08:35:04 +01:00
parent 00b0d6ef9f
commit 5e17eaf98a
1 changed files with 129 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -25,8 +25,8 @@
#include "RiaFieldHandleTools.h" #include "RiaFieldHandleTools.h"
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h"
#include "CompletionExportCommands/RicExportCompletionDataSettingsUi.h" #include "CompletionExportCommands/RicExportCompletionDataSettingsUi.h"
#include "CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h"
#include "RigActiveCellInfo.h" #include "RigActiveCellInfo.h"
#include "RigCaseCellResultsData.h" #include "RigCaseCellResultsData.h"
@ -51,11 +51,11 @@
#include "RimFormationNames.h" #include "RimFormationNames.h"
#include "RimGridCollection.h" #include "RimGridCollection.h"
#include "RimIntersectionCollection.h" #include "RimIntersectionCollection.h"
#include "RimRegularLegendConfig.h"
#include "RimMainPlotCollection.h" #include "RimMainPlotCollection.h"
#include "RimOilField.h" #include "RimOilField.h"
#include "RimPerforationCollection.h" #include "RimPerforationCollection.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimRegularLegendConfig.h"
#include "RimReservoirCellResultsStorage.h" #include "RimReservoirCellResultsStorage.h"
#include "RimStimPlanColors.h" #include "RimStimPlanColors.h"
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
@ -71,14 +71,13 @@
#include "RimWellPathCollection.h" #include "RimWellPathCollection.h"
#include "cafPdmDocument.h" #include "cafPdmDocument.h"
#include "cafProgressInfo.h"
#include "cafPdmUiTreeOrdering.h" #include "cafPdmUiTreeOrdering.h"
#include "cafProgressInfo.h"
#include <QDebug>
#include <QDir>
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QDir>
#include <QDebug>
CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimEclipseCase, "RimReservoir"); CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimEclipseCase, "RimReservoir");
@ -87,18 +86,18 @@ CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimEclipseCase, "RimReservoir");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimEclipseCase::RimEclipseCase() RimEclipseCase::RimEclipseCase()
{ {
CAF_PDM_InitFieldNoDefault(&reservoirViews, "ReservoirViews", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&reservoirViews, "ReservoirViews", "", "", "", "");
reservoirViews.uiCapability()->setUiHidden(true); reservoirViews.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_matrixModelResults, "MatrixModelResults", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_matrixModelResults, "MatrixModelResults", "", "", "", "");
m_matrixModelResults.uiCapability()->setUiHidden(true); m_matrixModelResults.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_fractureModelResults, "FractureModelResults", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_fractureModelResults, "FractureModelResults", "", "", "", "");
m_fractureModelResults.uiCapability()->setUiHidden(true); m_fractureModelResults.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&m_flipXAxis, "FlipXAxis", false, "Flip X Axis", "", "", ""); CAF_PDM_InitField(&m_flipXAxis, "FlipXAxis", false, "Flip X Axis", "", "", "");
CAF_PDM_InitField(&m_flipYAxis, "FlipYAxis", false, "Flip Y Axis", "", "", ""); CAF_PDM_InitField(&m_flipYAxis, "FlipYAxis", false, "Flip Y Axis", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_filesContainingFaultsSemColSeparated, "CachedFileNamesContainingFaults", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_filesContainingFaultsSemColSeparated, "CachedFileNamesContainingFaults", "", "", "", "");
m_filesContainingFaultsSemColSeparated.uiCapability()->setUiHidden(true); m_filesContainingFaultsSemColSeparated.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_2dContourMapsCollection, "ContourMaps", "2d Contour Maps", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_2dContourMapsCollection, "ContourMaps", "2d Contour Maps", "", "", "");
@ -106,10 +105,10 @@ RimEclipseCase::RimEclipseCase()
m_2dContourMapsCollection.uiCapability()->setUiTreeHidden(true); m_2dContourMapsCollection.uiCapability()->setUiTreeHidden(true);
// Obsolete fields // Obsolete fields
CAF_PDM_InitFieldNoDefault(&m_filesContainingFaults_OBSOLETE, "FilesContainingFaults", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_filesContainingFaults_OBSOLETE, "FilesContainingFaults", "", "", "", "");
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_filesContainingFaults_OBSOLETE); RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_filesContainingFaults_OBSOLETE);
CAF_PDM_InitField(&m_caseName_OBSOLETE, "CaseName", QString(), "Obsolete", "", "" ,""); CAF_PDM_InitField(&m_caseName_OBSOLETE, "CaseName", QString(), "Obsolete", "", "", "");
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_caseName_OBSOLETE); RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_caseName_OBSOLETE);
// Init // Init
@ -122,7 +121,7 @@ RimEclipseCase::RimEclipseCase()
m_fractureModelResults.uiCapability()->setUiHidden(true); m_fractureModelResults.uiCapability()->setUiHidden(true);
m_fractureModelResults.uiCapability()->setUiTreeChildrenHidden(true); m_fractureModelResults.uiCapability()->setUiTreeChildrenHidden(true);
this->setReservoirData( nullptr ); this->setReservoirData(nullptr);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -176,25 +175,25 @@ const RigEclipseCaseData* RimEclipseCase::eclipseCaseData() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::Color3f RimEclipseCase::defaultWellColor(const QString& wellName) cvf::Color3f RimEclipseCase::defaultWellColor(const QString& wellName)
{ {
if ( m_wellToColorMap.empty() ) if (m_wellToColorMap.empty())
{ {
const caf::ColorTable& colorTable = RiaColorTables::wellsPaletteColors(); const caf::ColorTable& colorTable = RiaColorTables::wellsPaletteColors();
cvf::Color3ubArray wellColors = colorTable.color3ubArray(); cvf::Color3ubArray wellColors = colorTable.color3ubArray();
cvf::Color3ubArray interpolatedWellColors = wellColors; cvf::Color3ubArray interpolatedWellColors = wellColors;
const cvf::Collection<RigSimWellData>& simWellData = this->eclipseCaseData()->wellResults(); const cvf::Collection<RigSimWellData>& simWellData = this->eclipseCaseData()->wellResults();
if ( simWellData.size() > 1 ) if (simWellData.size() > 1)
{ {
interpolatedWellColors = caf::ColorTable::interpolateColorArray(wellColors, simWellData.size()); interpolatedWellColors = caf::ColorTable::interpolateColorArray(wellColors, simWellData.size());
} }
for ( size_t wIdx = 0; wIdx < simWellData.size(); ++wIdx ) for (size_t wIdx = 0; wIdx < simWellData.size(); ++wIdx)
{ {
m_wellToColorMap[simWellData[wIdx]->m_wellName] = cvf::Color3f::BLACK; m_wellToColorMap[simWellData[wIdx]->m_wellName] = cvf::Color3f::BLACK;
} }
size_t wIdx = 0; size_t wIdx = 0;
for ( auto & wNameColorPair: m_wellToColorMap ) for (auto& wNameColorPair : m_wellToColorMap)
{ {
wNameColorPair.second = cvf::Color3f(interpolatedWellColors[wIdx]); wNameColorPair.second = cvf::Color3f(interpolatedWellColors[wIdx]);
@ -244,7 +243,6 @@ void RimEclipseCase::initAfterRead()
contourMap->setEclipseCase(this); contourMap->setEclipseCase(this);
} }
if (caseUserDescription().isEmpty() && !m_caseName_OBSOLETE().isEmpty()) if (caseUserDescription().isEmpty() && !m_caseName_OBSOLETE().isEmpty())
{ {
caseUserDescription = m_caseName_OBSOLETE; caseUserDescription = m_caseName_OBSOLETE;
@ -292,7 +290,8 @@ RimEclipseView* RimEclipseCase::createCopyAndAddView(const RimEclipseView* sourc
{ {
CVF_ASSERT(sourceView); CVF_ASSERT(sourceView);
RimEclipseView* rimEclipseView = dynamic_cast<RimEclipseView*>(sourceView->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance())); RimEclipseView* rimEclipseView = dynamic_cast<RimEclipseView*>(
sourceView->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
CVF_ASSERT(rimEclipseView); CVF_ASSERT(rimEclipseView);
rimEclipseView->setEclipseCase(this); rimEclipseView->setEclipseCase(this);
@ -313,11 +312,8 @@ RimEclipseView* RimEclipseCase::createCopyAndAddView(const RimEclipseView* sourc
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
Rim2dEclipseView* RimEclipseCase::create2dContourMapFrom3dView(const RimEclipseView* sourceView) Rim2dEclipseView* RimEclipseCase::create2dContourMapFrom3dView(const RimEclipseView* sourceView)
{ {
Rim2dEclipseView* contourMap = Rim2dEclipseView* contourMap = dynamic_cast<Rim2dEclipseView*>(sourceView->xmlCapability()->copyAndCastByXmlSerialization(
dynamic_cast<Rim2dEclipseView*>(sourceView->xmlCapability()->copyAndCastByXmlSerialization( Rim2dEclipseView::classKeywordStatic(), sourceView->classKeyword(), caf::PdmDefaultObjectFactory::instance()));
Rim2dEclipseView::classKeywordStatic(),
sourceView->classKeyword(),
caf::PdmDefaultObjectFactory::instance()));
CVF_ASSERT(contourMap); CVF_ASSERT(contourMap);
contourMap->setEclipseCase(this); contourMap->setEclipseCase(this);
@ -385,9 +381,9 @@ const RigVirtualPerforationTransmissibilities* RimEclipseCase::computeAndGetVirt
cvf::ref<RigVirtualPerforationTransmissibilities> perfTrans = new RigVirtualPerforationTransmissibilities; cvf::ref<RigVirtualPerforationTransmissibilities> perfTrans = new RigVirtualPerforationTransmissibilities;
std::vector<RimWellPath*> visibleWellPaths; std::vector<RimWellPath*> visibleWellPaths;
bool anyPerforationsPresent = false; bool anyPerforationsPresent = false;
{ {
RimProject* proj = RiaApplication::instance()->project(); RimProject* proj = RiaApplication::instance()->project();
std::vector<RimWellPath*> wellPaths = proj->allWellPaths(); std::vector<RimWellPath*> wellPaths = proj->allWellPaths();
for (auto w : wellPaths) for (auto w : wellPaths)
{ {
@ -405,7 +401,8 @@ const RigVirtualPerforationTransmissibilities* RimEclipseCase::computeAndGetVirt
for (auto w : visibleWellPaths) for (auto w : visibleWellPaths)
{ {
std::vector<RigCompletionData> staticCompletionData = RicWellPathExportCompletionDataFeatureImpl::computeStaticCompletionsForWellPath(w, this); std::vector<RigCompletionData> staticCompletionData =
RicWellPathExportCompletionDataFeatureImpl::computeStaticCompletionsForWellPath(w, this);
if (anyPerforationsPresent) if (anyPerforationsPresent)
{ {
@ -413,9 +410,12 @@ const RigVirtualPerforationTransmissibilities* RimEclipseCase::computeAndGetVirt
for (size_t i = 0; i < timeStepDates().size(); i++) for (size_t i = 0; i < timeStepDates().size(); i++)
{ {
std::vector<RigCompletionData> dynamicCompletionDataOneTimeStep = RicWellPathExportCompletionDataFeatureImpl::computeDynamicCompletionsForWellPath(w, this, i); std::vector<RigCompletionData> dynamicCompletionDataOneTimeStep =
RicWellPathExportCompletionDataFeatureImpl::computeDynamicCompletionsForWellPath(w, this, i);
std::copy(staticCompletionData.begin(), staticCompletionData.end(), std::back_inserter(dynamicCompletionDataOneTimeStep)); std::copy(staticCompletionData.begin(),
staticCompletionData.end(),
std::back_inserter(dynamicCompletionDataOneTimeStep));
allCompletionData.push_back(dynamicCompletionDataOneTimeStep); allCompletionData.push_back(dynamicCompletionDataOneTimeStep);
} }
@ -446,14 +446,16 @@ const RigVirtualPerforationTransmissibilities* RimEclipseCase::computeAndGetVirt
{ {
if (r.isValid()) if (r.isValid())
{ {
RigCompletionData compData(wellRes->m_wellName, RigCompletionDataGridCell(r.m_gridCellIndex, rigEclipseCase->mainGrid()), 0); RigCompletionData compData(
wellRes->m_wellName,
RigCompletionDataGridCell(r.m_gridCellIndex, rigEclipseCase->mainGrid()),
0);
compData.setTransmissibility(r.connectionFactor()); compData.setTransmissibility(r.connectionFactor());
completionData.push_back(compData); completionData.push_back(compData);
} }
} }
} }
} }
completionsPerTimeStep.push_back(completionData); completionsPerTimeStep.push_back(completionData);
@ -498,22 +500,21 @@ void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
} }
} }
} }
else if(changedField == &activeFormationNames) else if (changedField == &activeFormationNames)
{ {
updateFormationNamesData(); updateFormationNamesData();
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimEclipseCase::updateFormationNamesData() void RimEclipseCase::updateFormationNamesData()
{ {
RigEclipseCaseData* rigEclipseCase = eclipseCaseData(); RigEclipseCaseData* rigEclipseCase = eclipseCaseData();
if(rigEclipseCase) if (rigEclipseCase)
{ {
if(activeFormationNames()) if (activeFormationNames())
{ {
rigEclipseCase->setActiveFormationNames(activeFormationNames()->formationNamesData()); rigEclipseCase->setActiveFormationNames(activeFormationNames()->formationNamesData());
} }
@ -522,11 +523,11 @@ void RimEclipseCase::updateFormationNamesData()
rigEclipseCase->setActiveFormationNames(nullptr); rigEclipseCase->setActiveFormationNames(nullptr);
} }
std::vector<Rim3dView*> views = this->views(); std::vector<Rim3dView*> views = this->views();
for(Rim3dView* view : views) for (Rim3dView* view : views)
{ {
RimEclipseView* eclView = dynamic_cast<RimEclipseView*>(view); RimEclipseView* eclView = dynamic_cast<RimEclipseView*>(view);
if(eclView && eclView->isUsingFormationNames()) if (eclView && eclView->isUsingFormationNames())
{ {
if (!activeFormationNames()) if (!activeFormationNames())
{ {
@ -537,9 +538,9 @@ void RimEclipseCase::updateFormationNamesData()
} }
RimEclipsePropertyFilterCollection* eclFilColl = eclView->eclipsePropertyFilterCollection(); RimEclipsePropertyFilterCollection* eclFilColl = eclView->eclipsePropertyFilterCollection();
for ( RimEclipsePropertyFilter* propFilter : eclFilColl->propertyFilters ) for (RimEclipsePropertyFilter* propFilter : eclFilColl->propertyFilters)
{ {
if ( propFilter->resultDefinition->resultType() == RiaDefines::FORMATION_NAMES ) if (propFilter->resultDefinition->resultType() == RiaDefines::FORMATION_NAMES)
{ {
propFilter->resultDefinition()->setResultVariable(RiaDefines::undefinedResultName()); propFilter->resultDefinition()->setResultVariable(RiaDefines::undefinedResultName());
} }
@ -547,9 +548,9 @@ void RimEclipseCase::updateFormationNamesData()
} }
RimEclipsePropertyFilterCollection* eclFilColl = eclView->eclipsePropertyFilterCollection(); RimEclipsePropertyFilterCollection* eclFilColl = eclView->eclipsePropertyFilterCollection();
for ( RimEclipsePropertyFilter* propFilter : eclFilColl->propertyFilters ) for (RimEclipsePropertyFilter* propFilter : eclFilColl->propertyFilters)
{ {
if ( propFilter->resultDefinition->resultType() == RiaDefines::FORMATION_NAMES ) if (propFilter->resultDefinition->resultType() == RiaDefines::FORMATION_NAMES)
{ {
propFilter->setToDefaultValues(); propFilter->setToDefaultValues();
propFilter->updateConnectedEditors(); propFilter->updateConnectedEditors();
@ -572,7 +573,8 @@ void RimEclipseCase::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
std::vector<PdmObjectHandle*> children; std::vector<PdmObjectHandle*> children;
reservoirViews.childObjects(&children); reservoirViews.childObjects(&children);
for (auto child : children) uiTreeOrdering.add(child); for (auto child : children)
uiTreeOrdering.add(child);
if (!m_2dIntersectionViewCollection->views().empty()) if (!m_2dIntersectionViewCollection->views().empty())
{ {
@ -609,7 +611,7 @@ void RimEclipseCase::computeCachedData()
pInf.incrementProgress(); pInf.incrementProgress();
pInf.setProgressDescription("Calculating Formation Names Result"); pInf.setProgressDescription("Calculating Formation Names Result");
if ( activeFormationNames() ) if (activeFormationNames())
{ {
rigEclipseCase->setActiveFormationNames(activeFormationNames()->formationNamesData()); rigEclipseCase->setActiveFormationNames(activeFormationNames()->formationNamesData());
} }
@ -622,7 +624,6 @@ void RimEclipseCase::computeCachedData()
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -636,7 +637,7 @@ RimCaseCollection* RimEclipseCase::parentCaseCollection()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimEclipseCase::setReservoirData(RigEclipseCaseData* eclipseCase) void RimEclipseCase::setReservoirData(RigEclipseCaseData* eclipseCase)
{ {
m_rigEclipseCase = eclipseCase; m_rigEclipseCase = eclipseCase;
if (this->eclipseCaseData()) if (this->eclipseCaseData())
{ {
m_fractureModelResults()->setCellResults(eclipseCaseData()->results(RiaDefines::FRACTURE_MODEL)); m_fractureModelResults()->setCellResults(eclipseCaseData()->results(RiaDefines::FRACTURE_MODEL));
@ -739,7 +740,7 @@ bool RimEclipseCase::loadStaticResultsByName(const std::vector<QString>& resultN
bool foundDataForAllResults = true; bool foundDataForAllResults = true;
RigCaseCellResultsData* cellResultsData = this->results(RiaDefines::MATRIX_MODEL); RigCaseCellResultsData* cellResultsData = this->results(RiaDefines::MATRIX_MODEL);
if(cellResultsData) if (cellResultsData)
{ {
for (const auto& resultName : resultNames) for (const auto& resultName : resultNames)
{ {
@ -785,11 +786,12 @@ const RimReservoirCellResultsStorage* RimEclipseCase::resultsStorage(RiaDefines:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<QString> RimEclipseCase::filesContainingFaults() const std::vector<QString> RimEclipseCase::filesContainingFaults() const
{ {
QString separatedPaths = m_filesContainingFaultsSemColSeparated; QString separatedPaths = m_filesContainingFaultsSemColSeparated;
QStringList pathList = separatedPaths.split(";", QString::SkipEmptyParts); QStringList pathList = separatedPaths.split(";", QString::SkipEmptyParts);
std::vector<QString> stdPathList; std::vector<QString> stdPathList;
for (auto& path: pathList) stdPathList.push_back(path); for (auto& path : pathList)
stdPathList.push_back(path);
return stdPathList; return stdPathList;
} }
@ -805,7 +807,7 @@ void RimEclipseCase::setFilesContainingFaults(const std::vector<QString>& val)
{ {
const auto& path = val[i]; const auto& path = val[i];
separatedPaths += path; separatedPaths += path;
if (!(i+1 >= val.size()) ) if (!(i + 1 >= val.size()))
{ {
separatedPaths += ";"; separatedPaths += ";";
} }
@ -835,33 +837,40 @@ bool RimEclipseCase::openReserviorCase()
{ {
{ {
RigCaseCellResultsData* results = this->results(RiaDefines::MATRIX_MODEL); RigCaseCellResultsData* results = this->results(RiaDefines::MATRIX_MODEL);
if (results ) if (results)
{ {
results->createPlaceholderResultEntries(); results->createPlaceholderResultEntries();
// After the placeholder result for combined transmissibility is created, // After the placeholder result for combined transmissibility is created,
// make sure the nnc transmissibilities can be addressed by this scalarResultIndex as well // make sure the nnc transmissibilities can be addressed by this scalarResultIndex as well
size_t combinedTransResIdx = results->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedTransmissibilityResultName()); size_t combinedTransResIdx =
results->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedTransmissibilityResultName());
if (combinedTransResIdx != cvf::UNDEFINED_SIZE_T) if (combinedTransResIdx != cvf::UNDEFINED_SIZE_T)
{ {
eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameCombTrans(), combinedTransResIdx); eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameCombTrans(),
combinedTransResIdx);
} }
size_t combinedWatFluxResIdx = results->findScalarResultIndex(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedWaterFluxResultName()); size_t combinedWatFluxResIdx =
results->findScalarResultIndex(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedWaterFluxResultName());
if (combinedWatFluxResIdx != cvf::UNDEFINED_SIZE_T) if (combinedWatFluxResIdx != cvf::UNDEFINED_SIZE_T)
{ {
eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameFluxWat(), combinedWatFluxResIdx); eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameFluxWat(),
combinedWatFluxResIdx);
} }
size_t combinedOilFluxResIdx = results->findScalarResultIndex(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedOilFluxResultName()); size_t combinedOilFluxResIdx =
results->findScalarResultIndex(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedOilFluxResultName());
if (combinedOilFluxResIdx != cvf::UNDEFINED_SIZE_T) if (combinedOilFluxResIdx != cvf::UNDEFINED_SIZE_T)
{ {
eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameFluxOil(), combinedOilFluxResIdx); eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameFluxOil(),
combinedOilFluxResIdx);
} }
size_t combinedGasFluxResIdx = results->findScalarResultIndex(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedGasFluxResultName()); size_t combinedGasFluxResIdx =
results->findScalarResultIndex(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedGasFluxResultName());
if (combinedGasFluxResIdx != cvf::UNDEFINED_SIZE_T) if (combinedGasFluxResIdx != cvf::UNDEFINED_SIZE_T)
{ {
eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameFluxGas(), combinedGasFluxResIdx); eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameFluxGas(),
combinedGasFluxResIdx);
} }
} }
} }
{ {
@ -993,7 +1002,8 @@ void RimEclipseCase::reloadDataAndUpdate()
RimProject* project = RiaApplication::instance()->project(); RimProject* project = RiaApplication::instance()->project();
if (project) if (project)
{ {
RimSummaryCaseMainCollection* sumCaseColl = project->activeOilField() ? project->activeOilField()->summaryCaseMainCollection() : nullptr; RimSummaryCaseMainCollection* sumCaseColl =
project->activeOilField() ? project->activeOilField()->summaryCaseMainCollection() : nullptr;
if (sumCaseColl) if (sumCaseColl)
{ {
sumCaseColl->loadAllSummaryCaseData(); sumCaseColl->loadAllSummaryCaseData();
@ -1001,9 +1011,9 @@ void RimEclipseCase::reloadDataAndUpdate()
if (project->mainPlotCollection()) if (project->mainPlotCollection())
{ {
RimWellLogPlotCollection* wellPlotCollection = project->mainPlotCollection()->wellLogPlotCollection(); RimWellLogPlotCollection* wellPlotCollection = project->mainPlotCollection()->wellLogPlotCollection();
RimSummaryPlotCollection* summaryPlotCollection = project->mainPlotCollection()->summaryPlotCollection(); RimSummaryPlotCollection* summaryPlotCollection = project->mainPlotCollection()->summaryPlotCollection();
RimFlowPlotCollection* flowPlotCollection = project->mainPlotCollection()->flowPlotCollection(); RimFlowPlotCollection* flowPlotCollection = project->mainPlotCollection()->flowPlotCollection();
if (wellPlotCollection) if (wellPlotCollection)
{ {