OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change API for PdmObjectHandle and PdmFieldHandle

Browse Source 
* Refactor interface to PdmObjectHandle and PdmFieldHandle
Return objects instead of passing in structures as parameters

* Add nodiscard to several functions
* Remove redundant this->
* Rename to ptrReferencedObjectsByType
This commit is contained in:
Magne Sjaastad
2023-05-12 21:41:34 +02:00
committed by GitHub
parent 37e29a0f68
commit 0c90f67dcc
510 changed files with 1651 additions and 3111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/ReservoirDataModel/RigFishbonesGeometry.cpp
+1 -2
View File
@@ -69,8 +69,7 @@ void RigFisbonesGeometry::computeLateralPositionAndOrientation( size_t subI
cvf::Vec3d* startDirection,
cvf::Mat4d* buildAngleMatrix ) const
{
RimWellPath* wellPath = nullptr;
m_fishbonesSub->firstAncestorOrThisOfTypeAsserted( wellPath );
auto wellPath = m_fishbonesSub->firstAncestorOrThisOfTypeAsserted<RimWellPath>();
auto wellPathGeometry = wellPath->wellPathGeometry();
if ( !wellPathGeometry ) return;
ApplicationLibCode/ReservoirDataModel/RigFlowDiagResults.cpp
+3 -6
View File
@@ -80,8 +80,7 @@ const std::vector<double>* RigFlowDiagResults::resultValues( const RigFlowDiagRe
//--------------------------------------------------------------------------------------------------
const RigActiveCellInfo* RigFlowDiagResults::activeCellInfo( const RigFlowDiagResultAddress& resVarAddr )
{
RimEclipseResultCase* eclCase;
m_flowDiagSolution->firstAncestorOrThisOfType( eclCase );
auto eclCase = m_flowDiagSolution->firstAncestorOrThisOfType<RimEclipseResultCase>();
return eclCase->eclipseCaseData()->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL ); // Todo: base on
// resVarAddr member
@@ -162,8 +161,7 @@ std::vector<double>* RigFlowDiagResults::findScalarResultFrame( const RigFlowDia
//--------------------------------------------------------------------------------------------------
RigFlowDiagSolverInterface* RigFlowDiagResults::solverInterface()
{
RimEclipseResultCase* eclCase;
m_flowDiagSolution->firstAncestorOrThisOfType( eclCase );
auto eclCase = m_flowDiagSolution->firstAncestorOrThisOfType<RimEclipseResultCase>();
return eclCase->flowDiagSolverInterface();
}
@@ -422,8 +420,7 @@ std::vector<double>* RigFlowDiagResults::calculateCommunicationResult( const Rig
//--------------------------------------------------------------------------------------------------
void RigFlowDiagResults::calculateNumFloodedPV( const RigFlowDiagResultAddress& resVarAddr )
{
RimEclipseCase* eclipseCase;
m_flowDiagSolution->firstAncestorOrThisOfTypeAsserted( eclipseCase );
auto eclipseCase = m_flowDiagSolution->firstAncestorOrThisOfTypeAsserted<RimEclipseCase>();
std::vector<QString> tracerNames;
for ( const std::string& tracerName : resVarAddr.selectedTracerNames )
{
ApplicationLibCode/ReservoirDataModel/RigFlowDiagStatCalc.cpp
+1 -2
View File
@@ -117,8 +117,7 @@ size_t RigFlowDiagStatCalc::timeStepCount()
//--------------------------------------------------------------------------------------------------
void RigFlowDiagStatCalc::mobileVolumeWeightedMean( size_t timeStepIndex, double& mean )
{
RimEclipseResultCase* eclCase = nullptr;
m_resultsData->flowDiagSolution()->firstAncestorOrThisOfType( eclCase );
auto eclCase = m_resultsData->flowDiagSolution()->firstAncestorOrThisOfType<RimEclipseResultCase>();
if ( !eclCase ) return;
RigCaseCellResultsData* caseCellResultsData = eclCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
ApplicationLibCode/ReservoirDataModel/RigFlowDiagVisibleCellsStatCalc.cpp
+1 -2
View File
@@ -107,8 +107,7 @@ size_t RigFlowDiagVisibleCellsStatCalc::timeStepCount()
//--------------------------------------------------------------------------------------------------
void RigFlowDiagVisibleCellsStatCalc::mobileVolumeWeightedMean( size_t timeStepIndex, double& result )
{
RimEclipseResultCase* eclCase = nullptr;
m_resultsData->flowDiagSolution()->firstAncestorOrThisOfType( eclCase );
auto eclCase = m_resultsData->flowDiagSolution()->firstAncestorOrThisOfType<RimEclipseResultCase>();
if ( !eclCase ) return;
RigCaseCellResultsData* caseCellResultsData = eclCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
ApplicationLibCode/ReservoirDataModel/RigMswCenterLineCalculator.cpp
+1 -5
View File
@@ -44,11 +44,7 @@ std::vector<SimulationWellCellBranch> RigMswCenterLineCalculator::calculateMswWe
const RigSimWellData* simWellData = rimWell->simWellData();
if ( !simWellData ) return {};
RimEclipseView* eclipseView;
rimWell->firstAncestorOrThisOfType( eclipseView );
CVF_ASSERT( eclipseView );
auto eclipseView = rimWell->firstAncestorOrThisOfTypeAsserted<RimEclipseView>();
if ( eclipseView->eclipseCase() && eclipseView->eclipseCase()->eclipseCaseData() )
{
auto eclipseCaseData = eclipseView->eclipseCase()->eclipseCaseData();
ApplicationLibCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp
+1 -4
View File
@@ -127,10 +127,7 @@ void RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline( R
const RigSimWellData* simWellData = rimWell->simWellData();
if ( !simWellData ) return;
RimEclipseView* eclipseView;
rimWell->firstAncestorOrThisOfType( eclipseView );
CVF_ASSERT( eclipseView );
auto eclipseView = rimWell->firstAncestorOrThisOfTypeAsserted<RimEclipseView>();
RigEclipseCaseData* eclipseCaseData = eclipseView->eclipseCase()->eclipseCaseData();
bool isAutoDetectBranches = eclipseView->wellCollection()->isAutoDetectingBranches();