diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPressureCalculator.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPressureCalculator.cpp index 2b626c7f55..6c2f721381 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPressureCalculator.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPressureCalculator.cpp @@ -37,6 +37,7 @@ #include "RimStimPlanModel.h" #include "RimStimPlanModelCalculator.h" #include "RimStimPlanModelTemplate.h" +#include "RimStimPlanModelWellLogCalculator.h" #include @@ -362,24 +363,6 @@ void sortAndRemoveDuplicates( DepthValuePairVector& depthValuePairs ) depthValuePairs.erase( unique( depthValuePairs.begin(), depthValuePairs.end() ), depthValuePairs.end() ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -const std::vector& loadResults( RigEclipseCaseData* caseData, - RiaDefines::PorosityModelType porosityModel, - RiaDefines::ResultCatType resultType, - const QString& propertyName ) -{ - // TODO: is this always enough? - auto resultData = caseData->results( porosityModel ); - - int timeStepIndex = 0; - RigEclipseResultAddress resultAddress( resultType, propertyName ); - - resultData->ensureKnownResultLoaded( resultAddress ); - return caseData->results( porosityModel )->cellScalarResults( resultAddress, timeStepIndex ); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -397,9 +380,15 @@ bool buildPressureTablesPerEqlNum( const RimStimPlanModel* stimPlanModel, RiaDefines::PorosityModelType porosityModel = RiaDefines::PorosityModelType::MATRIX_MODEL; const std::vector& eqlNumValues = - loadResults( caseData, porosityModel, RiaDefines::ResultCatType::STATIC_NATIVE, "EQLNUM" ); + RimStimPlanModelWellLogCalculator::loadResults( caseData, + porosityModel, + RiaDefines::ResultCatType::STATIC_NATIVE, + "EQLNUM" ); const std::vector& pressureValues = - loadResults( caseData, porosityModel, RiaDefines::ResultCatType::DYNAMIC_NATIVE, "PRESSURE" ); + RimStimPlanModelWellLogCalculator::loadResults( caseData, + porosityModel, + RiaDefines::ResultCatType::DYNAMIC_NATIVE, + "PRESSURE" ); if ( eqlNumValues.size() != pressureValues.size() ) {