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
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 ) )
{