#2423 Export Completions : Move Rig*-files to completion export folder

ApplicationCode/CommandFileInterface/RicfExportMsw.cpp

@@ -32,7 +32,7 @@
 #include "RimFishbonesCollection.h"
 #include "RimFishbonesMultipleSubs.h"
 
-#include "CompletionCommands/RicExportFishbonesWellSegmentsFeature.h"
+#include "CompletionCommands/CompletionExportCommands/RicExportFishbonesWellSegmentsFeature.h"
 
 CAF_PDM_SOURCE_INIT(RicfExportMsw, "exportMsw");
 

ApplicationCode/CommandFileInterface/RicfExportSimWellCompletions.cpp

@@ -35,7 +35,7 @@
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 
-#include "CompletionCommands/RicWellPathExportCompletionDataFeature.h"
+#include "CompletionCommands/CompletionExportCommands/RicWellPathExportCompletionDataFeature.h"
 
 CAF_PDM_SOURCE_INIT(RicfExportSimWellCompletions, "exportSimWellCompletions");
 

ApplicationCode/CommandFileInterface/RicfExportSimWellCompletions.h

@@ -20,7 +20,7 @@
 
 #include "RicfCommandObject.h"
 
-#include "CompletionCommands/RicExportCompletionDataSettingsUi.h"
+#include "CompletionCommands/CompletionExportCommands/RicExportCompletionDataSettingsUi.h"
 
 #include "cafAppEnum.h"
 #include "cafPdmField.h"

ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake

@@ -5,10 +5,8 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
 endif()
 
 set (SOURCE_GROUP_HEADER_FILES
-${CEE_CURRENT_LIST_DIR}RicCaseAndFileExportSettingsUi.h
 ${CEE_CURRENT_LIST_DIR}RicEditPerforationCollectionFeature.h
 ${CEE_CURRENT_LIST_DIR}RicExportFishbonesLateralsFeature.h
-${CEE_CURRENT_LIST_DIR}RicExportFishbonesWellSegmentsFeature.h
 ${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsAtMeasuredDepthFeature.h
 ${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsFeature.h
 ${CEE_CURRENT_LIST_DIR}RicNewPerforationIntervalFeature.h
@@ -18,10 +16,8 @@ ${CEE_CURRENT_LIST_DIR}RicWellPathImportPerforationIntervalsFeature.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
-${CEE_CURRENT_LIST_DIR}RicCaseAndFileExportSettingsUi.cpp
 ${CEE_CURRENT_LIST_DIR}RicEditPerforationCollectionFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicExportFishbonesLateralsFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicExportFishbonesWellSegmentsFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsAtMeasuredDepthFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicNewPerforationIntervalFeature.cpp

ApplicationCode/Commands/CompletionCommands/CompletionExportCommands/CMakeLists_files.cmake

@@ -8,11 +8,19 @@ set (SOURCE_GROUP_HEADER_FILES
 ${CEE_CURRENT_LIST_DIR}RicExportCompletionDataSettingsUi.h
 ${CEE_CURRENT_LIST_DIR}RicWellPathExportCompletionDataFeature.h
 ${CEE_CURRENT_LIST_DIR}RicFishbonesTransmissibilityCalculationFeatureImp.h
+${CEE_CURRENT_LIST_DIR}RigCompletionData.h
+${CEE_CURRENT_LIST_DIR}RigCompletionDataGridCell.h
+${CEE_CURRENT_LIST_DIR}RicExportFishbonesWellSegmentsFeature.h
+${CEE_CURRENT_LIST_DIR}RicCaseAndFileExportSettingsUi.h
 )
 
 if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
     list (APPEND SOURCE_GROUP_HEADER_FILES
         ${CEE_CURRENT_LIST_DIR}RicExportFractureCompletionsImpl.h
+        ${CEE_CURRENT_LIST_DIR}RigEclipseToStimPlanCellTransmissibilityCalculator.h
+        ${CEE_CURRENT_LIST_DIR}RigTransmissibilityCondenser.h
+        ${CEE_CURRENT_LIST_DIR}RigFractureTransmissibilityEquations.h
+        ${CEE_CURRENT_LIST_DIR}RigWellPathStimplanIntersector.h
     )
 endif()
 
@@ -21,11 +29,19 @@ set (SOURCE_GROUP_SOURCE_FILES
 ${CEE_CURRENT_LIST_DIR}RicExportCompletionDataSettingsUi.cpp
 ${CEE_CURRENT_LIST_DIR}RicWellPathExportCompletionDataFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicFishbonesTransmissibilityCalculationFeatureImp.cpp
+${CEE_CURRENT_LIST_DIR}RigCompletionData.cpp
+${CEE_CURRENT_LIST_DIR}RigCompletionDataGridCell.cpp
+${CEE_CURRENT_LIST_DIR}RicExportFishbonesWellSegmentsFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicCaseAndFileExportSettingsUi.cpp
 )
 
 if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
     list (APPEND SOURCE_GROUP_SOURCE_FILES
         ${CEE_CURRENT_LIST_DIR}RicExportFractureCompletionsImpl.cpp
+        ${CEE_CURRENT_LIST_DIR}RigEclipseToStimPlanCellTransmissibilityCalculator.cpp
+        ${CEE_CURRENT_LIST_DIR}RigTransmissibilityCondenser.cpp
+        ${CEE_CURRENT_LIST_DIR}RigFractureTransmissibilityEquations.cpp
+        ${CEE_CURRENT_LIST_DIR}RigWellPathStimplanIntersector.cpp
     )
 endif()
 

ApplicationCode/Commands/CompletionCommands/CompletionExportCommands/RicExportCompletionDataSettingsUi.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "../RicCaseAndFileExportSettingsUi.h"
+#include "RicCaseAndFileExportSettingsUi.h"
 
 #include "cafPdmField.h"
 #include "cafAppEnum.h"

ApplicationCode/Commands/CompletionCommands/CompletionExportCommands/RicExportFishbonesWellSegmentsFeature.h

@@ -21,9 +21,9 @@
 #include "RifEclipseDataTableFormatter.h"
 
 #include "RicCaseAndFileExportSettingsUi.h"
-
 #include "RicWellPathExportCompletionDataFeature.h"
 
+
 #include "cafCmdFeature.h"
 
 class RimFishbonesCollection;

ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake

@@ -18,7 +18,6 @@ ${CEE_CURRENT_LIST_DIR}RigCellEdgeResultAccessor.h
 ${CEE_CURRENT_LIST_DIR}RigCellGeometryTools.h
 ${CEE_CURRENT_LIST_DIR}RigCombTransResultAccessor.h
 ${CEE_CURRENT_LIST_DIR}RigCombMultResultAccessor.h
-${CEE_CURRENT_LIST_DIR}RigCompletionData.h
 ${CEE_CURRENT_LIST_DIR}RigResultModifier.h
 ${CEE_CURRENT_LIST_DIR}RigResultModifierFactory.h
 ${CEE_CURRENT_LIST_DIR}RigFormationNames.h
@@ -66,18 +65,13 @@ ${CEE_CURRENT_LIST_DIR}RigNumberOfFloodedPoreVolumesCalculator.h
 ${CEE_CURRENT_LIST_DIR}RigWeightedMeanCalc.h
 ${CEE_CURRENT_LIST_DIR}RigTimeHistoryCurveMerger.h
 ${CEE_CURRENT_LIST_DIR}RigWellPathFormations.h
-${CEE_CURRENT_LIST_DIR}RigCompletionDataGridCell.h
 )
 
 if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
     list (APPEND SOURCE_GROUP_HEADER_FILES
-        ${CEE_CURRENT_LIST_DIR}RigEclipseToStimPlanCellTransmissibilityCalculator.h
-        ${CEE_CURRENT_LIST_DIR}RigTransmissibilityCondenser.h
-        ${CEE_CURRENT_LIST_DIR}RigFractureTransmissibilityEquations.h
         ${CEE_CURRENT_LIST_DIR}RigStimPlanFractureDefinition.h
         ${CEE_CURRENT_LIST_DIR}RigFractureGrid.h
         ${CEE_CURRENT_LIST_DIR}RigFractureCell.h
-        ${CEE_CURRENT_LIST_DIR}RigWellPathStimplanIntersector.h
     )
 endif()
 
@@ -96,7 +90,6 @@ ${CEE_CURRENT_LIST_DIR}RigCellEdgeResultAccessor.cpp
 ${CEE_CURRENT_LIST_DIR}RigCellGeometryTools.cpp
 ${CEE_CURRENT_LIST_DIR}RigCombTransResultAccessor.cpp
 ${CEE_CURRENT_LIST_DIR}RigCombMultResultAccessor.cpp
-${CEE_CURRENT_LIST_DIR}RigCompletionData.cpp
 ${CEE_CURRENT_LIST_DIR}RigResultModifierFactory.cpp
 ${CEE_CURRENT_LIST_DIR}RigFormationNames.cpp
 ${CEE_CURRENT_LIST_DIR}RigFlowDiagResultAddress.cpp
@@ -139,18 +132,13 @@ ${CEE_CURRENT_LIST_DIR}RigNumberOfFloodedPoreVolumesCalculator.cpp
 ${CEE_CURRENT_LIST_DIR}RigWeightedMeanCalc.cpp
 ${CEE_CURRENT_LIST_DIR}RigTimeHistoryCurveMerger.cpp
 ${CEE_CURRENT_LIST_DIR}RigWellPathFormations.cpp
-${CEE_CURRENT_LIST_DIR}RigCompletionDataGridCell.cpp
 )
 
 if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
     list (APPEND SOURCE_GROUP_SOURCE_FILES
-        ${CEE_CURRENT_LIST_DIR}RigEclipseToStimPlanCellTransmissibilityCalculator.cpp
-        ${CEE_CURRENT_LIST_DIR}RigTransmissibilityCondenser.cpp
-        ${CEE_CURRENT_LIST_DIR}RigFractureTransmissibilityEquations.cpp
         ${CEE_CURRENT_LIST_DIR}RigStimPlanFractureDefinition.cpp
         ${CEE_CURRENT_LIST_DIR}RigFractureGrid.cpp
         ${CEE_CURRENT_LIST_DIR}RigFractureCell.cpp
-        ${CEE_CURRENT_LIST_DIR}RigWellPathStimplanIntersector.cpp
     )
 endif()
 

ApplicationCode/UnitTests/RigCellGeometryTools-Test.cpp

@@ -296,7 +296,7 @@ TEST(RigCellGeometryTools, polylinePolygonIntersectionTest2)
 }
 
 
-#include "RigWellPathStimplanIntersector.h"
+#include "CompletionCommands/CompletionExportCommands/RigWellPathStimplanIntersector.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 

ApplicationCode/UnitTests/RigTransmissibilityCondenser-Test.cpp

@@ -18,7 +18,7 @@
 
 #include "gtest/gtest.h"
 
-#include "RigTransmissibilityCondenser.h"
+#include "CompletionCommands/CompletionExportCommands/RigTransmissibilityCondenser.h"
 
 //--------------------------------------------------------------------------------------------------
 ///