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

Rename measuredDepth and TVD methods in well log extractor code

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-09-04 11:40:21 +02:00
parent 12484bf1e9
commit 5a2ecf25c2
8 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp
View File

@@ -205,7 +205,7 @@ void Rim3dWellLogExtractionCurve::curveValuesAndMdsAtTimeStep(std::vector<double
if (eclExtractor.notNull() && eclipseCase) if (eclExtractor.notNull() && eclipseCase)
{ {
*measuredDepthValues = eclExtractor->measuredDepth(); *measuredDepthValues = eclExtractor->cellIntersectionMDs();
m_eclipseResultDefinition->loadResult(); m_eclipseResultDefinition->loadResult();
@@ -220,7 +220,7 @@ void Rim3dWellLogExtractionCurve::curveValuesAndMdsAtTimeStep(std::vector<double
} }
else if (geomExtractor.notNull()) else if (geomExtractor.notNull())
{ {
*measuredDepthValues = geomExtractor->measuredDepth(); *measuredDepthValues = geomExtractor->cellIntersectionMDs();
RimWellLogExtractionCurve::findAndLoadWbsParametersFromLasFiles(wellPath, geomExtractor.p()); RimWellLogExtractionCurve::findAndLoadWbsParametersFromLasFiles(wellPath, geomExtractor.p());

8
ApplicationCode/ProjectDataModel/RimPlotCurve.cpp
View File

@@ -102,13 +102,9 @@ RimPlotCurve::RimPlotCurve()
CAF_PDM_InitField(&m_curveThickness, "Thickness", 1, "Line Thickness", "", "", ""); CAF_PDM_InitField(&m_curveThickness, "Thickness", 1, "Line Thickness", "", "", "");
m_curveThickness.uiCapability()->setUiEditorTypeName(caf::PdmUiComboBoxEditor::uiEditorTypeName()); m_curveThickness.uiCapability()->setUiEditorTypeName(caf::PdmUiComboBoxEditor::uiEditorTypeName());
caf::AppEnum< RiuQwtPlotCurve::LineStyleEnum > lineStyle = RiuQwtPlotCurve::STYLE_SOLID;
CAF_PDM_InitField(&m_lineStyle, "LineStyle", lineStyle, "Line Style", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_curveInterpolation, "CurveInterpolation", "Interpolation", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_curveInterpolation, "CurveInterpolation", "Interpolation", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_lineStyle, "LineStyle", "Line Style", "", "", "");
caf::AppEnum< RiuQwtSymbol::PointSymbolEnum > pointSymbol = RiuQwtSymbol::SYMBOL_NONE; CAF_PDM_InitFieldNoDefault(&m_pointSymbol, "PointSymbol", "Symbol", "", "", "");
CAF_PDM_InitField(&m_pointSymbol, "PointSymbol", pointSymbol, "Symbol", "", "", "");
CAF_PDM_InitField(&m_symbolSkipPixelDistance, "SymbolSkipPxDist", 0.0f, "Symbol Skip Distance", "", "Minimum pixel distance between symbols", ""); CAF_PDM_InitField(&m_symbolSkipPixelDistance, "SymbolSkipPxDist", 0.0f, "Symbol Skip Distance", "", "Minimum pixel distance between symbols", "");

2
ApplicationCode/ProjectDataModel/RimPlotCurve.h
View File

@@ -60,7 +60,7 @@ public:
cvf::Color3f color() const { return m_curveColor; } cvf::Color3f color() const { return m_curveColor; }
void setLineStyle(RiuQwtPlotCurve::LineStyleEnum lineStyle); void setLineStyle(RiuQwtPlotCurve::LineStyleEnum lineStyle);
void setSymbol(RiuQwtSymbol::PointSymbolEnum symbolStyle); void setSymbol(RiuQwtSymbol::PointSymbolEnum symbolStyle);
RiuQwtSymbol::PointSymbolEnum symbol(); RiuQwtSymbol::PointSymbolEnum symbol();
void setSymbolSkipDistance(float distance); void setSymbolSkipDistance(float distance);
void setSymbolLabel(const QString& label); void setSymbolLabel(const QString& label);
void setSymbolSize(int sizeInPixels); void setSymbolSize(int sizeInPixels);

8
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@@ -370,8 +370,8 @@ void RimWellLogExtractionCurve::onLoadDataAndUpdate(bool updateParentPlot)
if (eclExtractor.notNull() && eclipseCase) if (eclExtractor.notNull() && eclipseCase)
{ {
measuredDepthValues = eclExtractor->measuredDepth(); measuredDepthValues = eclExtractor->cellIntersectionMDs();
tvDepthValues = eclExtractor->trueVerticalDepth(); tvDepthValues = eclExtractor->cellIntersectionTVDs();
m_eclipseResultDefinition->loadResult(); m_eclipseResultDefinition->loadResult();
@@ -396,8 +396,8 @@ void RimWellLogExtractionCurve::onLoadDataAndUpdate(bool updateParentPlot)
else if (geomExtractor.notNull()) // geomExtractor else if (geomExtractor.notNull()) // geomExtractor
{ {
measuredDepthValues = geomExtractor->measuredDepth(); measuredDepthValues = geomExtractor->cellIntersectionMDs();
tvDepthValues = geomExtractor->trueVerticalDepth(); tvDepthValues = geomExtractor->cellIntersectionTVDs();
findAndLoadWbsParametersFromLasFiles(m_wellPath(), geomExtractor.p()); findAndLoadWbsParametersFromLasFiles(m_wellPath(), geomExtractor.p());

2
ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp
View File

@@ -709,7 +709,7 @@ std::vector<double> RimWellLogRftCurve::measuredDepthValues()
if (!eclExtractor) return measuredDepthForCells; if (!eclExtractor) return measuredDepthForCells;
std::vector<double> measuredDepthForIntersections = eclExtractor->measuredDepth(); std::vector<double> measuredDepthForIntersections = eclExtractor->cellIntersectionMDs();
if (measuredDepthForIntersections.empty()) if (measuredDepthForIntersections.empty())
{ {

8
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@@ -1413,8 +1413,8 @@ CurveSamplingPointData RimWellLogTrack::curveSamplingPointData(RigEclipseWellLog
{ {
CurveSamplingPointData curveData; CurveSamplingPointData curveData;
curveData.md = extractor->measuredDepth(); curveData.md = extractor->cellIntersectionMDs();
curveData.tvd = extractor->trueVerticalDepth(); curveData.tvd = extractor->cellIntersectionTVDs();
extractor->curveData(resultAccessor, &curveData.data); extractor->curveData(resultAccessor, &curveData.data);
@@ -1428,8 +1428,8 @@ CurveSamplingPointData RimWellLogTrack::curveSamplingPointData(RigGeoMechWellLog
{ {
CurveSamplingPointData curveData; CurveSamplingPointData curveData;
curveData.md = extractor->measuredDepth(); curveData.md = extractor->cellIntersectionMDs();
curveData.tvd = extractor->trueVerticalDepth(); curveData.tvd = extractor->cellIntersectionTVDs();
extractor->curveData(resultAddress, 0, &curveData.data); extractor->curveData(resultAddress, 0, &curveData.data);
return curveData; return curveData;

24
ApplicationCode/ReservoirDataModel/RigWellLogExtractor.cpp
View File

@@ -40,6 +40,22 @@ RigWellLogExtractor::~RigWellLogExtractor()
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>& RigWellLogExtractor::cellIntersectionMDs()
{
return m_intersectionMeasuredDepths;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>& RigWellLogExtractor::cellIntersectionTVDs()
{
return m_intersectionTVDs;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -79,6 +95,14 @@ const std::vector<size_t>& RigWellLogExtractor::intersectedCellsGlobIdx()
return m_intersectedCellsGlobIdx; return m_intersectedCellsGlobIdx;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RigWellPath* RigWellLogExtractor::wellPathData()
{
return m_wellPath.p();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

7
ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h
View File

@@ -59,11 +59,11 @@ public:
RigWellLogExtractor(const RigWellPath* wellpath, const std::string& wellCaseErrorMsgName); RigWellLogExtractor(const RigWellPath* wellpath, const std::string& wellCaseErrorMsgName);
virtual ~RigWellLogExtractor(); virtual ~RigWellLogExtractor();
const std::vector<double>& measuredDepth() { return m_intersectionMeasuredDepths; } const std::vector<double>& cellIntersectionMDs();
const std::vector<double>& trueVerticalDepth() { return m_intersectionTVDs; } const std::vector<double>& cellIntersectionTVDs();
const std::vector<size_t>& intersectedCellsGlobIdx(); const std::vector<size_t>& intersectedCellsGlobIdx();
const RigWellPath* wellPathData() { return m_wellPath.p();} const RigWellPath* wellPathData();
std::vector<WellPathCellIntersectionInfo> cellIntersectionInfosAlongWellPath() const; std::vector<WellPathCellIntersectionInfo> cellIntersectionInfosAlongWellPath() const;
@@ -92,7 +92,6 @@ protected:
std::vector<double> m_intersectionMeasuredDepths; std::vector<double> m_intersectionMeasuredDepths;
std::vector<double> m_intersectionTVDs; std::vector<double> m_intersectionTVDs;
private:
std::string m_wellCaseErrorMsgName; std::string m_wellCaseErrorMsgName;
}; };