OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-15 01:42:13 -05: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 committed 2021-02-22 13:37:05 +01:00
1 parent 084835ce66
commit 1caac72715
34 files changed
+37 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp
-1
View File
@@ -24,7 +24,6 @@
#include "RimWellPath.h"
#include "cafPdmUiDoubleSliderEditor.h"
#include "cvfMath.h"
CAF_PDM_SOURCE_INIT( Rim3dWellLogCurveCollection, "Rim3dWellLogCurveCollection" );
ApplicationLibCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp
+6 -6
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 ) );
}
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ void RimWellPathValve::perforationIntervalUpdated()
this->firstAncestorOrThisOfType( perfInterval );
double startMD = perfInterval->startMD();
double endMD = perfInterval->endMD();
m_measuredDepth = cvf::Math::clamp( m_measuredDepth(), std::min( startMD, endMD ), std::max( startMD, endMD ) );
m_measuredDepth = std::clamp( m_measuredDepth(), std::min( startMD, endMD ), std::max( startMD, endMD ) );
}
else if ( componentType() == RiaDefines::WellPathComponentType::ICD ||
componentType() == RiaDefines::WellPathComponentType::AICD )