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

#2763 Use std::min and std::max instead of CVF_MAX and CVF_MIN

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-08-31 15:52:36 +02:00 committed by Magne Sjaastad
parent a114309776
commit a6ddf7e6c4
9 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@ -1819,12 +1819,12 @@ void RifEclipseInputFileTools::readFaults( QFile& data,
// Adjust from 1-based to 0-based cell indices
// Guard against invalid cell ranges by limiting lowest possible range value to zero
cvf::CellRange cellrange( CVF_MAX( i1 - 1, 0 ),
CVF_MAX( j1 - 1, 0 ),
CVF_MAX( k1 - 1, 0 ),
CVF_MAX( i2 - 1, 0 ),
CVF_MAX( j2 - 1, 0 ),
CVF_MAX( k2 - 1, 0 ) );
cvf::CellRange cellrange( std::max( i1 - 1, 0 ),
std::max( j1 - 1, 0 ),
std::max( k1 - 1, 0 ),
std::max( i2 - 1, 0 ),
std::max( j2 - 1, 0 ),
std::max( k2 - 1, 0 ) );
if ( !( fault && fault->name() == faultName ) )
{

12
ApplicationCode/ProjectDataModel/RimBoxIntersection.cpp
View File

@ -289,7 +289,7 @@ void RimBoxIntersection::fieldChangedByUi( const caf::PdmFieldHandle* changedFie
}
else
{
m_minXCoord = CVF_MIN( m_maxXCoord, m_minXCoord );
m_minXCoord = std::min( m_maxXCoord, m_minXCoord );
}
}
else if ( changedField == &m_minYCoord )
@ -300,7 +300,7 @@ void RimBoxIntersection::fieldChangedByUi( const caf::PdmFieldHandle* changedFie
}
else
{
m_minYCoord = CVF_MIN( m_maxYCoord, m_minYCoord );
m_minYCoord = std::min( m_maxYCoord, m_minYCoord );
}
}
else if ( changedField == &m_minDepth )
@ -311,20 +311,20 @@ void RimBoxIntersection::fieldChangedByUi( const caf::PdmFieldHandle* changedFie
}
else
{
m_minDepth = CVF_MIN( m_maxDepth, m_minDepth );
m_minDepth = std::min( m_maxDepth, m_minDepth );
}
}
else if ( changedField == &m_maxXCoord )
{
m_maxXCoord = CVF_MAX( m_maxXCoord, m_minXCoord );
m_maxXCoord = std::max( m_maxXCoord, m_minXCoord );
}
else if ( changedField == &m_maxYCoord )
{
m_maxYCoord = CVF_MAX( m_maxYCoord, m_minYCoord );
m_maxYCoord = std::max( m_maxYCoord, m_minYCoord );
}
else if ( changedField == &m_maxDepth )
{
m_maxDepth = CVF_MAX( m_maxDepth, m_minDepth );
m_maxDepth = std::max( m_maxDepth, m_minDepth );
}
else if ( changedField == &m_show3DManipulator )
{

4
ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp
View File

@ -475,8 +475,8 @@ void RimCellEdgeColors::minMaxCellEdgeValues( double& min, double& max )
double cMin, cMax;
m_reservoirView->currentGridCellResults()->minMaxCellScalarValues( resultAddresses[faceIdx], cMin, cMax );
globalMin = CVF_MIN( globalMin, cMin );
globalMax = CVF_MAX( globalMax, cMax );
globalMin = std::min( globalMin, cMin );
globalMax = std::max( globalMax, cMax );
}
}
}

2
ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp
View File

@ -469,7 +469,7 @@ void RimRegularLegendConfig::updateLegend()
else
{
// For linear mapping, use the max value as reference for num valid digits
double absRange = CVF_MAX( cvf::Math::abs( adjustedMax ), cvf::Math::abs( adjustedMin ) );
double absRange = std::max( cvf::Math::abs( adjustedMax ), cvf::Math::abs( adjustedMin ) );
decadesInRange = log10( absRange );
}

2
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View File

@ -2112,7 +2112,7 @@ void RigCaseCellResultsData::computeRiTransComponent( const QString& riTransComp
if ( hasNTGResults )
{
size_t ntgResultValueCount = m_cellScalarResults[ntgResultIdx][0].size();
resultValueCount = CVF_MIN( permxResultValueCount, ntgResultValueCount );
resultValueCount = std::min( permxResultValueCount, ntgResultValueCount );
}
// Get all the actual result values

30
ApplicationCode/ReservoirDataModel/RigCaseToCaseRangeFilterMapper.cpp
View File

@ -115,9 +115,9 @@ void RigCaseToCaseRangeFilterMapper::convertRangeFilter( const RimCellRangeFilte
maxJIndex = femPart->getOrCreateStructGrid()->cellCountJ() - 1;
maxKIndex = femPart->getOrCreateStructGrid()->cellCountK() - 1;
}
src.EndI = CVF_MIN( src.EndI, maxIIndex );
src.EndJ = CVF_MIN( src.EndJ, maxJIndex );
src.EndK = CVF_MIN( src.EndK, maxKIndex );
src.EndI = std::min( src.EndI, maxIIndex );
src.EndJ = std::min( src.EndJ, maxJIndex );
src.EndK = std::min( src.EndK, maxKIndex );
}
// When using femPart as source we need to clamp the fem srcRange filter
@ -137,12 +137,12 @@ void RigCaseToCaseRangeFilterMapper::convertRangeFilter( const RimCellRangeFilte
convertRangeFilterEndPoints( eclMaxMin, eclExtInFem, eclGrid, femPart, true );
src.StartI = CVF_MAX( src.StartI, eclExtInFem.StartI );
src.StartJ = CVF_MAX( src.StartJ, eclExtInFem.StartJ );
src.StartK = CVF_MAX( src.StartK, eclExtInFem.StartK );
src.EndI = CVF_MIN( src.EndI, eclExtInFem.EndI );
src.EndJ = CVF_MIN( src.EndJ, eclExtInFem.EndJ );
src.EndK = CVF_MIN( src.EndK, eclExtInFem.EndK );
src.StartI = std::max( src.StartI, eclExtInFem.StartI );
src.StartJ = std::max( src.StartJ, eclExtInFem.StartJ );
src.StartK = std::max( src.StartK, eclExtInFem.StartK );
src.EndI = std::min( src.EndI, eclExtInFem.EndI );
src.EndJ = std::min( src.EndJ, eclExtInFem.EndJ );
src.EndK = std::min( src.EndK, eclExtInFem.EndK );
}
RigRangeEndPoints dst;
@ -270,12 +270,12 @@ void RigCaseToCaseRangeFilterMapper::convertRangeFilterEndPoints( const RigRange
if ( foundExactMatch )
{
// Populate dst range filter from the diagonal that matches exact
dst.StartI = CVF_MIN( rangeFilterMatches[cornerIdx].ijk[0], rangeFilterMatches[diagIdx].ijk[0] );
dst.StartJ = CVF_MIN( rangeFilterMatches[cornerIdx].ijk[1], rangeFilterMatches[diagIdx].ijk[1] );
dst.StartK = CVF_MIN( rangeFilterMatches[cornerIdx].ijk[2], rangeFilterMatches[diagIdx].ijk[2] );
dst.EndI = CVF_MAX( rangeFilterMatches[cornerIdx].ijk[0], rangeFilterMatches[diagIdx].ijk[0] );
dst.EndJ = CVF_MAX( rangeFilterMatches[cornerIdx].ijk[1], rangeFilterMatches[diagIdx].ijk[1] );
dst.EndK = CVF_MAX( rangeFilterMatches[cornerIdx].ijk[2], rangeFilterMatches[diagIdx].ijk[2] );
dst.StartI = std::min( rangeFilterMatches[cornerIdx].ijk[0], rangeFilterMatches[diagIdx].ijk[0] );
dst.StartJ = std::min( rangeFilterMatches[cornerIdx].ijk[1], rangeFilterMatches[diagIdx].ijk[1] );
dst.StartK = std::min( rangeFilterMatches[cornerIdx].ijk[2], rangeFilterMatches[diagIdx].ijk[2] );
dst.EndI = std::max( rangeFilterMatches[cornerIdx].ijk[0], rangeFilterMatches[diagIdx].ijk[0] );
dst.EndJ = std::max( rangeFilterMatches[cornerIdx].ijk[1], rangeFilterMatches[diagIdx].ijk[1] );
dst.EndK = std::max( rangeFilterMatches[cornerIdx].ijk[2], rangeFilterMatches[diagIdx].ijk[2] );
}
else
{

2
ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
View File

@ -409,7 +409,7 @@ void RigReservoirBuilderMock::addWellData( RigEclipseCaseData* eclipseCase, RigG
wellCells.m_wellHead.m_gridCellIndex = grid->cellIndexFromIJK( 1, 0, 0 );
// Connections
// int connectionCount = CVF_MIN(dim.x(), CVF_MIN(dim.y(), dim.z())) - 2;
// int connectionCount = std::min(dim.x(), std::min(dim.y(), dim.z())) - 2;
size_t connectionCount = dim.z() - 2;
if ( connectionCount > 0 )
{

2
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@ -414,7 +414,7 @@ void RiuViewer::paintOverlayItems( QPainter* painter )
bool showAnimBar = false;
if ( isAnimationActive() && frameCount() > 1 ) showAnimBar = true;
if ( m_showInfoText ) columnWidth = CVF_MAX( columnWidth, m_infoLabel->sizeHint().width() );
if ( m_showInfoText ) columnWidth = std::max( columnWidth, m_infoLabel->sizeHint().width() );
int columnPos = this->width() - columnWidth - margin - edgeAxisFrameBorderWidth;

6
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -375,17 +375,17 @@ void RiuViewerCommands::displayContextMenu( QMouseEvent* event )
QVariantList iSliceList;
iSliceList.push_back( 0 );
iSliceList.push_back( CVF_MAX( static_cast<int>( i + 1 ), 1 ) );
iSliceList.push_back( std::max( static_cast<int>( i + 1 ), 1 ) );
iSliceList.push_back( static_cast<int>( m_currentGridIdx ) );
QVariantList jSliceList;
jSliceList.push_back( 1 );
jSliceList.push_back( CVF_MAX( static_cast<int>( j + 1 ), 1 ) );
jSliceList.push_back( std::max( static_cast<int>( j + 1 ), 1 ) );
jSliceList.push_back( static_cast<int>( m_currentGridIdx ) );
QVariantList kSliceList;
kSliceList.push_back( 2 );
kSliceList.push_back( CVF_MAX( static_cast<int>( k + 1 ), 1 ) );
kSliceList.push_back( std::max( static_cast<int>( k + 1 ), 1 ) );
kSliceList.push_back( static_cast<int>( m_currentGridIdx ) );
menuBuilder.subMenuStart( "Range Filter Slice", QIcon( ":/CellFilter_Range.png" ) );