diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPressureCalculator.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPressureCalculator.cpp index 6c2f721381..eab933d61e 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPressureCalculator.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPressureCalculator.cpp @@ -336,7 +336,7 @@ bool RimStimPlanModelPressureCalculator::extractPressureDataFromTable( RiaDefine return true; } -std::set findUniqueValues( const std::vector& values ) +std::set RimStimPlanModelPressureCalculator::findUniqueValues( const std::vector& values ) { std::set res; for ( double v : values ) @@ -350,14 +350,10 @@ std::set findUniqueValues( const std::vector& values ) return res; } -typedef std::pair DepthValuePair; -typedef std::vector DepthValuePairVector; -typedef std::map EqlNumToDepthValuePairMap; - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void sortAndRemoveDuplicates( DepthValuePairVector& depthValuePairs ) +void RimStimPlanModelPressureCalculator::sortAndRemoveDuplicates( DepthValuePairVector& depthValuePairs ) { std::sort( depthValuePairs.begin(), depthValuePairs.end() ); depthValuePairs.erase( unique( depthValuePairs.begin(), depthValuePairs.end() ), depthValuePairs.end() ); @@ -366,9 +362,9 @@ void sortAndRemoveDuplicates( DepthValuePairVector& depthValuePairs ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool buildPressureTablesPerEqlNum( const RimStimPlanModel* stimPlanModel, - EqlNumToDepthValuePairMap& valuesPerEqlNum, - const std::set& presentEqlNums ) +bool RimStimPlanModelPressureCalculator::buildPressureTablesPerEqlNum( const RimStimPlanModel* stimPlanModel, + EqlNumToDepthValuePairMap& valuesPerEqlNum, + const std::set& presentEqlNums ) { RimEclipseCase* eclipseCase = stimPlanModel->eclipseCaseForProperty( RiaDefines::CurveProperty::EQLNUM ); @@ -429,7 +425,9 @@ bool buildPressureTablesPerEqlNum( const RimStimPlanModel* stimPlanModel, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double interpolatePressure( const DepthValuePairVector& depthValuePairs, double depth, int eqlNum ) +double RimStimPlanModelPressureCalculator::interpolatePressure( const DepthValuePairVector& depthValuePairs, + double depth, + int eqlNum ) { std::vector depths; for ( auto dvp : depthValuePairs ) diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPressureCalculator.h b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPressureCalculator.h index 9096416ebb..d545ec590e 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPressureCalculator.h +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPressureCalculator.h @@ -63,4 +63,17 @@ protected: const std::vector& measuredDepthValues, const std::vector& tvDepthValues, std::vector& values ) const; + + typedef std::pair DepthValuePair; + typedef std::vector DepthValuePairVector; + typedef std::map EqlNumToDepthValuePairMap; + + static void sortAndRemoveDuplicates( DepthValuePairVector& depthValuePairs ); + static bool buildPressureTablesPerEqlNum( const RimStimPlanModel* stimPlanModel, + EqlNumToDepthValuePairMap& valuesPerEqlNum, + const std::set& presentEqlNums ); + + static std::set findUniqueValues( const std::vector& values ); + + static double interpolatePressure( const DepthValuePairVector& depthValuePairs, double depth, int eqlNum ); };