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

Janitor : Use std::clamp and remove obsolete includes of cvfMath

Browse Source
This commit is contained in:
Magne Sjaastad
2021-02-22 11:38:01 +01:00
parent 084835ce66
commit 1caac72715
34 changed files with 37 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationLibCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp
View File

@@ -82,8 +82,8 @@ void RimMultipleValveLocations::perforationIntervalUpdated()
{
double existingRangeStart = m_rangeStart();
double existingRangeEnd = m_rangeEnd();
m_rangeStart = cvf::Math::clamp( m_rangeStart(), perforationStartMD(), perforationEndMD() );
m_rangeEnd = cvf::Math::clamp( m_rangeEnd(), perforationStartMD(), perforationEndMD() );
m_rangeStart = std::clamp( m_rangeStart(), perforationStartMD(), perforationEndMD() );
m_rangeEnd = std::clamp( m_rangeEnd(), perforationStartMD(), perforationEndMD() );
if ( existingRangeStart != m_rangeStart() || existingRangeEnd != m_rangeEnd() )
{
computeRangesAndLocations();
@@ -318,8 +318,8 @@ void RimMultipleValveLocations::fieldChangedByUi( const caf::PdmFieldHandle* cha
changedField == &m_rangeValveSpacing )
{
recomputeLocations = true;
m_rangeStart = cvf::Math::clamp( m_rangeStart(), perforationStartMD(), perforationEndMD() );
m_rangeEnd = cvf::Math::clamp( m_rangeEnd(), perforationStartMD(), perforationEndMD() );
m_rangeStart = std::clamp( m_rangeStart(), perforationStartMD(), perforationEndMD() );
m_rangeEnd = std::clamp( m_rangeEnd(), perforationStartMD(), perforationEndMD() );
}
if ( changedField == &m_rangeValveSpacing )
@@ -331,13 +331,13 @@ void RimMultipleValveLocations::fieldChangedByUi( const caf::PdmFieldHandle* cha
if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
{
double minimumDistanceFeet = RiaEclipseUnitTools::meterToFeet( minimumDistanceMeter );
m_rangeValveSpacing = cvf::Math::clamp( m_rangeValveSpacing(),
m_rangeValveSpacing = std::clamp( m_rangeValveSpacing(),
minimumDistanceFeet,
std::max( m_rangeValveSpacing(), minimumDistanceFeet ) );
}
else
{
m_rangeValveSpacing = cvf::Math::clamp( m_rangeValveSpacing(),
m_rangeValveSpacing = std::clamp( m_rangeValveSpacing(),
minimumDistanceMeter,
std::max( m_rangeValveSpacing(), minimumDistanceMeter ) );
}