Move GeoMech PDM files into subfolder

ApplicationLibCode/CMakeLists.txt

@@ -99,6 +99,7 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Completions
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Flow
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/GridCrossPlots
+  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/GeoMech
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Measurement
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/StimPlanModel
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Summary
@@ -157,6 +158,7 @@ list(
   ProjectDataModel/CMakeLists_files.cmake
   ProjectDataModel/AnalysisPlots/CMakeLists_files.cmake
   ProjectDataModel/CorrelationPlots/CMakeLists_files.cmake
+  ProjectDataModel/GeoMech/CMakeLists_files.cmake
   ProjectDataModel/GridCrossPlots/CMakeLists_files.cmake
   ProjectDataModel/GridCrossPlots/CellFilters/CMakeLists_files.cmake
   ProjectDataModel/Summary/CMakeLists_files.cmake

ApplicationLibCode/ProjectDataModel/CMakeLists_files.cmake

@@ -54,11 +54,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RimTernaryLegendConfig.h
 ${CMAKE_CURRENT_LIST_DIR}/RimEclipseFaultColors.h
 ${CMAKE_CURRENT_LIST_DIR}/RimNoCommonAreaNNC.h
 ${CMAKE_CURRENT_LIST_DIR}/RimNoCommonAreaNncCollection.h
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechModels.h
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCase.h
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechView.h
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechResultDefinition.h
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCellColors.h
 ${CMAKE_CURRENT_LIST_DIR}/RimViewWindow.h
 ${CMAKE_CURRENT_LIST_DIR}/Rim3dView.h
 ${CMAKE_CURRENT_LIST_DIR}/RimGridView.h
@@ -133,9 +128,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RimContourMapProjection.h
 ${CMAKE_CURRENT_LIST_DIR}/RimEclipseContourMapProjection.h
 ${CMAKE_CURRENT_LIST_DIR}/RimEclipseContourMapView.h
 ${CMAKE_CURRENT_LIST_DIR}/RimEclipseContourMapViewCollection.h
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapProjection.h
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapView.h
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapViewCollection.h
 ${CMAKE_CURRENT_LIST_DIR}/RimMudWeightWindowParameters.h
 ${CMAKE_CURRENT_LIST_DIR}/RimViewNameConfig.h
 ${CMAKE_CURRENT_LIST_DIR}/RimReloadCaseTools.h
@@ -221,11 +213,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RimTernaryLegendConfig.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimEclipseFaultColors.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimNoCommonAreaNNC.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimNoCommonAreaNncCollection.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechModels.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCase.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechView.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechResultDefinition.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCellColors.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimMudWeightWindowParameters.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimViewWindow.cpp
 ${CMAKE_CURRENT_LIST_DIR}/Rim3dView.cpp
@@ -301,9 +288,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RimContourMapProjection.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimEclipseContourMapProjection.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimEclipseContourMapView.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimEclipseContourMapViewCollection.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapProjection.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapView.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapViewCollection.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimViewNameConfig.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimReloadCaseTools.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimPlotAxisPropertiesInterface.cpp

ApplicationLibCode/ProjectDataModel/GeoMech/CMakeLists_files.cmake

@@ -0,0 +1,32 @@
+
+set (SOURCE_GROUP_HEADER_FILES
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechModels.h
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCase.h
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechView.h
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechResultDefinition.h
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCellColors.h
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapProjection.h
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapView.h
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapViewCollection.h
+)
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechModels.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCase.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechView.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechResultDefinition.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCellColors.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapProjection.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapView.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapViewCollection.cpp
+)
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+source_group( "ProjectDataModel\\GeoMech" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake )

GrpcInterface/RiaGrpcProjectService.cpp

@@ -4,11 +4,11 @@
 #include "RiaGrpcCallbacks.h"
 #include "RiaSocketTools.h"
 
+#include "GeoMech/RimGeoMechCase.h"
 #include "RimCase.h"
 #include "RimCaseCollection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCaseCollection.h"
-#include "RimGeoMechCase.h"
 #include "RimGridView.h"
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimOilField.h"