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

Move RigCurveDataTools and RigTimeHistoryCurveMerger to Application/Tools plus rename

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-06-08 15:10:45 +02:00
parent 68f965f6bb
commit eebd8bef2d
19 changed files with 528 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
View File

@@ -45,7 +45,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RigWellLogCurveData.h
${CMAKE_CURRENT_LIST_DIR}/RigWellLogExtractionTools.h
${CMAKE_CURRENT_LIST_DIR}/RigHexIntersectionTools.h
${CMAKE_CURRENT_LIST_DIR}/RigTimeHistoryResultAccessor.h
${CMAKE_CURRENT_LIST_DIR}/RigCurveDataTools.h
${CMAKE_CURRENT_LIST_DIR}/RigObservedData.h
${CMAKE_CURRENT_LIST_DIR}/RigLasFileExporter.h
${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCoordsAndMD.h
@@ -58,7 +57,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RigTofAccumulatedPhaseFractionsCalculator.h
${CMAKE_CURRENT_LIST_DIR}/RigTransmissibilityEquations.h
${CMAKE_CURRENT_LIST_DIR}/RigNumberOfFloodedPoreVolumesCalculator.h
${CMAKE_CURRENT_LIST_DIR}/RigWeightedMeanCalc.h
${CMAKE_CURRENT_LIST_DIR}/RigTimeHistoryCurveMerger.h
${CMAKE_CURRENT_LIST_DIR}/RigWellPathFormations.h
${CMAKE_CURRENT_LIST_DIR}/RigStimPlanFractureDefinition.h
${CMAKE_CURRENT_LIST_DIR}/RigFractureGrid.h
@@ -111,7 +109,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RigEclipseMultiPropertyStatCalc.cpp
${CMAKE_CURRENT_LIST_DIR}/RigWellLogCurveData.cpp
${CMAKE_CURRENT_LIST_DIR}/RigHexIntersectionTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RigTimeHistoryResultAccessor.cpp
${CMAKE_CURRENT_LIST_DIR}/RigCurveDataTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RigObservedData.cpp
${CMAKE_CURRENT_LIST_DIR}/RigLasFileExporter.cpp
${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCoordsAndMD.cpp
@@ -124,7 +121,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RigTofAccumulatedPhaseFractionsCalculator.cpp
${CMAKE_CURRENT_LIST_DIR}/RigTransmissibilityEquations.cpp
${CMAKE_CURRENT_LIST_DIR}/RigNumberOfFloodedPoreVolumesCalculator.cpp
${CMAKE_CURRENT_LIST_DIR}/RigWeightedMeanCalc.cpp
${CMAKE_CURRENT_LIST_DIR}/RigTimeHistoryCurveMerger.cpp
${CMAKE_CURRENT_LIST_DIR}/RigWellPathFormations.cpp
${CMAKE_CURRENT_LIST_DIR}/RigStimPlanFractureDefinition.cpp
${CMAKE_CURRENT_LIST_DIR}/RigFractureGrid.cpp

16
ApplicationCode/ReservoirDataModel/RigWellLogCurveData.cpp
View File

@@ -19,7 +19,7 @@
#include "RigWellLogCurveData.h"
#include "RigCurveDataTools.h"
#include "RiaCurveDataTools.h"
#include "RiaEclipseUnitTools.h"
@@ -118,7 +118,7 @@ const std::vector<double>& RigWellLogCurveData::tvDepths() const
std::vector<double> RigWellLogCurveData::xPlotValues() const
{
std::vector<double> filteredValues;
RigCurveDataTools::getValuesByIntervals(m_xValues, m_intervalsOfContinousValidValues, &filteredValues);
RiaCurveDataTools::getValuesByIntervals(m_xValues, m_intervalsOfContinousValidValues, &filteredValues);
return filteredValues;
}
@@ -133,12 +133,12 @@ std::vector<double> RigWellLogCurveData::trueDepthPlotValues(RiaDefines::DepthUn
{
if(destinationDepthUnit == m_depthUnit)
{
RigCurveDataTools::getValuesByIntervals(m_tvDepths, m_intervalsOfContinousValidValues, &filteredValues);
RiaCurveDataTools::getValuesByIntervals(m_tvDepths, m_intervalsOfContinousValidValues, &filteredValues);
}
else
{
std::vector<double> convertedValues = convertDepthValues(destinationDepthUnit, m_tvDepths);
RigCurveDataTools::getValuesByIntervals(convertedValues, m_intervalsOfContinousValidValues, &filteredValues);
RiaCurveDataTools::getValuesByIntervals(convertedValues, m_intervalsOfContinousValidValues, &filteredValues);
}
}
@@ -154,12 +154,12 @@ std::vector<double> RigWellLogCurveData::measuredDepthPlotValues(RiaDefines::Dep
if(destinationDepthUnit == m_depthUnit)
{
RigCurveDataTools::getValuesByIntervals(m_measuredDepths, m_intervalsOfContinousValidValues, &filteredValues);
RiaCurveDataTools::getValuesByIntervals(m_measuredDepths, m_intervalsOfContinousValidValues, &filteredValues);
}
else
{
std::vector<double> convertedValues = convertDepthValues(destinationDepthUnit, m_measuredDepths);
RigCurveDataTools::getValuesByIntervals(convertedValues, m_intervalsOfContinousValidValues, &filteredValues);
RiaCurveDataTools::getValuesByIntervals(convertedValues, m_intervalsOfContinousValidValues, &filteredValues);
}
return filteredValues;
@@ -170,7 +170,7 @@ std::vector<double> RigWellLogCurveData::measuredDepthPlotValues(RiaDefines::Dep
//--------------------------------------------------------------------------------------------------
std::vector<std::pair<size_t, size_t>> RigWellLogCurveData::polylineStartStopIndices() const
{
return RigCurveDataTools::computePolyLineStartStopIndices(m_intervalsOfContinousValidValues);
return RiaCurveDataTools::computePolyLineStartStopIndices(m_intervalsOfContinousValidValues);
}
//--------------------------------------------------------------------------------------------------
@@ -246,7 +246,7 @@ cvf::ref<RigWellLogCurveData> RigWellLogCurveData::calculateResampledCurveData(d
//--------------------------------------------------------------------------------------------------
void RigWellLogCurveData::calculateIntervalsOfContinousValidValues()
{
std::vector<std::pair<size_t, size_t>> intervalsOfValidValues = RigCurveDataTools::calculateIntervalsOfValidValues(m_xValues, false);
std::vector<std::pair<size_t, size_t>> intervalsOfValidValues = RiaCurveDataTools::calculateIntervalsOfValidValues(m_xValues, false);
m_intervalsOfContinousValidValues.clear();