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

#4091 Reload case : Move reload of case into helper function

Browse Source
This commit is contained in:
Magne Sjaastad 2019-02-14 21:26:23 +01:00
parent 4e9895ef0e
commit e660433d29
8 changed files with 246 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/RicDeleteTemporaryLgrsFeature.cpp
View File

@ -23,6 +23,7 @@
#include "RimEclipseCase.h"
#include "RimGridCollection.h"
#include "RimReloadCaseTools.h"
#include "cafPdmObject.h"
#include "cafSelectionManagerTools.h"
@ -38,7 +39,10 @@ void RicDeleteTemporaryLgrsFeature::deleteAllTemporaryLgrs(RimEclipseCase* eclip
{
RiaApplication::clearAllSelections();
if (eclipseCase) eclipseCase->reloadDataAndUpdate();
if (eclipseCase)
{
RimReloadCaseTools::reloadAllEclipseGridData(eclipseCase);
}
}
//--------------------------------------------------------------------------------------------------

5
ApplicationCode/Commands/RicReloadCaseFeature.cpp
View File

@ -22,6 +22,7 @@
#include "RiaApplication.h"
#include "RimEclipseCase.h"
#include "RimReloadCaseTools.h"
#include "RimTimeStepFilter.h"
#include "Riu3dSelectionManager.h"
@ -63,14 +64,14 @@ void RicReloadCaseFeature::onActionTriggered(bool isChecked)
for (RimEclipseCase* selectedCase : selectedEclipseCases)
{
std::vector<RimTimeStepFilter*> timeStepFilter;;
std::vector<RimTimeStepFilter*> timeStepFilter;
selectedCase->descendantsIncludingThisOfType(timeStepFilter);
if (timeStepFilter.size() == 1)
{
timeStepFilter[0]->clearFilteredTimeSteps();
}
selectedCase->reloadDataAndUpdate();
RimReloadCaseTools::reloadAllEclipseData(selectedCase);
selectedCase->updateConnectedEditors();
}
}

2
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -126,6 +126,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapView.h
${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapViewCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimViewNameConfig.h
${CMAKE_CURRENT_LIST_DIR}/RimScaleLegendConfig.h
${CMAKE_CURRENT_LIST_DIR}/RimReloadCaseTools.h
)
@ -256,6 +257,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapView.cpp
${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapViewCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimViewNameConfig.cpp
${CMAKE_CURRENT_LIST_DIR}/RimScaleLegendConfig.cpp
${CMAKE_CURRENT_LIST_DIR}/RimReloadCaseTools.cpp
)
list(APPEND CODE_HEADER_FILES

103
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -35,14 +35,14 @@
#include "RigSimWellData.h"
#include "RigVirtualPerforationTransmissibilities.h"
#include "RimEclipseContourMapView.h"
#include "RimEclipseContourMapViewCollection.h"
#include "Rim2dIntersectionView.h"
#include "Rim2dIntersectionViewCollection.h"
#include "RimCaseCollection.h"
#include "RimCellEdgeColors.h"
#include "RimCommandObject.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseContourMapView.h"
#include "RimEclipseContourMapViewCollection.h"
#include "RimEclipsePropertyFilter.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseStatisticsCase.h"
@ -57,6 +57,7 @@
#include "RimPerforationCollection.h"
#include "RimProject.h"
#include "RimRegularLegendConfig.h"
#include "RimReloadCaseTools.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimStimPlanColors.h"
#include "RimSummaryCase.h"
@ -414,7 +415,7 @@ void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
{
if (changedField == &m_releaseResultMemory)
{
reloadDataAndUpdate();
RimReloadCaseTools::reloadAllEclipseGridData(this);
m_releaseResultMemory = oldValue.toBool();
}
@ -691,7 +692,7 @@ bool RimEclipseCase::loadStaticResultsByName(const std::vector<QString>& resultN
{
for (const auto& resultName : resultNames)
{
if (!cellResultsData->ensureKnownResultLoaded(RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, resultName)))
if (!cellResultsData->ensureKnownResultLoaded(RigEclipseResultAddress(RiaDefines::STATIC_NATIVE, resultName)))
{
foundDataForAllResults = false;
}
@ -802,27 +803,31 @@ bool RimEclipseCase::openReserviorCase()
// After the placeholder result for combined transmissibility is created,
// make sure the nnc transmissibilities can be addressed by this scalarResultIndex as well
RigEclipseResultAddress combinedTransmissibilityResAddr(RiaDefines::STATIC_NATIVE, RiaDefines::combinedTransmissibilityResultName());
RigEclipseResultAddress combinedTransmissibilityResAddr(RiaDefines::STATIC_NATIVE,
RiaDefines::combinedTransmissibilityResultName());
if (results->hasResultEntry(combinedTransmissibilityResAddr))
{
eclipseCaseData()->mainGrid()->nncData()->setEclResultAddress(RigNNCData::propertyNameCombTrans(),
combinedTransmissibilityResAddr);
}
RigEclipseResultAddress combinedWaterFluxResAddr(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedWaterFluxResultName());
RigEclipseResultAddress combinedWaterFluxResAddr(RiaDefines::DYNAMIC_NATIVE,
RiaDefines::combinedWaterFluxResultName());
if (results->hasResultEntry(combinedWaterFluxResAddr))
{
eclipseCaseData()->mainGrid()->nncData()->setEclResultAddress(RigNNCData::propertyNameFluxWat(),
combinedWaterFluxResAddr);
}
RigEclipseResultAddress combinedOilFluxResAddr(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedOilFluxResultName());
RigEclipseResultAddress combinedOilFluxResAddr(RiaDefines::DYNAMIC_NATIVE,
RiaDefines::combinedOilFluxResultName());
if (results->hasResultEntry(combinedOilFluxResAddr))
{
eclipseCaseData()->mainGrid()->nncData()->setEclResultAddress(RigNNCData::propertyNameFluxOil(),
combinedOilFluxResAddr);
}
RigEclipseResultAddress combinedGasFluxResAddr(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedGasFluxResultName());
RigEclipseResultAddress combinedGasFluxResAddr(RiaDefines::DYNAMIC_NATIVE,
RiaDefines::combinedGasFluxResultName());
if (results->hasResultEntry(combinedGasFluxResAddr))
{
@ -924,88 +929,6 @@ QString RimEclipseCase::timeStepName(int frameIdx) const
return QString("");
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseCase::reloadDataAndUpdate()
{
if (this->eclipseCaseData())
{
RigCaseCellResultsData* matrixModelResults = eclipseCaseData()->results(RiaDefines::MATRIX_MODEL);
if (matrixModelResults)
{
matrixModelResults->clearAllResults();
}
RigCaseCellResultsData* fractureModelResults = eclipseCaseData()->results(RiaDefines::FRACTURE_MODEL);
if (fractureModelResults)
{
fractureModelResults->clearAllResults();
}
reloadEclipseGridFile();
for (size_t i = 0; i < reservoirViews().size(); i++)
{
RimEclipseView* reservoirView = reservoirViews()[i];
CVF_ASSERT(reservoirView);
reservoirView->loadDataAndUpdate();
reservoirView->updateGridBoxData();
reservoirView->updateAnnotationItems();
}
for (RimEclipseContourMapView* contourMap : m_contourMapCollection->views())
{
CVF_ASSERT(contourMap);
contourMap->loadDataAndUpdate();
contourMap->updateGridBoxData();
contourMap->updateAnnotationItems();
}
for (Rim2dIntersectionView* view : intersectionViewCollection()->views())
{
view->createDisplayModelAndRedraw();
}
RimProject* project = RiaApplication::instance()->project();
if (project)
{
RimSummaryCaseMainCollection* sumCaseColl =
project->activeOilField() ? project->activeOilField()->summaryCaseMainCollection() : nullptr;
if (sumCaseColl)
{
sumCaseColl->loadAllSummaryCaseData();
}
if (project->mainPlotCollection())
{
RimWellLogPlotCollection* wellPlotCollection = project->mainPlotCollection()->wellLogPlotCollection();
RimSummaryPlotCollection* summaryPlotCollection = project->mainPlotCollection()->summaryPlotCollection();
RimFlowPlotCollection* flowPlotCollection = project->mainPlotCollection()->flowPlotCollection();
if (wellPlotCollection)
{
for (size_t i = 0; i < wellPlotCollection->wellLogPlots().size(); ++i)
{
wellPlotCollection->wellLogPlots()[i]->loadDataAndUpdate();
}
}
if (summaryPlotCollection)
{
for (size_t i = 0; i < summaryPlotCollection->summaryPlots().size(); ++i)
{
summaryPlotCollection->summaryPlots()[i]->loadDataAndUpdate();
}
}
if (flowPlotCollection)
{
flowPlotCollection->loadDataAndUpdate();
}
}
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/RimEclipseCase.h
View File

@ -107,7 +107,6 @@ public:
cvf::BoundingBox allCellsBoundingBox() const override;
cvf::Vec3d displayModelOffset() const override;
void reloadDataAndUpdate();
virtual void reloadEclipseGridFile() = 0;

169
ApplicationCode/ProjectDataModel/RimReloadCaseTools.cpp Normal file
View File

@ -0,0 +1,169 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2019- Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimReloadCaseTools.h"
#include "RiaApplication.h"
#include "RiaFractureDefines.h"
#include "RiaSummaryTools.h"
#include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h"
#include "Rim2dIntersectionView.h"
#include "Rim2dIntersectionViewCollection.h"
#include "RimEclipseCase.h"
#include "RimEclipseContourMapView.h"
#include "RimEclipseContourMapViewCollection.h"
#include "RimEclipseView.h"
#include "RimFlowPlotCollection.h"
#include "RimMainPlotCollection.h"
#include "RimProject.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h"
#include "RimWellLogPlot.h"
#include "RimWellLogPlotCollection.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimReloadCaseTools::reloadAllEclipseData(RimEclipseCase* eclipseCase)
{
reloadAllEclipseData(eclipseCase, true);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimReloadCaseTools::reloadAllEclipseGridData(RimEclipseCase* eclipseCase)
{
reloadAllEclipseData(eclipseCase, false);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimReloadCaseTools::reloadAllEclipseData(RimEclipseCase* eclipseCase, bool reloadSummaryData)
{
CVF_ASSERT(eclipseCase);
RigEclipseCaseData* eclipseCaseData = eclipseCase->eclipseCaseData();
if (!eclipseCaseData) return;
clearAllGridData(eclipseCaseData);
eclipseCase->reloadEclipseGridFile();
updateAll3dViews(eclipseCase);
if (reloadSummaryData)
{
RimSummaryCaseMainCollection* sumCaseColl = RiaSummaryTools::summaryCaseMainCollection();
if (sumCaseColl)
{
sumCaseColl->loadAllSummaryCaseData();
}
}
updateAllPlots();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimReloadCaseTools::clearAllGridData(RigEclipseCaseData* eclipseCaseData)
{
if (!eclipseCaseData) return;
RigCaseCellResultsData* matrixModelResults = eclipseCaseData->results(RiaDefines::MATRIX_MODEL);
if (matrixModelResults)
{
matrixModelResults->clearAllResults();
}
RigCaseCellResultsData* fractureModelResults = eclipseCaseData->results(RiaDefines::FRACTURE_MODEL);
if (fractureModelResults)
{
fractureModelResults->clearAllResults();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimReloadCaseTools::updateAll3dViews(RimEclipseCase* eclipseCase)
{
if (!eclipseCase) return;
for (RimEclipseView* reservoirView : eclipseCase->reservoirViews())
{
CVF_ASSERT(reservoirView);
reservoirView->loadDataAndUpdate();
reservoirView->updateGridBoxData();
reservoirView->updateAnnotationItems();
}
for (RimEclipseContourMapView* contourMap : eclipseCase->contourMapCollection()->views())
{
CVF_ASSERT(contourMap);
contourMap->loadDataAndUpdate();
contourMap->updateGridBoxData();
contourMap->updateAnnotationItems();
}
for (Rim2dIntersectionView* view : eclipseCase->intersectionViewCollection()->views())
{
view->createDisplayModelAndRedraw();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimReloadCaseTools::updateAllPlots()
{
RimProject* project = RiaApplication::instance()->project();
if (project && project->mainPlotCollection())
{
RimWellLogPlotCollection* wellPlotCollection = project->mainPlotCollection()->wellLogPlotCollection();
if (wellPlotCollection)
{
for (RimWellLogPlot* wellLogPlot : wellPlotCollection->wellLogPlots())
{
wellLogPlot->loadDataAndUpdate();
}
}
RimSummaryPlotCollection* summaryPlotCollection = project->mainPlotCollection()->summaryPlotCollection();
if (summaryPlotCollection)
{
for (RimSummaryPlot* summaryPlot : summaryPlotCollection->summaryPlots())
{
summaryPlot->loadDataAndUpdate();
}
}
RimFlowPlotCollection* flowPlotCollection = project->mainPlotCollection()->flowPlotCollection();
if (flowPlotCollection)
{
flowPlotCollection->loadDataAndUpdate();
}
}
}

41
ApplicationCode/ProjectDataModel/RimReloadCaseTools.h Normal file
View File

@ -0,0 +1,41 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2019- Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
class RimEclipseCase;
class RigEclipseCaseData;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
class RimReloadCaseTools
{
public:
// Reload all eclipse data, both grid and summary
static void reloadAllEclipseData(RimEclipseCase* eclipseCase);
// Reload grid data, but not summary
static void reloadAllEclipseGridData(RimEclipseCase* eclipseCase);
private:
static void reloadAllEclipseData(RimEclipseCase* eclipseCase, bool reloadSummaryData);
static void clearAllGridData(RigEclipseCaseData* eclipseCaseData);
static void updateAll3dViews(RimEclipseCase* eclipseCase);
static void updateAllPlots();
};

4
ApplicationCode/ProjectDataModel/RimTimeStepFilter.cpp
View File

@ -26,6 +26,7 @@
#include "RimEclipseResultCase.h"
#include "RimGeoMechCase.h"
#include "RimReloadCaseTools.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimTools.h"
@ -200,10 +201,9 @@ void RimTimeStepFilter::fieldChangedByUi(const caf::PdmFieldHandle* changedField
{
if (updateFilteredTimeStepsFromUi())
{
if (rimEclipseResultCase)
{
rimEclipseResultCase->reloadDataAndUpdate();
RimReloadCaseTools::reloadAllEclipseGridData(rimEclipseResultCase);
}
else if (rimGeoMechCase)
{