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

#5279 Formations : Add const and simplify access

Browse Source
This commit is contained in:
Magne Sjaastad
2020-01-03 09:59:38 +01:00
parent 5bcaed594b
commit afc9ace33e
12 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp
View File

@@ -1001,10 +1001,7 @@ void RimGridCrossPlotDataSet::updateLegendRange()
RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>( m_case() );
if ( eclipseCase )
{
RigFormationNames* formationNames = eclipseCase->eclipseCaseData()->activeFormationNames();
if ( formationNames )
{
const std::vector<QString>& categoryNames = formationNames->formationNames();
const std::vector<QString> categoryNames = eclipseCase->eclipseCaseData()->formationNames();
if ( !categoryNames.empty() )
{
legendConfig()->setNamedCategoriesInverse( categoryNames );
@@ -1012,7 +1009,6 @@ void RimGridCrossPlotDataSet::updateLegendRange()
}
}
}
}
else if ( m_grouping() == GROUP_BY_TIME )
{
QStringList timeStepNames = m_case->timeStepStrings();

11
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
View File

@@ -403,15 +403,10 @@ void RimEclipsePropertyFilter::computeResultValueRange()
if ( m_resultDefinition->resultType() == RiaDefines::FORMATION_NAMES )
{
CVF_ASSERT( parentContainer()->reservoirView()->eclipseCase()->eclipseCaseData() );
CVF_ASSERT(
parentContainer()->reservoirView()->eclipseCase()->eclipseCaseData()->activeFormationNames() );
const std::vector<QString>& fnVector = parentContainer()
->reservoirView()
->eclipseCase()
->eclipseCaseData()
->activeFormationNames()
->formationNames();
const std::vector<QString> fnVector =
parentContainer()->reservoirView()->eclipseCase()->eclipseCaseData()->formationNames();
setCategoryNames( fnVector );
}
else if ( m_resultDefinition->resultVariable() == RiaDefines::completionTypeResultName() )

4
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@@ -1882,14 +1882,14 @@ void RimEclipseResultDefinition::updateRangesForExplicitLegends( RimRegularLegen
{
if ( this->resultType() == RiaDefines::FORMATION_NAMES )
{
const std::vector<QString>& fnVector = eclipseCaseData->activeFormationNames()->formationNames();
std::vector<QString> fnVector = eclipseCaseData->formationNames();
legendConfigToUpdate->setNamedCategoriesInverse( fnVector );
}
else if ( this->resultType() == RiaDefines::ALLEN_DIAGRAMS )
{
if ( this->resultVariable() == RiaDefines::formationAllenResultName() )
{
const std::vector<QString>& fnVector = eclipseCaseData->activeFormationNames()->formationNames();
const std::vector<QString> fnVector = eclipseCaseData->formationNames();
std::vector<int> fnameIdxes;
for ( int i = static_cast<int>( fnVector.size() ); i > 0; --i )
fnameIdxes.push_back( i - 1 );

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -1252,7 +1252,7 @@ void RimEclipseView::onUpdateLegends()
}
else
{
const std::vector<QString>& fnVector = eclipseCase->activeFormationNames()->formationNames();
const std::vector<QString> fnVector = eclipseCase->formationNames();
cellEdgeResult()->legendConfig()->setNamedCategoriesInverse( fnVector );
}
}

5
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@@ -2027,10 +2027,7 @@ std::vector<QString> RimWellLogTrack::formationNamesVector( RimCase* rimCase )
if ( eclipseCase )
{
if ( eclipseCase->eclipseCaseData()->activeFormationNames() )
{
return eclipseCase->eclipseCaseData()->activeFormationNames()->formationNames();
}
return eclipseCase->eclipseCaseData()->formationNames();
}
else if ( geoMechCase )
{

2
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View File

@@ -2890,7 +2890,7 @@ void RigCaseCellResultsData::setActiveFormationNames( RigFormationNames* activeF
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigFormationNames* RigCaseCellResultsData::activeFormationNames()
const RigFormationNames* RigCaseCellResultsData::activeFormationNames() const
{
return m_activeFormationNamesData.p();
}

4
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h
View File

@@ -58,7 +58,7 @@ public:
const RifReaderInterface* readerInterface() const;
void setHdf5Filename( const QString& hdf5SourSimFilename );
void setActiveFormationNames( RigFormationNames* activeFormationNames );
RigFormationNames* activeFormationNames();
const RigFormationNames* activeFormationNames() const;
RigAllenDiagramData* allenDiagramData();
void setMainGrid( RigMainGrid* ownerGrid );
@@ -197,7 +197,7 @@ private:
private:
cvf::ref<RifReaderInterface> m_readerInterface;
cvf::ref<RigFormationNames> m_activeFormationNamesData;
cvf::cref<RigFormationNames> m_activeFormationNamesData;
cvf::ref<RigAllenDiagramData> m_allenDiagramData;
std::vector<std::vector<std::vector<double>>>

15
ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp
View File

@@ -727,11 +727,24 @@ void RigEclipseCaseData::setActiveFormationNamesAndUpdatePlots( RigFormationName
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigFormationNames* RigEclipseCaseData::activeFormationNames()
const RigFormationNames* RigEclipseCaseData::activeFormationNames() const
{
return m_matrixModelResults->activeFormationNames();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<QString> RigEclipseCaseData::formationNames() const
{
if ( activeFormationNames() )
{
return activeFormationNames()->formationNames();
}
return {};
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h
View File

@@ -91,7 +91,8 @@ public:
void setActiveFormationNames( RigFormationNames* activeFormationNames );
void setActiveFormationNamesAndUpdatePlots( RigFormationNames* activeFormationNames );
RigFormationNames* activeFormationNames();
const RigFormationNames* activeFormationNames() const;
const std::vector<QString> formationNames() const;
RigAllenDiagramData* allenDiagramData();
void setSimWellData( const cvf::Collection<RigSimWellData>& data );

4
ApplicationCode/ReservoirDataModel/RigEclipseCrossPlotDataExtractor.cpp
View File

@@ -47,8 +47,6 @@ RigEclipseCrossPlotResult
RigCaseCellResultsData* resultData = caseData->results( RiaDefines::MATRIX_MODEL );
if ( !resultData ) return result;
RigFormationNames* activeFormationNames = resultData->activeFormationNames();
const std::vector<std::vector<double>>* catValuesForAllSteps = nullptr;
if ( xAddress.isValid() && yAddress.isValid() )
@@ -136,6 +134,8 @@ RigEclipseCrossPlotResult
}
else if ( groupingType == GROUP_BY_FORMATION )
{
const RigFormationNames* activeFormationNames = resultData->activeFormationNames();
if ( activeFormationNames )
{
int category = 0;

2
ApplicationCode/ReservoirDataModel/RigFormationNames.h
View File

@@ -29,7 +29,7 @@ public:
RigFormationNames();
~RigFormationNames() override;
int formationIndexFromKLayerIdx( size_t Kidx )
int formationIndexFromKLayerIdx( size_t Kidx ) const
{
if ( Kidx >= m_nameIndexPrKLayer.size() ) return -1;
return m_nameIndexPrKLayer[Kidx];

13
ApplicationCode/UserInterface/RiuResultTextBuilder.cpp
View File

@@ -490,16 +490,15 @@ QString RiuResultTextBuilder::nncResultText()
eclipseCase->allenDiagramData()->formationIndexCombinationFromCategory(
( *nncValues )[m_nncIndex] );
RigFormationNames* fmNames = eclipseCase->activeFormationNames();
std::vector<QString> fmNames = eclipseCase->formationNames();
// clang-format off
if ( fmNames &&
fmIndexPair.first >= 0 &&
if ( fmIndexPair.first >= 0 &&
fmIndexPair.second >= 0 &&
fmNames->formationNames().size() > fmIndexPair.first &&
fmNames->formationNames().size() > fmIndexPair.second )
fmNames.size() > fmIndexPair.first &&
fmNames.size() > fmIndexPair.second )
{
resultValueText = fmNames->formationNames()[fmIndexPair.first] + " - " +
fmNames->formationNames()[fmIndexPair.second];
resultValueText = fmNames[fmIndexPair.first] + " - " +
fmNames[fmIndexPair.second];
}
// clang-format on
}