Move Rig well related things to subfolder and update include statements

2025-02-25 18:55:39 -06:00 · 2024-10-30 17:23:08 +01:00
parent 151128d829
commit da683bed9e
239 changed files with 555 additions and 526 deletions
--- a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp
@@ -18,18 +18,19 @@

 #include "Rim3dWellLogExtractionCurve.h"

-#include "RigWellLogLasFile.h"
-
 #include "RiaCurveDataTools.h"
 #include "RiaExtractionTools.h"
+
 #include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"
-#include "RigEclipseWellLogExtractor.h"
 #include "RigFemPartResultsCollection.h"
 #include "RigGeoMechCaseData.h"
-#include "RigGeoMechWellLogExtractor.h"
 #include "RigResultAccessorFactory.h"
-#include "RigWellPath.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigGeoMechWellLogExtractor.h"
+#include "Well/RigWellLogLasFile.h"
+#include "Well/RigWellPath.h"
+
 #include "Rim3dView.h"
 #include "RimCase.h"
 #include "RimEclipseCase.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp
@@ -18,7 +18,7 @@

 #include "Rim3dWellLogFileCurve.h"

-#include "RigWellLogLasFile.h"
+#include "Well/RigWellLogLasFile.h"

 #include "RimWellLogChannel.h"
 #include "RimWellLogLasFile.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogRftCurve.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogRftCurve.cpp
@@ -22,7 +22,7 @@

 #include "RifReaderEclipseRft.h"

-#include "RigWellLogCurveData.h"
+#include "Well/RigWellLogCurveData.h"

 #include "RimEclipseResultCase.h"
 #include "RimRftTools.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp
@@ -47,7 +47,7 @@
 #include "RimWellPath.h"

 #include "RigFormationNames.h"
-#include "RigWellLogIndexDepthOffset.h"
+#include "Well/RigWellLogIndexDepthOffset.h"

 #include "RiuAbstractLegendFrame.h"
 #include "RiuDraggableOverlayFrame.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogStatistics.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogStatistics.cpp
@@ -26,8 +26,8 @@
 #include "RiaWellLogUnitTools.h"

 #include "RigStatisticsMath.h"
-#include "RigWellLogIndexDepthOffset.h"
-#include "RigWellLogLasFile.h"
+#include "Well/RigWellLogIndexDepthOffset.h"
+#include "Well/RigWellLogLasFile.h"

 #include "RimWellLogLasFile.h"

--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.h
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.h
@@ -20,7 +20,7 @@

 #include "RimWellLog.h"

-#include "RigOsduWellLogData.h"
+#include "Well/RigOsduWellLogData.h"

 #include "cafPdmChildArrayField.h"
 #include "cafPdmField.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLogDataLoader.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLogDataLoader.cpp
@@ -26,7 +26,7 @@

 #include "RifOsduWellLogReader.h"

-#include "RigWellLogData.h"
+#include "Well/RigWellLogData.h"

 #include "cafProgressInfo.h"

--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimRftTopologyCurve.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimRftTopologyCurve.cpp
@@ -24,7 +24,7 @@

 #include "RifReaderOpmRft.h"

-#include "RigWellLogCurveData.h"
+#include "Well/RigWellLogCurveData.h"

 #include "RimDepthTrackPlot.h"
 #include "RimProject.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCalculatedCurve.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCalculatedCurve.cpp
@@ -21,7 +21,7 @@
 #include "RiaDefines.h"
 #include "RiaLogging.h"

-#include "RigWellLogCurveData.h"
+#include "Well/RigWellLogCurveData.h"

 #include "RimMainPlotCollection.h"
 #include "RimOilField.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp
@@ -21,7 +21,7 @@
 #include "RiaFieldHandleTools.h"
 #include "RiaLogging.h"

-#include "RigWellLogCsvFile.h"
+#include "Well/RigWellLogCsvFile.h"

 #include "RimFileWellPath.h"
 #include "RimTools.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.h
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.h
@@ -21,7 +21,7 @@

 #include "RimWellLogFile.h"

-#include "RigWellLogCsvFile.h"
+#include "Well/RigWellLogCsvFile.h"

 #include "cafPdmField.h"
 #include "cafPdmObject.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurve.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurve.cpp
@@ -23,7 +23,7 @@
 #include "RiaCurveDataTools.h"
 #include "RiaPlotDefines.h"

-#include "RigWellLogCurveData.h"
+#include "Well/RigWellLogCurveData.h"

 #include "RimDepthTrackPlot.h"
 #include "RimMainPlotCollection.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp
@@ -28,18 +28,18 @@
 #include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"
 #include "RigEclipseResultAddress.h"
-#include "RigEclipseWellLogExtractor.h"
 #include "RigFemPartCollection.h"
 #include "RigFemPartResultsCollection.h"
 #include "RigGeoMechCaseData.h"
-#include "RigGeoMechWellLogExtractor.h"
 #include "RigResultAccessorFactory.h"
-#include "RigSimWellData.h"
-#include "RigSimulationWellCenterLineCalculator.h"
-#include "RigSimulationWellCoordsAndMD.h"
-#include "RigWellLogCurveData.h"
-#include "RigWellLogIndexDepthOffset.h"
-#include "RigWellPath.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigGeoMechWellLogExtractor.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigSimulationWellCenterLineCalculator.h"
+#include "Well/RigSimulationWellCoordsAndMD.h"
+#include "Well/RigWellLogCurveData.h"
+#include "Well/RigWellLogIndexDepthOffset.h"
+#include "Well/RigWellPath.h"

 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileDataLoader.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileDataLoader.cpp
@@ -21,7 +21,7 @@
 #include "RiaLogging.h"
 #include "RimWellLogFile.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "cafProgressInfo.h"

--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp
@@ -26,7 +26,7 @@
 #include "RiaFieldHandleTools.h"
 #include "RiaQDateTimeTools.h"

-#include "RigWellLogLasFile.h"
+#include "Well/RigWellLogLasFile.h"

 #include "RimFileWellPath.h"
 #include "RimTools.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.h
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.h
@@ -21,7 +21,8 @@

 #include "RimWellLogFile.h"

-#include "RigWellLogLasFile.h"
+#include "Well/RigWellLogLasFile.h"
+
 #include "cafPdmChildArrayField.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.cpp
@@ -24,9 +24,9 @@

 #include "RiaQDateTimeTools.h"
 #include "RiaResultNames.h"
-#include "RigWellLogCurveData.h"
-#include "RigWellLogIndexDepthOffset.h"
-#include "RigWellPath.h"
+#include "Well/RigWellLogCurveData.h"
+#include "Well/RigWellLogIndexDepthOffset.h"
+#include "Well/RigWellPath.h"

 #include "RimProject.h"
 #include "RimTools.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlot.cpp
@@ -19,8 +19,8 @@

 #include "RimWellLogPlot.h"

-#include "RigWellLogCurveData.h"
-#include "RigWellPath.h"
+#include "Well/RigWellLogCurveData.h"
+#include "Well/RigWellPath.h"

 #include "RimEclipseCase.h"
 #include "RimGeoMechCase.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlotCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlotCollection.cpp
@@ -23,9 +23,9 @@

 #include "RiuPlotMainWindow.h"

-#include "RigEclipseWellLogExtractor.h"
 #include "RigGeoMechCaseData.h"
-#include "RigGeoMechWellLogExtractor.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigGeoMechWellLogExtractor.h"

 #include "RimEclipseCase.h"
 #include "RimGeoMechCase.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp
@@ -36,12 +36,12 @@
 #include "RifReaderOpmRft.h"

 #include "RigEclipseCaseData.h"
-#include "RigEclipseWellLogExtractor.h"
 #include "RigMainGrid.h"
-#include "RigWellLogCurveData.h"
-#include "RigWellPath.h"
-#include "RigWellPathGeometryTools.h"
-#include "RigWellPathIntersectionTools.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigWellLogCurveData.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellPathGeometryTools.h"
+#include "Well/RigWellPathIntersectionTools.h"

 #include "RimDepthTrackPlot.h"
 #include "RimEclipseResultCase.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp
@@ -30,20 +30,20 @@

 #include "RigEclipseCaseData.h"
 #include "RigEclipseResultAddress.h"
-#include "RigEclipseWellLogExtractor.h"
 #include "RigFemPartResultsCollection.h"
 #include "RigFemResultAddress.h"
 #include "RigFormationNames.h"
 #include "RigGeoMechCaseData.h"
-#include "RigGeoMechWellLogExtractor.h"
 #include "RigResultAccessorFactory.h"
-#include "RigSimWellData.h"
-#include "RigSimulationWellCenterLineCalculator.h"
-#include "RigSimulationWellCoordsAndMD.h"
 #include "RigStatisticsCalculator.h"
-#include "RigWellLogCurveData.h"
-#include "RigWellPath.h"
-#include "RigWellPathFormations.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigGeoMechWellLogExtractor.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigSimulationWellCenterLineCalculator.h"
+#include "Well/RigSimulationWellCoordsAndMD.h"
+#include "Well/RigWellLogCurveData.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellPathFormations.h"

 #include "RimCase.h"
 #include "RimColorLegend.h"
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h
@@ -22,7 +22,8 @@
 #include "RimWellLogPlot.h"

 #include "RiaPlotDefines.h"
-#include "RigWellPathFormations.h"
+
+#include "Well/RigWellPathFormations.h"

 #include "RimPlot.h"