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

clang-format: Set column width to 140

Browse Source 
* Set column width to 140
* Use c++20
* Remove redundant virtual
This commit is contained in:
Magne Sjaastad
2023-02-26 10:48:40 +01:00
committed by GitHub
parent 8768e186d8
commit f8c5cf389f
1535 changed files with 10456 additions and 19398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ApplicationLibCode/ProjectDataModel/RimHistogramCalculator.cpp
View File

@@ -134,9 +134,8 @@ RigHistogramData RimHistogramCalculator::histogramData( RimGeoMechContourMapView
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigHistogramData RimHistogramCalculator::histogramData( RimEclipseView* eclipseView,
StatisticsCellRangeType cellRange,
StatisticsTimeRangeType timeRange )
RigHistogramData
RimHistogramCalculator::histogramData( RimEclipseView* eclipseView, StatisticsCellRangeType cellRange, StatisticsTimeRangeType timeRange )
{
if ( eclipseView )
{
@@ -306,9 +305,8 @@ RigHistogramData RimHistogramCalculator::histogramData( RimEclipseView*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigHistogramData RimHistogramCalculator::histogramData( RimGeoMechView* geoMechView,
StatisticsCellRangeType cellRange,
StatisticsTimeRangeType timeRange )
RigHistogramData
RimHistogramCalculator::histogramData( RimGeoMechView* geoMechView, StatisticsCellRangeType cellRange, StatisticsTimeRangeType timeRange )
{
RigHistogramData histData;
@@ -336,20 +334,11 @@ RigHistogramData RimHistogramCalculator::histogramData( RimGeoMechView*
{
auto [timeStepIdx, frameIdx] = geoMechView->currentStepAndDataFrame();
caseData->femPartResults()->meanScalarValue( resAddress, timeStepIdx, frameIdx, &histData.mean );
caseData->femPartResults()->minMaxScalarValues( resAddress,
timeStepIdx,
frameIdx,
&histData.min,
&histData.max );
caseData->femPartResults()->p10p90ScalarValues( resAddress,
timeStepIdx,
frameIdx,
&histData.p10,
&histData.p90 );
caseData->femPartResults()->minMaxScalarValues( resAddress, timeStepIdx, frameIdx, &histData.min, &histData.max );
caseData->femPartResults()->p10p90ScalarValues( resAddress, timeStepIdx, frameIdx, &histData.p10, &histData.p90 );
caseData->femPartResults()->sumScalarValue( resAddress, timeStepIdx, frameIdx, &histData.sum );
histData.histogram =
caseData->femPartResults()->scalarValuesHistogram( resAddress, timeStepIdx, frameIdx );
histData.histogram = caseData->femPartResults()->scalarValuesHistogram( resAddress, timeStepIdx, frameIdx );
}
}
else if ( cellRange == StatisticsCellRangeType::VISIBLE_CELLS )
@@ -393,7 +382,7 @@ void RimHistogramCalculator::updateVisCellStatsIfNeeded( RimGeoMechView* geoMech
if ( geoMechView )
{
RigFemResultAddress resAddress = geoMechView->cellResultResultDefinition()->resultAddress();
calc = new RigFemNativeVisibleCellsStatCalc( geoMechView->geoMechCase()->geoMechData(),
calc = new RigFemNativeVisibleCellsStatCalc( geoMechView->geoMechCase()->geoMechData(),
resAddress,
geoMechView->currentTotalCellVisibility().p() );
}
@@ -405,8 +394,7 @@ void RimHistogramCalculator::updateVisCellStatsIfNeeded( RimGeoMechView* geoMech
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimHistogramCalculator::updateVisCellStatsIfNeeded( RimEclipseView* eclipseView,
RimEclipseResultDefinition* eclResultDefinition )
void RimHistogramCalculator::updateVisCellStatsIfNeeded( RimEclipseView* eclipseView, RimEclipseResultDefinition* eclResultDefinition )
{
CVF_ASSERT( eclipseView );
CVF_ASSERT( eclResultDefinition );
@@ -485,8 +473,7 @@ std::vector<RigEclipseResultAddress> RimHistogramCalculator::sourcesForMultiProp
{ RiaResultNames::combinedRiAreaNormTranResultName(),
{ RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riAreaNormTranXResultName() ),
RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riAreaNormTranYResultName() ),
RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
RiaResultNames::riAreaNormTranZResultName() ) } },
RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riAreaNormTranZResultName() ) } },
{ RiaResultNames::combinedWaterFluxResultName(),
{ RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "FLRWATI+" ),
RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "FLRWATJ+" ),