diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index ade87f19a1..8c27af7b02 100644 --- a/ApplicationCode/CMakeLists.txt +++ b/ApplicationCode/CMakeLists.txt @@ -136,14 +136,8 @@ list( APPEND REFERENCED_CMAKE_FILES CommandFileInterface/CMakeLists_files.cmake CommandFileInterface/Core/CMakeLists_files.cmake -) - -if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) - list (APPEND REFERENCED_CMAKE_FILES Commands/FractureCommands/CMakeLists_files.cmake - ) -endif() - +) option (RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS "Include ApplicationCode Unit Tests" OFF) if (RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS) @@ -208,11 +202,6 @@ if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING) endif() -if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) - add_definitions(-DUSE_PROTOTYPE_FEATURE_FRACTURES) -endif() - - ############################################################################# # Qt specifics: Moc, ui, resources ############################################################################# @@ -577,10 +566,6 @@ if(RESINSIGHT_FOUND_HDF5) set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_souring") endif() -if(RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) - set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_fractures") -endif() - # Append el5 when compiled on RHEL5 and el6 if compiled on RHEL6 if (NOT "${RESINSIGHT_RHEL_SYSTEM_NAME}" STREQUAL "") set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_${RESINSIGHT_RHEL_SYSTEM_NAME}") diff --git a/ApplicationCode/Commands/CompletionExportCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/CompletionExportCommands/CMakeLists_files.cmake index 647b7d6ba0..4e22904d0b 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CompletionExportCommands/CMakeLists_files.cmake @@ -13,18 +13,13 @@ ${CEE_CURRENT_LIST_DIR}RigCompletionData.h ${CEE_CURRENT_LIST_DIR}RigCompletionDataGridCell.h ${CEE_CURRENT_LIST_DIR}RicExportFishbonesWellSegmentsFeature.h ${CEE_CURRENT_LIST_DIR}RicCaseAndFileExportSettingsUi.h +${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 ) -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() - set (SOURCE_GROUP_SOURCE_FILES ${CEE_CURRENT_LIST_DIR}RicExportCompletionDataSettingsUi.cpp @@ -35,19 +30,13 @@ ${CEE_CURRENT_LIST_DIR}RigCompletionData.cpp ${CEE_CURRENT_LIST_DIR}RigCompletionDataGridCell.cpp ${CEE_CURRENT_LIST_DIR}RicExportFishbonesWellSegmentsFeature.cpp ${CEE_CURRENT_LIST_DIR}RicCaseAndFileExportSettingsUi.cpp +${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 ) -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() - - list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES} ) diff --git a/ApplicationCode/FileInterface/CMakeLists_files.cmake b/ApplicationCode/FileInterface/CMakeLists_files.cmake index 3f2483b921..41fd9ff108 100644 --- a/ApplicationCode/FileInterface/CMakeLists_files.cmake +++ b/ApplicationCode/FileInterface/CMakeLists_files.cmake @@ -42,17 +42,12 @@ ${CEE_CURRENT_LIST_DIR}RifWellPathFormationReader.h ${CEE_CURRENT_LIST_DIR}RifWellPathFormationsImporter.h ${CEE_CURRENT_LIST_DIR}RifElementPropertyTableReader.h ${CEE_CURRENT_LIST_DIR}RifElementPropertyReader.h +${CEE_CURRENT_LIST_DIR}RifStimPlanXmlReader.h # HDF5 file reader is directly included in ResInsight main CmakeList.txt #${CEE_CURRENT_LIST_DIR}RifHdf5Reader.h ) -if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) - list (APPEND SOURCE_GROUP_HEADER_FILES - ${CEE_CURRENT_LIST_DIR}RifStimPlanXmlReader.h - ) -endif() - set (SOURCE_GROUP_SOURCE_FILES ${CEE_CURRENT_LIST_DIR}RifEclipseDataTableFormatter.cpp ${CEE_CURRENT_LIST_DIR}RifEclipseInputFileTools.cpp @@ -89,17 +84,12 @@ ${CEE_CURRENT_LIST_DIR}RifWellPathFormationReader.cpp ${CEE_CURRENT_LIST_DIR}RifWellPathFormationsImporter.cpp ${CEE_CURRENT_LIST_DIR}RifElementPropertyTableReader.cpp ${CEE_CURRENT_LIST_DIR}RifElementPropertyReader.cpp +${CEE_CURRENT_LIST_DIR}RifStimPlanXmlReader.cpp # HDF5 file reader is directly included in ResInsight main CmakeList.txt #${CEE_CURRENT_LIST_DIR}RifHdf5Reader.cpp ) -if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) - list (APPEND SOURCE_GROUP_SOURCE_FILES - ${CEE_CURRENT_LIST_DIR}RifStimPlanXmlReader.cpp - ) -endif() - list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES} ) diff --git a/ApplicationCode/ModelVisualization/CMakeLists_files.cmake b/ApplicationCode/ModelVisualization/CMakeLists_files.cmake index a575ad5258..fa10457974 100644 --- a/ApplicationCode/ModelVisualization/CMakeLists_files.cmake +++ b/ApplicationCode/ModelVisualization/CMakeLists_files.cmake @@ -41,15 +41,9 @@ ${CEE_CURRENT_LIST_DIR}RivObjectSourceInfo.h ${CEE_CURRENT_LIST_DIR}RivWellConnectionsPartMgr.h ${CEE_CURRENT_LIST_DIR}RivFishbonesSubsPartMgr.h ${CEE_CURRENT_LIST_DIR}RivTensorResultPartMgr.h +${CEE_CURRENT_LIST_DIR}RivWellFracturePartMgr.h ) -if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) - list (APPEND SOURCE_GROUP_HEADER_FILES - ${CEE_CURRENT_LIST_DIR}RivWellFracturePartMgr.h - ) -endif() - - set (SOURCE_GROUP_SOURCE_FILES ${CEE_CURRENT_LIST_DIR}RivCellEdgeEffectGenerator.cpp ${CEE_CURRENT_LIST_DIR}RivFaultPartMgr.cpp @@ -82,14 +76,9 @@ ${CEE_CURRENT_LIST_DIR}RivObjectSourceInfo.cpp ${CEE_CURRENT_LIST_DIR}RivWellConnectionsPartMgr.cpp ${CEE_CURRENT_LIST_DIR}RivFishbonesSubsPartMgr.cpp ${CEE_CURRENT_LIST_DIR}RivTensorResultPartMgr.cpp +${CEE_CURRENT_LIST_DIR}RivWellFracturePartMgr.cpp ) -if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) - list (APPEND SOURCE_GROUP_SOURCE_FILES - ${CEE_CURRENT_LIST_DIR}RivWellFracturePartMgr.cpp - ) -endif() - list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES} ) diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake index 337ea62e44..33a2c5e460 100644 --- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake @@ -100,14 +100,10 @@ ${CEE_CURRENT_LIST_DIR}RimTimeStepFilter.h ${CEE_CURRENT_LIST_DIR}RimSummaryCalculation.h ${CEE_CURRENT_LIST_DIR}RimSummaryCalculationCollection.h ${CEE_CURRENT_LIST_DIR}RimSummaryCalculationVariable.h +${CEE_CURRENT_LIST_DIR}RimStimPlanLegendConfig.h +${CEE_CURRENT_LIST_DIR}RimStimPlanColors.h ) -if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) - list (APPEND SOURCE_GROUP_HEADER_FILES - ${CEE_CURRENT_LIST_DIR}RimStimPlanLegendConfig.h - ${CEE_CURRENT_LIST_DIR}RimStimPlanColors.h - ) -endif() set (SOURCE_GROUP_SOURCE_FILES ${CEE_CURRENT_LIST_DIR}RimEclipseCaseCollection.cpp @@ -205,15 +201,10 @@ ${CEE_CURRENT_LIST_DIR}RimTimeStepFilter.cpp ${CEE_CURRENT_LIST_DIR}RimSummaryCalculation.cpp ${CEE_CURRENT_LIST_DIR}RimSummaryCalculationCollection.cpp ${CEE_CURRENT_LIST_DIR}RimSummaryCalculationVariable.cpp +${CEE_CURRENT_LIST_DIR}RimStimPlanLegendConfig.cpp +${CEE_CURRENT_LIST_DIR}RimStimPlanColors.cpp ) -if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) - list (APPEND SOURCE_GROUP_SOURCE_FILES - ${CEE_CURRENT_LIST_DIR}RimStimPlanLegendConfig.cpp - ${CEE_CURRENT_LIST_DIR}RimStimPlanColors.cpp - ) -endif() - list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES} ) diff --git a/ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake index 7ea1beaf38..1bb1525af6 100644 --- a/ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake @@ -14,25 +14,19 @@ ${CEE_CURRENT_LIST_DIR}RimFishboneWellPathCollection.h ${CEE_CURRENT_LIST_DIR}RimPerforationCollection.h ${CEE_CURRENT_LIST_DIR}RimPerforationInterval.h ${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.h +${CEE_CURRENT_LIST_DIR}RimEllipseFractureTemplate.h +${CEE_CURRENT_LIST_DIR}RimFracture.h +${CEE_CURRENT_LIST_DIR}RimFractureContainment.h +${CEE_CURRENT_LIST_DIR}RimFractureExportSettings.h +${CEE_CURRENT_LIST_DIR}RimFractureTemplate.h +${CEE_CURRENT_LIST_DIR}RimFractureTemplateCollection.h +${CEE_CURRENT_LIST_DIR}RimSimWellFracture.h +${CEE_CURRENT_LIST_DIR}RimSimWellFractureCollection.h +${CEE_CURRENT_LIST_DIR}RimStimPlanFractureTemplate.h +${CEE_CURRENT_LIST_DIR}RimWellPathFracture.h +${CEE_CURRENT_LIST_DIR}RimWellPathFractureCollection.h ) -if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) - list (APPEND SOURCE_GROUP_HEADER_FILES - ${CEE_CURRENT_LIST_DIR}RimEllipseFractureTemplate.h - ${CEE_CURRENT_LIST_DIR}RimFracture.h - ${CEE_CURRENT_LIST_DIR}RimFractureContainment.h - ${CEE_CURRENT_LIST_DIR}RimFractureExportSettings.h - ${CEE_CURRENT_LIST_DIR}RimFractureTemplate.h - ${CEE_CURRENT_LIST_DIR}RimFractureTemplateCollection.h - ${CEE_CURRENT_LIST_DIR}RimSimWellFracture.h - ${CEE_CURRENT_LIST_DIR}RimSimWellFractureCollection.h - ${CEE_CURRENT_LIST_DIR}RimStimPlanFractureTemplate.h - ${CEE_CURRENT_LIST_DIR}RimWellPathFracture.h - ${CEE_CURRENT_LIST_DIR}RimWellPathFractureCollection.h - ) -endif() - - set (SOURCE_GROUP_SOURCE_FILES ${CEE_CURRENT_LIST_DIR}RimCompletionCellIntersectionCalc.cpp @@ -44,25 +38,19 @@ ${CEE_CURRENT_LIST_DIR}RimFishboneWellPathCollection.cpp ${CEE_CURRENT_LIST_DIR}RimPerforationCollection.cpp ${CEE_CURRENT_LIST_DIR}RimPerforationInterval.cpp ${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.cpp +${CEE_CURRENT_LIST_DIR}RimEllipseFractureTemplate.cpp +${CEE_CURRENT_LIST_DIR}RimFracture.cpp +${CEE_CURRENT_LIST_DIR}RimFractureContainment.cpp +${CEE_CURRENT_LIST_DIR}RimFractureExportSettings.cpp +${CEE_CURRENT_LIST_DIR}RimFractureTemplate.cpp +${CEE_CURRENT_LIST_DIR}RimFractureTemplateCollection.cpp +${CEE_CURRENT_LIST_DIR}RimSimWellFracture.cpp +${CEE_CURRENT_LIST_DIR}RimSimWellFractureCollection.cpp +${CEE_CURRENT_LIST_DIR}RimStimPlanFractureTemplate.cpp +${CEE_CURRENT_LIST_DIR}RimWellPathFracture.cpp +${CEE_CURRENT_LIST_DIR}RimWellPathFractureCollection.cpp ) -if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) - list (APPEND SOURCE_GROUP_SOURCE_FILES - ${CEE_CURRENT_LIST_DIR}RimEllipseFractureTemplate.cpp - ${CEE_CURRENT_LIST_DIR}RimFracture.cpp - ${CEE_CURRENT_LIST_DIR}RimFractureContainment.cpp - ${CEE_CURRENT_LIST_DIR}RimFractureExportSettings.cpp - ${CEE_CURRENT_LIST_DIR}RimFractureTemplate.cpp - ${CEE_CURRENT_LIST_DIR}RimFractureTemplateCollection.cpp - ${CEE_CURRENT_LIST_DIR}RimSimWellFracture.cpp - ${CEE_CURRENT_LIST_DIR}RimSimWellFractureCollection.cpp - ${CEE_CURRENT_LIST_DIR}RimStimPlanFractureTemplate.cpp - ${CEE_CURRENT_LIST_DIR}RimWellPathFracture.cpp - ${CEE_CURRENT_LIST_DIR}RimWellPathFractureCollection.cpp - ) -endif() - - list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES} ) diff --git a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake index 7e50d6080c..5cc7879c20 100644 --- a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake @@ -65,16 +65,11 @@ ${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}RigStimPlanFractureDefinition.h +${CEE_CURRENT_LIST_DIR}RigFractureGrid.h +${CEE_CURRENT_LIST_DIR}RigFractureCell.h ) -if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) - list (APPEND SOURCE_GROUP_HEADER_FILES - ${CEE_CURRENT_LIST_DIR}RigStimPlanFractureDefinition.h - ${CEE_CURRENT_LIST_DIR}RigFractureGrid.h - ${CEE_CURRENT_LIST_DIR}RigFractureCell.h - ) -endif() - set (SOURCE_GROUP_SOURCE_FILES ${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.cpp @@ -132,17 +127,11 @@ ${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}RigStimPlanFractureDefinition.cpp +${CEE_CURRENT_LIST_DIR}RigFractureGrid.cpp +${CEE_CURRENT_LIST_DIR}RigFractureCell.cpp ) -if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) - list (APPEND SOURCE_GROUP_SOURCE_FILES - ${CEE_CURRENT_LIST_DIR}RigStimPlanFractureDefinition.cpp - ${CEE_CURRENT_LIST_DIR}RigFractureGrid.cpp - ${CEE_CURRENT_LIST_DIR}RigFractureCell.cpp - ) -endif() - - list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES} ) diff --git a/ApplicationCode/UnitTests/CMakeLists_files.cmake b/ApplicationCode/UnitTests/CMakeLists_files.cmake index cceb7d1db9..234b6d798a 100644 --- a/ApplicationCode/UnitTests/CMakeLists_files.cmake +++ b/ApplicationCode/UnitTests/CMakeLists_files.cmake @@ -42,14 +42,9 @@ ${CEE_CURRENT_LIST_DIR}ListKeywordsForObjectsAndFields-Test.cpp ${CEE_CURRENT_LIST_DIR}RiaProjectFileVersionTools-Test.cpp ${CEE_CURRENT_LIST_DIR}RifElementPropertyTableReader-Test.cpp ${CEE_CURRENT_LIST_DIR}RimRelocatePath-Test.cpp +${CEE_CURRENT_LIST_DIR}RigTransmissibilityCondenser-Test.cpp ) -if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) - list (APPEND SOURCE_GROUP_SOURCE_FILES - ${CEE_CURRENT_LIST_DIR}RigTransmissibilityCondenser-Test.cpp - ) -endif() - list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES} ) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1df8eeada..eed49f6124 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -278,29 +278,19 @@ list(APPEND THIRD_PARTY_LIBRARIES ) ################################################################################ -# Prototype feature Fractures +# Eigen ################################################################################ -option (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES "Enable prototype feature Fractures" ON) -mark_as_advanced(FORCE RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) +include_directories(SYSTEM ThirdParty/Eigen-Subset) -if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) +################################################################################ +# clipper +################################################################################ - ################################################################################ - # Eigen - ################################################################################ - include_directories(SYSTEM ThirdParty/Eigen-Subset) +add_subdirectory(ThirdParty/clipper) - ################################################################################ - # clipper - ################################################################################ - - add_subdirectory(ThirdParty/clipper) - - list(APPEND THIRD_PARTY_LIBRARIES - clipper - ) - -endif() # RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES +list(APPEND THIRD_PARTY_LIBRARIES + clipper +) ################################################################################