#1532 Move completion related data models into separate completions folder

ApplicationCode/CMakeLists.txt

@@ -47,9 +47,9 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/UserInterface
 
     ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel
-    ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Summary
+    ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Completions
     ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Flow
-    ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Fishbones
+    ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Summary
     
     ${CMAKE_CURRENT_SOURCE_DIR}/ResultStatisticsCache
     ${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel
@@ -108,7 +108,7 @@ list( APPEND REFERENCED_CMAKE_FILES
     ProjectDataModel/CMakeLists_files.cmake
     ProjectDataModel/Summary/CMakeLists_files.cmake
     ProjectDataModel/Flow/CMakeLists_files.cmake
-    ProjectDataModel/Fishbones/CMakeLists_files.cmake
+    ProjectDataModel/Completions/CMakeLists_files.cmake
     
     GeoMech/GeoMechVisualization/CMakeLists_files.cmake
     

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -16,8 +16,6 @@ ${CEE_CURRENT_LIST_DIR}RimCellRangeFilterCollection.h
 ${CEE_CURRENT_LIST_DIR}RimDefines.h
 ${CEE_CURRENT_LIST_DIR}RimLegendConfig.h
 ${CEE_CURRENT_LIST_DIR}RimOilField.h
-${CEE_CURRENT_LIST_DIR}RimPerforationCollection.h
-${CEE_CURRENT_LIST_DIR}RimPerforationInterval.h
 ${CEE_CURRENT_LIST_DIR}RimProject.h
 ${CEE_CURRENT_LIST_DIR}RimEclipseCase.h
 ${CEE_CURRENT_LIST_DIR}RimIdenticalGridCaseGroup.h
@@ -33,8 +31,6 @@ ${CEE_CURRENT_LIST_DIR}RimEclipseWell.h
 ${CEE_CURRENT_LIST_DIR}RimEclipseWellCollection.h
 ${CEE_CURRENT_LIST_DIR}RimWellPath.h
 ${CEE_CURRENT_LIST_DIR}RimWellPathCollection.h
-${CEE_CURRENT_LIST_DIR}RimFishboneWellPath.h
-${CEE_CURRENT_LIST_DIR}RimFishboneWellPathCollection.h
 ${CEE_CURRENT_LIST_DIR}RimScriptCollection.h
 ${CEE_CURRENT_LIST_DIR}RimEclipseStatisticsCase.h
 ${CEE_CURRENT_LIST_DIR}RimEclipseStatisticsCaseCollection.h
@@ -94,7 +90,6 @@ ${CEE_CURRENT_LIST_DIR}RimCheckableNamedObject.h
 ${CEE_CURRENT_LIST_DIR}RimGridTimeHistoryCurve.h
 ${CEE_CURRENT_LIST_DIR}RimGeometrySelectionItem.h
 ${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.h
-${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
@@ -109,8 +104,6 @@ ${CEE_CURRENT_LIST_DIR}RimCellRangeFilterCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimDefines.cpp
 ${CEE_CURRENT_LIST_DIR}RimLegendConfig.cpp
 ${CEE_CURRENT_LIST_DIR}RimOilField.cpp
-${CEE_CURRENT_LIST_DIR}RimPerforationCollection.cpp
-${CEE_CURRENT_LIST_DIR}RimPerforationInterval.cpp
 ${CEE_CURRENT_LIST_DIR}RimProject.cpp
 ${CEE_CURRENT_LIST_DIR}RimEclipseCase.cpp
 ${CEE_CURRENT_LIST_DIR}RimIdenticalGridCaseGroup.cpp
@@ -126,8 +119,6 @@ ${CEE_CURRENT_LIST_DIR}RimEclipseWell.cpp
 ${CEE_CURRENT_LIST_DIR}RimEclipseWellCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellPath.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellPathCollection.cpp
-${CEE_CURRENT_LIST_DIR}RimFishboneWellPath.cpp
-${CEE_CURRENT_LIST_DIR}RimFishboneWellPathCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimScriptCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimEclipseStatisticsCase.cpp
 ${CEE_CURRENT_LIST_DIR}RimEclipseStatisticsCaseCollection.cpp
@@ -187,7 +178,6 @@ ${CEE_CURRENT_LIST_DIR}RimCheckableNamedObject.cpp
 ${CEE_CURRENT_LIST_DIR}RimGridTimeHistoryCurve.cpp
 ${CEE_CURRENT_LIST_DIR}RimGeometrySelectionItem.cpp
 ${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.cpp
-${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.cpp
 )
 
 list(APPEND CODE_HEADER_FILES

ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake

@@ -5,15 +5,25 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
 endif()
 
 set (SOURCE_GROUP_HEADER_FILES
+${CEE_CURRENT_LIST_DIR}RimFishbonesCollection.h
 ${CEE_CURRENT_LIST_DIR}RimFishbonesMultipleSubs.h
 ${CEE_CURRENT_LIST_DIR}RimFishbonesPipeProperties.h
-${CEE_CURRENT_LIST_DIR}RimFishbonesCollection.h
+${CEE_CURRENT_LIST_DIR}RimFishboneWellPath.h
+${CEE_CURRENT_LIST_DIR}RimFishboneWellPathCollection.h
+${CEE_CURRENT_LIST_DIR}RimPerforationCollection.h
+${CEE_CURRENT_LIST_DIR}RimPerforationInterval.h
+${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}RimFishbonesCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimFishbonesMultipleSubs.cpp
 ${CEE_CURRENT_LIST_DIR}RimFishbonesPipeProperties.cpp
-${CEE_CURRENT_LIST_DIR}RimFishbonesCollection.cpp
+${CEE_CURRENT_LIST_DIR}RimFishboneWellPath.cpp
+${CEE_CURRENT_LIST_DIR}RimFishboneWellPathCollection.cpp
+${CEE_CURRENT_LIST_DIR}RimPerforationCollection.cpp
+${CEE_CURRENT_LIST_DIR}RimPerforationInterval.cpp
+${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.cpp
 )
 
 list(APPEND CODE_HEADER_FILES