Move Rig well related things to subfolder and update include statements

ApplicationLibCode/ReservoirDataModel/CMakeLists_files.cmake

@@ -1,215 +1,171 @@
 set(SOURCE_GROUP_HEADER_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/RigActiveCellInfo.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigCell.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseCaseData.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseCaseDataTools.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigGridBase.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigGridManager.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigCellGeometryTools.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigResultModifier.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigResultModifierFactory.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigFormationNames.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigAllanDiagramData.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResultAddress.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResults.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResultFrames.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagSolverInterface.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagInterfaceTools.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagStatCalc.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagVisibleCellsStatCalc.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigAccWellFlowCalculator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogExtractor.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseWellLogExtractor.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigLocalGrid.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigMainGrid.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigActiveCellGrid.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigActiveCellLocalGrid.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigReservoirBuilderMock.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigCaseCellResultsData.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigSimWellData.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellPath.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigFault.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigNNCData.h
     ${CMAKE_CURRENT_LIST_DIR}/cvfGeometryTools.h
     ${CMAKE_CURRENT_LIST_DIR}/cvfGeometryTools.inl
-    ${CMAKE_CURRENT_LIST_DIR}/RigPipeInCellEvaluator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseNativeStatCalc.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseNativeVisibleCellsStatCalc.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseMultiPropertyStatCalc.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogCurveData.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogExtractionTools.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigHexIntersectionTools.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigLasFileExporter.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCoordsAndMD.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigFishbonesGeometry.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigTesselatorTools.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigCellGeometryTools.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathIntersectionTools.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseResultInfo.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseResultAddress.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigTofAccumulatedPhaseFractionsCalculator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigTofWellDistributionCalculator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigTransmissibilityEquations.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigNumberOfFloodedPoreVolumesCalculator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWeightedMeanCalc.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathFormations.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigStimPlanFractureDefinition.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigThermalFractureDefinition.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigThermalFractureResultUtil.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigThermalFractureResult.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigFractureGrid.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigFractureCell.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigConvexHull.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellResultPoint.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathGeometryTools.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathGeometryExporter.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigSurface.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigCaseRealizationParameters.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigGeoMechBoreHoleStressCalculator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigPolyLinesData.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigCaseCellResultCalculator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigGridCrossPlotCurveGrouping.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseCrossPlotDataExtractor.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigEquil.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWbsParameter.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseAllanFaultsStatCalc.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigCellFaceGeometryTools.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigNncConnection.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellDiskData.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigGocadData.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigElasticProperties.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigEnsembleFractureStatisticsCalculator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigHistogramData.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigVisibleCategoriesCalculator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigTracerPoint.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigTracer.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigStimPlanModelTools.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigSlice2D.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigEnsembleParameter.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceResampler.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceStatisticsCalculator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogIndexDepthOffset.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigTexturedSection.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigPressureDepthData.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigMswCenterLineCalculator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigActiveCellGrid.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigActiveCellInfo.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigActiveCellLocalGrid.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigAllanDiagramData.h
     ${CMAKE_CURRENT_LIST_DIR}/RigBasicPlane.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigGriddedPart3d.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigFaultReactivationModel.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigFaultReactivationModelGenerator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellAllocationOverTime.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellResultBranch.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellResultFrame.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigReservoirBuilder.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigVfpTables.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigOsduWellLogData.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellTargetCandidatesGenerator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigCaseCellResultCalculator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigCaseCellResultsData.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigCaseRealizationParameters.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigCell.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigCellFaceGeometryTools.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigCellGeometryTools.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigCellGeometryTools.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigContourMapCalculator.h
     ${CMAKE_CURRENT_LIST_DIR}/RigContourMapGrid.h
     ${CMAKE_CURRENT_LIST_DIR}/RigContourPolygonsTools.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigContourMapCalculator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigConvexHull.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseAllanFaultsStatCalc.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseCaseData.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseCaseDataTools.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseCrossPlotDataExtractor.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseMultiPropertyStatCalc.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseNativeStatCalc.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseNativeVisibleCellsStatCalc.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseResultAddress.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseResultInfo.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigElasticProperties.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigEnsembleFractureStatisticsCalculator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigEnsembleParameter.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigEquil.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigFault.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigFaultReactivationModel.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigFaultReactivationModelGenerator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagInterfaceTools.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResultAddress.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResultFrames.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResults.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagSolverInterface.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagStatCalc.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagVisibleCellsStatCalc.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigFormationNames.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigFractureCell.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigFractureGrid.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigGeoMechBoreHoleStressCalculator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigGocadData.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigGridBase.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigGridCrossPlotCurveGrouping.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigGriddedPart3d.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigGridManager.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigHexIntersectionTools.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigHistogramData.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigLasFileExporter.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigLocalGrid.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigMainGrid.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigNncConnection.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigNNCData.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigNumberOfFloodedPoreVolumesCalculator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigPolyLinesData.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigPressureDepthData.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigReservoirBuilder.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigReservoirBuilderMock.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigResultModifier.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigResultModifierFactory.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigSlice2D.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigStimPlanFractureDefinition.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigStimPlanModelTools.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigSurface.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceResampler.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceStatisticsCalculator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigTesselatorTools.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigTexturedSection.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigThermalFractureDefinition.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigThermalFractureResult.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigThermalFractureResultUtil.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigTofAccumulatedPhaseFractionsCalculator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigTofWellDistributionCalculator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigTracer.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigTracerPoint.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigTransmissibilityEquations.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigVfpTables.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigVisibleCategoriesCalculator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWbsParameter.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWeightedMeanCalc.h
 )
 
 set(SOURCE_GROUP_SOURCE_FILES
+    ${CMAKE_CURRENT_LIST_DIR}/cvfGeometryTools.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigActiveCellGrid.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigActiveCellInfo.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigActiveCellLocalGrid.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigAllanDiagramData.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigBasicPlane.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigCaseCellResultCalculator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigCaseCellResultsData.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigCaseRealizationParameters.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigCell.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigCellFaceGeometryTools.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigCellGeometryTools.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigCellGeometryTools.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigContourMapCalculator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigContourMapGrid.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigContourPolygonsTools.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigConvexHull.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigDeclineCurveCalculator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseAllanFaultsStatCalc.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigEclipseCaseData.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigEclipseCaseDataTools.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigGridBase.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigGridManager.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigCellGeometryTools.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigResultModifierFactory.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigFormationNames.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigAllanDiagramData.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseCrossPlotDataExtractor.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseMultiPropertyStatCalc.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseNativeStatCalc.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseNativeVisibleCellsStatCalc.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseResultInfo.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigElasticProperties.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigEnsembleFractureStatisticsCalculator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigEnsembleParameter.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigEquil.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigFault.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigFaultReactivationModel.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigFaultReactivationModelGenerator.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResultAddress.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResults.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResultFrames.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResults.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagSolverInterface.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagStatCalc.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagVisibleCellsStatCalc.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigAccWellFlowCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogExtractor.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseWellLogExtractor.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigFormationNames.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigFractureCell.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigFractureGrid.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigGeoMechBoreHoleStressCalculator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigGocadData.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigGridBase.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigGriddedPart3d.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigGridManager.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigHexIntersectionTools.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigHistogramData.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigLasFileExporter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigLocalGrid.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigMainGrid.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigActiveCellGrid.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigActiveCellLocalGrid.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigReservoirBuilderMock.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigCaseCellResultsData.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigSimWellData.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellPath.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigFault.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigNNCData.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/cvfGeometryTools.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseNativeStatCalc.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseNativeVisibleCellsStatCalc.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseMultiPropertyStatCalc.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogCurveData.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigHexIntersectionTools.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigLasFileExporter.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCoordsAndMD.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigFishbonesGeometry.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigTesselatorTools.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigCellGeometryTools.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathIntersectionTools.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseResultInfo.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigTofAccumulatedPhaseFractionsCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigTofWellDistributionCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigTransmissibilityEquations.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigNumberOfFloodedPoreVolumesCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWeightedMeanCalc.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathFormations.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigStimPlanFractureDefinition.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigThermalFractureDefinition.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigThermalFractureResultUtil.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigThermalFractureResult.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigFractureGrid.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigFractureCell.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigConvexHull.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellResultPoint.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathGeometryTools.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathGeometryExporter.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigSurface.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigCaseRealizationParameters.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigGeoMechBoreHoleStressCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigPolyLinesData.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigCaseCellResultCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseCrossPlotDataExtractor.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigEquil.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWbsParameter.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseAllanFaultsStatCalc.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigCellFaceGeometryTools.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigNncConnection.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellDiskData.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigGocadData.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigElasticProperties.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigEnsembleFractureStatisticsCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigHistogramData.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigVisibleCategoriesCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigTracerPoint.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigTracer.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigStimPlanModelTools.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigNNCData.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigNumberOfFloodedPoreVolumesCalculator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigPolyLinesData.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigPressureDepthData.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigReservoirBuilder.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigReservoirBuilderMock.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigResultModifierFactory.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigSlice2D.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigEnsembleParameter.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigStimPlanFractureDefinition.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigStimPlanModelTools.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigSurface.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceResampler.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceStatisticsCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogIndexDepthOffset.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigTesselatorTools.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigTexturedSection.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigPressureDepthData.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigMswCenterLineCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigBasicPlane.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigGriddedPart3d.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigFaultReactivationModel.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigFaultReactivationModelGenerator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellAllocationOverTime.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellResultBranch.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellResultFrame.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigDeclineCurveCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigReservoirBuilder.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigThermalFractureDefinition.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigThermalFractureResult.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigThermalFractureResultUtil.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigTofAccumulatedPhaseFractionsCalculator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigTofWellDistributionCalculator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigTracer.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigTracerPoint.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigTransmissibilityEquations.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigVfpTables.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigOsduWellLogData.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellTargetCandidatesGenerator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigContourMapGrid.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigContourPolygonsTools.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigContourMapCalculator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigVisibleCategoriesCalculator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWbsParameter.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWeightedMeanCalc.cpp
 )
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})

ApplicationLibCode/ReservoirDataModel/CMakeLists_filesNotToUnitTest.cmake

@@ -1,24 +1,14 @@
 set(SOURCE_GROUP_HEADER_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/RigGeoMechWellLogExtractor.h
     ${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseCellMapper.h
     ${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseCellMapperTools.h
     ${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseRangeFilterMapper.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCenterLineCalculator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogData.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogLasFile.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogCsvFile.h
     ${CMAKE_CURRENT_LIST_DIR}/RigReservoirGridTools.h
 )
 
 set(SOURCE_GROUP_SOURCE_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/RigGeoMechWellLogExtractor.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseCellMapper.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseCellMapperTools.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseRangeFilterMapper.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCenterLineCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogData.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogLasFile.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogCsvFile.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigReservoirGridTools.cpp
 )
 

ApplicationLibCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.cpp

@@ -21,7 +21,7 @@
 #include "RigCellGeometryTools.h"
 #include "RigFractureCell.h"
 #include "RigFractureGrid.h"
-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"
 
 #include "RimFracture.h"
 #include "RimFractureTemplate.h"

ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.cpp

@@ -29,13 +29,13 @@
 #include "RigFormationNames.h"
 #include "RigMainGrid.h"
 #include "RigResultAccessorFactory.h"
-#include "RigSimWellData.h"
-#include "RigSimulationWellCenterLineCalculator.h"
-#include "RigSimulationWellCoordsAndMD.h"
 #include "RigVirtualPerforationTransmissibilities.h"
-#include "RigWellPath.h"
-#include "RigWellResultFrame.h"
-#include "RigWellResultPoint.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigSimulationWellCenterLineCalculator.h"
+#include "Well/RigSimulationWellCoordsAndMD.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellResultFrame.h"
+#include "Well/RigWellResultPoint.h"
 
 #include <QDebug>
 

ApplicationLibCode/ReservoirDataModel/RigEclipseCaseDataTools.cpp

@@ -20,7 +20,7 @@
 
 #include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"
-#include "RigSimWellData.h"
+#include "Well/RigSimWellData.h"
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationLibCode/ReservoirDataModel/RigLasFileExporter.cpp

@@ -19,12 +19,12 @@
 #include "RigLasFileExporter.h"
 
 #include "RiaDefines.h"
-#include "RigWellLogCurveData.h"
-#include "RigWellPath.h"
 #include "RimCase.h"
 #include "RimWellLogCurve.h"
 #include "RimWellLogExtractionCurve.h"
 #include "RimWellPath.h"
+#include "Well/RigWellLogCurveData.h"
+#include "Well/RigWellPath.h"
 
 #include "cafUtils.h"
 

ApplicationLibCode/ReservoirDataModel/RigReservoirBuilderMock.cpp

@@ -25,9 +25,9 @@
 #include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"
 #include "RigNNCData.h"
-#include "RigSimWellData.h"
-#include "RigWellResultFrame.h"
-#include "RigWellResultPoint.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigWellResultFrame.h"
+#include "Well/RigWellResultPoint.h"
 
 #include <QRegularExpression>
 

ApplicationLibCode/ReservoirDataModel/RigStimPlanModelTools.cpp

@@ -24,9 +24,9 @@
 #include "RigEclipseCaseData.h"
 #include "RigFault.h"
 #include "RigMainGrid.h"
-#include "RigSimulationWellCoordsAndMD.h"
-#include "RigWellLogExtractor.h"
-#include "RigWellPathIntersectionTools.h"
+#include "Well/RigSimulationWellCoordsAndMD.h"
+#include "Well/RigWellLogExtractor.h"
+#include "Well/RigWellPathIntersectionTools.h"
 
 #include "cvfBoundingBox.h"
 #include "cvfGeometryTools.h"

ApplicationLibCode/ReservoirDataModel/RigSurfaceResampler.cpp

@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RigSurfaceResampler.h"
-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"
 
 #include "cvfGeometryTools.h"
 

ApplicationLibCode/ReservoirDataModel/Well/CMakeLists_files.cmake

@@ -0,0 +1,69 @@
+set(SOURCE_GROUP_HEADER_FILES
+    ${CMAKE_CURRENT_LIST_DIR}/RigAccWellFlowCalculator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseWellLogExtractor.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigFishbonesGeometry.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigGeoMechWellLogExtractor.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigMswCenterLineCalculator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigOsduWellLogData.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigPipeInCellEvaluator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCenterLineCalculator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCoordsAndMD.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigSimWellData.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellAllocationOverTime.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellDiskData.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogCurveData.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogExtractionTools.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogExtractor.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogIndexDepthOffset.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellPath.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathFormations.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathGeometryExporter.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathGeometryTools.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathIntersectionTools.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellResultBranch.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellResultFrame.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellResultPoint.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellTargetCandidatesGenerator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogData.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogLasFile.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogCsvFile.h
+)
+
+set(SOURCE_GROUP_SOURCE_FILES
+    ${CMAKE_CURRENT_LIST_DIR}/RigAccWellFlowCalculator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigEclipseWellLogExtractor.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigFishbonesGeometry.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigGeoMechWellLogExtractor.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigMswCenterLineCalculator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigOsduWellLogData.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCenterLineCalculator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCoordsAndMD.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigSimWellData.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellAllocationOverTime.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellDiskData.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogCurveData.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogExtractor.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogIndexDepthOffset.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellPath.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathFormations.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathGeometryExporter.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathGeometryTools.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellPathIntersectionTools.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellResultBranch.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellResultFrame.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellResultPoint.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellTargetCandidatesGenerator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogData.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogLasFile.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogCsvFile.cpp
+)
+
+list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
+
+list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
+
+source_group(
+  "ReservoirDataModel"
+  FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)