From bc81437435eeb7d58f67a7cf1a424ee652636cbe Mon Sep 17 00:00:00 2001 From: rubenthoms <69145689+rubenthoms@users.noreply.github.com> Date: Thu, 21 Jan 2021 12:58:46 +0100 Subject: [PATCH] Moved UnitSystem from RiaEclipseUnitTools to RiaDefines. (#7225) * Moved UnitSystem from RiaEclipseUnitTools to RiaDefines. - Renamed UnitSystem to EclipseUnitSystem - Replaced header includes and removed obsolete includes of RiaEclipseUnitTools.h * Moved result name functions into separate file. * Minor cleanup Co-authored-by: rubenthoms Co-authored-by: Magne Sjaastad Co-authored-by: magnesj --- .../Application/CMakeLists_files.cmake | 2 + .../RiaCompletionTypeCalculationScheduler.cpp | 3 +- ApplicationLibCode/Application/RiaDefines.cpp | 396 +---------------- ApplicationLibCode/Application/RiaDefines.h | 64 +-- .../Application/RiaFractureDefines.cpp | 14 +- .../Application/RiaFractureDefines.h | 6 +- .../Application/RiaResultNames.cpp | 409 ++++++++++++++++++ .../Application/RiaResultNames.h | 86 ++++ .../Application/RiaStimPlanModelDefines.h | 2 - .../Application/Tools/RiaEclipseUnitTools.cpp | 46 +- .../Application/Tools/RiaEclipseUnitTools.h | 18 +- .../Tools/RiaImportEclipseCaseTools.cpp | 4 +- .../RicExportFractureCompletionsImpl.cpp | 1 + ...sTransmissibilityCalculationFeatureImp.cpp | 6 +- .../RicMswExportInfo.cpp | 12 +- .../RicMswExportInfo.h | 52 +-- .../RicMswValveAccumulators.cpp | 4 +- .../RicMswValveAccumulators.h | 14 +- ...ellPathExportCompletionDataFeatureImpl.cpp | 6 +- .../RicWellPathExportMswCompletionsImpl.cpp | 12 +- .../RicWellPathExportMswCompletionsImpl.h | 8 +- .../RicWellPathFractureReportItem.cpp | 4 +- .../RicWellPathFractureReportItem.h | 16 +- ...cWellPathFractureTextReportFeatureImpl.cpp | 16 +- .../RicEclipsePropertyFilterFeatureImpl.cpp | 4 +- ...cEclipsePropertyFilterNewInViewFeature.cpp | 3 +- .../RicExportEclipseSectorModelUi.cpp | 4 +- .../ExportCommands/RicExportFaultsFeature.cpp | 5 +- ...vertAllFractureTemplatesToFieldFeature.cpp | 4 +- ...ertAllFractureTemplatesToMetricFeature.cpp | 4 +- ...licateTemplateInOtherUnitSystemFeature.cpp | 12 +- .../RicNewSimWellFractureAtPosFeature.cpp | 2 +- .../RicNewSimWellFractureFeature.cpp | 2 +- .../RicImportFormationNamesFeature.cpp | 14 +- .../RicNewWellBoreStabilityPlotFeature.cpp | 7 +- .../RicWellPathsUnitSystemSettingsImpl.cpp | 2 +- .../RicWellPathsUnitSystemSettingsImpl.h | 2 +- .../RicWellPathsUnitSystemSettingsUi.cpp | 12 +- .../RicWellPathsUnitSystemSettingsUi.h | 4 +- .../FileInterface/RifColumnBasedUserData.cpp | 4 +- .../FileInterface/RifColumnBasedUserData.h | 4 +- .../FileInterface/RifCsvUserData.cpp | 4 +- .../FileInterface/RifCsvUserData.h | 2 +- .../RifDerivedEnsembleReader.cpp | 4 +- .../FileInterface/RifDerivedEnsembleReader.h | 2 +- .../RifEclipseInputFileTools.cpp | 22 +- .../FileInterface/RifEclipseInputFileTools.h | 4 +- .../RifEclipseInputPropertyLoader.cpp | 3 +- .../RifEnsembleStatisticsReader.cpp | 2 +- .../RifEnsembleStatisticsReader.h | 2 +- .../RifKeywordVectorUserData.cpp | 4 +- .../FileInterface/RifKeywordVectorUserData.h | 4 +- .../FileInterface/RifReaderEclipseOutput.cpp | 9 +- .../FileInterface/RifReaderEclipseSummary.cpp | 14 +- .../FileInterface/RifReaderEclipseSummary.h | 8 +- .../FileInterface/RifReaderObservedData.cpp | 4 +- .../FileInterface/RifReaderObservedData.h | 2 +- .../RifStimPlanModelAsymmetricFrkExporter.cpp | 2 + .../RifStimPlanModelDeviationFrkExporter.cpp | 2 + .../RifStimPlanModelPerfsFrkExporter.cpp | 1 + .../FileInterface/RifStimPlanXmlReader.cpp | 72 +-- .../FileInterface/RifStimPlanXmlReader.h | 26 +- .../FileInterface/RifSummaryReaderInterface.h | 6 +- ...FemPartResultCalculatorInitialPorosity.cpp | 2 - .../RigFemPartResultsCollection.cpp | 5 +- .../RivIntersectionResultsColoringTools.cpp | 2 +- .../RivReservoirFaultsPartMgr.cpp | 10 +- .../AnalysisPlots/RimPlotDataFilterItem.cpp | 4 +- .../Annotations/RimAnnotationCollection.h | 2 - .../Annotations/RimAnnotationCollectionBase.h | 2 - .../RimAnnotationGroupCollection.h | 2 - .../CellFilters/RimEclipsePropertyFilter.cpp | 2 +- .../RimEclipsePropertyFilterCollection.cpp | 2 +- .../RimEllipseFractureTemplate.cpp | 26 +- .../Completions/RimEllipseFractureTemplate.h | 2 +- .../RimFishboneWellPathCollection.h | 4 +- .../Completions/RimFishbonesCollection.cpp | 18 +- .../Completions/RimFishbonesCollection.h | 4 +- .../Completions/RimFishbonesMultipleSubs.cpp | 32 +- .../Completions/RimFishbonesMultipleSubs.h | 12 +- .../RimFishbonesPipeProperties.cpp | 20 +- .../Completions/RimFishbonesPipeProperties.h | 4 +- .../Completions/RimFracture.cpp | 20 +- .../Completions/RimFracture.h | 24 +- .../Completions/RimFractureTemplate.cpp | 26 +- .../Completions/RimFractureTemplate.h | 38 +- .../RimFractureTemplateCollection.cpp | 18 +- .../RimFractureTemplateCollection.h | 12 +- .../RimMswCompletionParameters.cpp | 34 +- .../Completions/RimMswCompletionParameters.h | 10 +- .../Completions/RimMultipleValveLocations.cpp | 8 +- .../RimNonDarcyPerforationParameters.h | 2 - .../Completions/RimPerforationInterval.cpp | 20 +- .../Completions/RimPerforationInterval.h | 4 +- .../RimStimPlanFractureTemplate.cpp | 27 +- .../Completions/RimStimPlanFractureTemplate.h | 12 +- .../Completions/RimValveTemplate.cpp | 14 +- .../Completions/RimValveTemplate.h | 23 +- .../RimValveTemplateCollection.cpp | 6 +- .../Completions/RimValveTemplateCollection.h | 10 +- .../Completions/RimWellPathAicdParameters.cpp | 2 +- .../Completions/RimWellPathValve.cpp | 20 +- .../Completions/RimWellPathValve.h | 10 +- .../Flow/RimWellAllocationPlot.cpp | 2 +- .../Flow/RimWellPlotTools.cpp | 26 +- .../ProjectDataModel/Flow/RimWellPlotTools.h | 8 +- .../ProjectDataModel/Flow/RimWellPltPlot.cpp | 39 +- .../RimSaturationPressurePlot.cpp | 4 +- .../RimSaturationPressurePlotCollection.cpp | 2 +- .../ProjectDataModel/RimCellEdgeColors.cpp | 6 +- .../ProjectDataModel/RimDepthTrackPlot.cpp | 4 +- .../ProjectDataModel/RimEclipseCase.cpp | 12 +- .../ProjectDataModel/RimEclipseCellColors.cpp | 6 +- .../ProjectDataModel/RimEclipseResultCase.cpp | 2 +- .../ProjectDataModel/RimEclipseResultCase.h | 10 +- .../RimEclipseResultDefinition.cpp | 47 +- .../RimEclipseStatisticsCase.cpp | 4 +- .../ProjectDataModel/RimEclipseView.cpp | 6 +- .../RimElementVectorResult.cpp | 6 +- .../RimFaultInViewCollection.cpp | 9 +- .../RimGeoMechResultDefinition.cpp | 6 +- .../RimHistogramCalculator.cpp | 35 +- .../RimIdenticalGridCaseGroup.cpp | 4 +- .../RimIntersectionResultDefinition.cpp | 2 +- .../ProjectDataModel/RimProject.cpp | 8 +- .../ProjectDataModel/RimProject.h | 5 +- .../RimRegularLegendConfig.cpp | 4 +- .../RimWellLogExtractionCurve.cpp | 4 +- .../ProjectDataModel/RimWellLogRftCurve.cpp | 5 +- .../ProjectDataModel/RimWellLogTrack.cpp | 4 +- .../ProjectDataModel/RimWellPath.cpp | 4 +- .../ProjectDataModel/RimWellPath.h | 8 +- .../RimWellPathCollection.cpp | 6 +- .../ProjectDataModel/RimWellPathCollection.h | 4 +- .../RimWellPathLateralGeometryDef.cpp | 6 +- .../StimPlanModel/RimStimPlanModel.cpp | 1 - .../RimStimPlanModelCalculator.cpp | 1 + .../StimPlanModel/RimStimPlanModelCurve.cpp | 4 +- ...StimPlanModelElasticPropertyCalculator.cpp | 2 +- .../RimStimPlanModelLayerCalculator.cpp | 2 +- .../RimStimPlanModelStressCalculator.cpp | 1 + .../RimStimPlanModelTemplate.cpp | 1 - .../StimPlanModel/RimStimPlanModelTemplate.h | 1 - .../RimCalculatedSummaryCurveReader.cpp | 4 +- .../Summary/RimCalculatedSummaryCurveReader.h | 2 +- .../Summary/RimEnsembleCurveSet.cpp | 3 +- .../Summary/RimEnsembleStatisticsCase.cpp | 4 +- .../Summary/RimEnsembleStatisticsCase.h | 4 +- .../Summary/RimSummaryCase.cpp | 4 +- .../ProjectDataModel/Summary/RimSummaryCase.h | 4 +- .../Summary/RimSummaryCaseCollection.cpp | 4 +- .../Summary/RimSummaryCaseCollection.h | 4 +- .../Summary/RimSummaryCurve.cpp | 2 +- .../Surfaces/RimSurfaceResultDefinition.cpp | 4 +- .../RigCaseCellResultsData.cpp | 243 ++++++----- .../ReservoirDataModel/RigEclipseCaseData.cpp | 2 +- .../ReservoirDataModel/RigEclipseCaseData.h | 8 +- .../RigEclipseNativeStatCalc.cpp | 3 +- .../RigEclipseNativeVisibleCellsStatCalc.cpp | 3 +- .../RigEclipseResultAddress.h | 3 +- .../RigFlowDiagSolverInterface.cpp | 14 +- .../RigFlowDiagStatCalc.cpp | 2 +- .../RigFlowDiagVisibleCellsStatCalc.cpp | 2 +- .../RigGeoMechWellLogExtractor.cpp | 36 +- .../ReservoirDataModel/RigMainGrid.cpp | 10 +- .../RigResultAccessorFactory.cpp | 34 +- .../RigStimPlanFractureDefinition.cpp | 17 +- .../RigStimPlanFractureDefinition.h | 34 +- .../RigWellLogCurveData.cpp | 1 - .../UnitTests/RifStimPlanXmlReader-Test.cpp | 4 +- .../UserInterface/RiuPvtPlotPanel.cpp | 30 +- .../UserInterface/RiuPvtPlotPanel.h | 10 +- .../RiuRelativePermeabilityPlotPanel.cpp | 11 +- .../RiuRelativePermeabilityPlotPanel.h | 8 +- .../UserInterface/RiuResultTextBuilder.cpp | 24 +- .../RiuSelectionChangedHandler.cpp | 2 +- 176 files changed, 1470 insertions(+), 1365 deletions(-) create mode 100644 ApplicationLibCode/Application/RiaResultNames.cpp create mode 100644 ApplicationLibCode/Application/RiaResultNames.h diff --git a/ApplicationLibCode/Application/CMakeLists_files.cmake b/ApplicationLibCode/Application/CMakeLists_files.cmake index fe85b63507..4076633f8c 100644 --- a/ApplicationLibCode/Application/CMakeLists_files.cmake +++ b/ApplicationLibCode/Application/CMakeLists_files.cmake @@ -20,6 +20,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiaFeatureCommandContext.h ${CMAKE_CURRENT_LIST_DIR}/RiaStringListSerializer.h ${CMAKE_CURRENT_LIST_DIR}/RiaNncDefines.h ${CMAKE_CURRENT_LIST_DIR}/RiaStimPlanModelDefines.h +${CMAKE_CURRENT_LIST_DIR}/RiaResultNames.h ) set (SOURCE_GROUP_SOURCE_FILES @@ -43,6 +44,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiaFeatureCommandContext.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaStringListSerializer.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaNncDefines.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaStimPlanModelDefines.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaResultNames.cpp ) list(APPEND CODE_HEADER_FILES diff --git a/ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.cpp b/ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.cpp index 972d312dca..f2c6e6de03 100644 --- a/ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.cpp +++ b/ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.cpp @@ -86,7 +86,8 @@ void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAnd { eclipseCase->eclipseCaseData() ->results( RiaDefines::PorosityModelType::MATRIX_MODEL ) - ->clearScalarResult( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaDefines::completionTypeResultName() ); + ->clearScalarResult( RiaDefines::ResultCatType::DYNAMIC_NATIVE, + RiaResultNames::completionTypeResultName() ); // Delete virtual perforation transmissibilities, as these are the basis for the computation of completion type eclipseCase->eclipseCaseData()->setVirtualPerforationTransmissibilities( nullptr ); diff --git a/ApplicationLibCode/Application/RiaDefines.cpp b/ApplicationLibCode/Application/RiaDefines.cpp index aceffaae62..a366bc9c98 100644 --- a/ApplicationLibCode/Application/RiaDefines.cpp +++ b/ApplicationLibCode/Application/RiaDefines.cpp @@ -49,6 +49,16 @@ void caf::AppEnum::setUp() setDefault( RiaDefines::DepthUnitType::UNIT_METER ); } +template <> +void caf::AppEnum::setUp() +{ + addItem( RiaDefines::EclipseUnitSystem::UNITS_METRIC, "UNITS_METRIC", "Metric" ); + addItem( RiaDefines::EclipseUnitSystem::UNITS_FIELD, "UNITS_FIELD", "Field" ); + addItem( RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN, "UNITS_UNKNOWN", "Unknown" ); + + setDefault( RiaDefines::EclipseUnitSystem::UNITS_METRIC ); +} + template <> void caf::AppEnum::setUp() { @@ -126,55 +136,6 @@ void caf::AppEnum::setUp() } // namespace caf -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RiaDefines::isPerCellFaceResult( const QString& resultName ) -{ - if ( resultName.compare( RiaDefines::combinedTransmissibilityResultName(), Qt::CaseInsensitive ) == 0 ) - { - return true; - } - else if ( resultName.compare( RiaDefines::combinedMultResultName(), Qt::CaseInsensitive ) == 0 ) - { - return true; - } - else if ( resultName.compare( RiaDefines::ternarySaturationResultName(), Qt::CaseInsensitive ) == 0 ) - { - return true; - } - else if ( resultName.compare( RiaDefines::combinedRiTranResultName(), Qt::CaseInsensitive ) == 0 ) - { - return true; - } - else if ( resultName.compare( RiaDefines::combinedRiMultResultName(), Qt::CaseInsensitive ) == 0 ) - { - return true; - } - else if ( resultName.compare( RiaDefines::combinedRiAreaNormTranResultName(), Qt::CaseInsensitive ) == 0 ) - { - return true; - } - else if ( resultName.compare( RiaDefines::combinedWaterFluxResultName(), Qt::CaseInsensitive ) == 0 ) - { - return true; - } - else if ( resultName.compare( RiaDefines::combinedOilFluxResultName(), Qt::CaseInsensitive ) == 0 ) - { - return true; - } - else if ( resultName.compare( RiaDefines::combinedGasFluxResultName(), Qt::CaseInsensitive ) == 0 ) - { - return true; - } - else if ( resultName.endsWith( "IJK" ) ) - { - return true; - } - - return false; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -183,248 +144,6 @@ bool RiaDefines::isNativeCategoryResult( const QString& resultName ) return resultName.endsWith( "NUM" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::undefinedResultName() -{ - const static QString undefResultName = "None"; - - return undefResultName; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::undefinedGridFaultName() -{ - return "Undefined Grid Faults"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::undefinedGridFaultWithInactiveName() -{ - return "Undefined Grid Faults With Inactive"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::combinedTransmissibilityResultName() -{ - return "TRANXYZ"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::combinedWaterFluxResultName() -{ - return "FLRWATIJK"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::combinedOilFluxResultName() -{ - return "FLROILIJK"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::combinedGasFluxResultName() -{ - return "FLRGASIJK"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::ternarySaturationResultName() -{ - return "TERNARY"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::combinedMultResultName() -{ - return "MULTXYZ"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::eqlnumResultName() -{ - return "EQLNUM"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::riTranXResultName() -{ - return "riTRANX"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::riTranYResultName() -{ - return "riTRANY"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::riTranZResultName() -{ - return "riTRANZ"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::combinedRiTranResultName() -{ - return "riTRANXYZ"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::riMultXResultName() -{ - return "riMULTX"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::riMultYResultName() -{ - return "riMULTY"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::riMultZResultName() -{ - return "riMULTZ"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::combinedRiMultResultName() -{ - return "riMULTXYZ"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::riAreaNormTranXResultName() -{ - return "riTRANXbyArea"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::riAreaNormTranYResultName() -{ - return "riTRANYbyArea"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::riAreaNormTranZResultName() -{ - return "riTRANZbyArea"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::combinedRiAreaNormTranResultName() -{ - return "riTRANXYZbyArea"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::riCellVolumeResultName() -{ - return "riCELLVOLUME"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::riOilVolumeResultName() -{ - return "riOILVOLUME"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::mobilePoreVolumeName() -{ - return "MOBPORV"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::completionTypeResultName() -{ - return "Completion Type"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::formationBinaryAllanResultName() -{ - return "Binary Formation Allan"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::formationAllanResultName() -{ - return "Formation Allan"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -std::set RiaDefines::nncResultNames() -{ - return { combinedTransmissibilityResultName(), - formationAllanResultName(), - formationBinaryAllanResultName(), - combinedWaterFluxResultName(), - combinedGasFluxResultName(), - combinedOilFluxResultName(), - combinedRiAreaNormTranResultName(), - combinedRiMultResultName(), - combinedRiTranResultName() }; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -465,101 +184,6 @@ QString RiaDefines::mockModelBasicInputCase() return "Input Mock Debug Model Simple"; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::activeFormationNamesResultName() -{ - return "Active Formation Names"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::wbsAzimuthResult() -{ - return "Azimuth"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::wbsInclinationResult() -{ - return "Inclination"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::wbsPPResult() -{ - return "PP"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::wbsSHResult() -{ - return "SHMIN"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::wbsSHMkResult() -{ - return "SH_MK"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::wbsOBGResult() -{ - return "OBG"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::wbsFGResult() -{ - return "FG"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RiaDefines::wbsSFGResult() -{ - return "SFG"; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -std::vector RiaDefines::wbsAngleResultNames() -{ - return { wbsAzimuthResult(), wbsInclinationResult() }; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -std::vector RiaDefines::wbsDerivedResultNames() -{ - return { - wbsFGResult(), - wbsOBGResult(), - wbsPPResult(), - wbsSFGResult(), - wbsSHResult(), - wbsSHMkResult(), - }; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Application/RiaDefines.h b/ApplicationLibCode/Application/RiaDefines.h index 06c6707da9..b679594722 100644 --- a/ApplicationLibCode/Application/RiaDefines.h +++ b/ApplicationLibCode/Application/RiaDefines.h @@ -26,6 +26,14 @@ namespace RiaDefines { +enum class EclipseUnitSystem +{ + UNITS_METRIC, + UNITS_FIELD, + UNITS_LAB, + UNITS_UNKNOWN, +}; + enum class ResultCatType { DYNAMIC_NATIVE, @@ -69,48 +77,8 @@ enum class MeshModeType NO_MESH }; -bool isPerCellFaceResult( const QString& resultName ); bool isNativeCategoryResult( const QString& resultName ); -QString undefinedResultName(); -QString undefinedGridFaultName(); -QString undefinedGridFaultWithInactiveName(); -QString combinedTransmissibilityResultName(); -QString combinedWaterFluxResultName(); -QString combinedOilFluxResultName(); -QString combinedGasFluxResultName(); - -QString ternarySaturationResultName(); -QString combinedMultResultName(); - -QString eqlnumResultName(); - -QString riTranXResultName(); -QString riTranYResultName(); -QString riTranZResultName(); -QString combinedRiTranResultName(); - -QString riMultXResultName(); -QString riMultYResultName(); -QString riMultZResultName(); -QString combinedRiMultResultName(); - -QString riAreaNormTranXResultName(); -QString riAreaNormTranYResultName(); -QString riAreaNormTranZResultName(); -QString combinedRiAreaNormTranResultName(); - -QString riCellVolumeResultName(); -QString riOilVolumeResultName(); -QString mobilePoreVolumeName(); - -QString completionTypeResultName(); - -// Fault results -QString formationBinaryAllanResultName(); -QString formationAllanResultName(); -std::set nncResultNames(); - // Mock model text identifiers QString mockModelBasic(); QString mockModelBasicWithResults(); @@ -118,22 +86,6 @@ QString mockModelLargeWithResults(); QString mockModelCustomized(); QString mockModelBasicInputCase(); -QString activeFormationNamesResultName(); - -// Well path derived results -QString wbsAzimuthResult(); -QString wbsInclinationResult(); -QString wbsPPResult(); -QString wbsSHResult(); -QString wbsSHMkResult(); -QString wbsOBGResult(); -QString wbsFGResult(); -QString wbsSFGResult(); - -// List of well path derived results -std::vector wbsAngleResultNames(); -std::vector wbsDerivedResultNames(); - // Units and conversions enum class DepthUnitType { diff --git a/ApplicationLibCode/Application/RiaFractureDefines.cpp b/ApplicationLibCode/Application/RiaFractureDefines.cpp index 63a4058498..acf18d553b 100644 --- a/ApplicationLibCode/Application/RiaFractureDefines.cpp +++ b/ApplicationLibCode/Application/RiaFractureDefines.cpp @@ -29,13 +29,13 @@ QString RiaDefines::conductivityResultName() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RiaDefines::unitStringConductivity( RiaEclipseUnitTools::UnitSystem unitSystem ) +QString RiaDefines::unitStringConductivity( RiaDefines::EclipseUnitSystem unitSystem ) { switch ( unitSystem ) { - case RiaEclipseUnitTools::UnitSystem::UNITS_METRIC: + case RiaDefines::EclipseUnitSystem::UNITS_METRIC: return "md-m"; - case RiaEclipseUnitTools::UnitSystem::UNITS_FIELD: + case RiaDefines::EclipseUnitSystem::UNITS_FIELD: return "md-ft"; default: return ""; @@ -45,15 +45,15 @@ QString RiaDefines::unitStringConductivity( RiaEclipseUnitTools::UnitSystem unit //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RiaDefines::nonDarcyFlowAlpha( RiaEclipseUnitTools::UnitSystem unitSystem ) +double RiaDefines::nonDarcyFlowAlpha( RiaDefines::EclipseUnitSystem unitSystem ) { switch ( unitSystem ) { - case RiaEclipseUnitTools::UnitSystem::UNITS_METRIC: + case RiaDefines::EclipseUnitSystem::UNITS_METRIC: return 2.24460e-10; - case RiaEclipseUnitTools::UnitSystem::UNITS_FIELD: + case RiaDefines::EclipseUnitSystem::UNITS_FIELD: return 6.83352e-8; - case RiaEclipseUnitTools::UnitSystem::UNITS_LAB: + case RiaDefines::EclipseUnitSystem::UNITS_LAB: return 5.41375E-11; // case RiaEclipseUnitTools::PVT_METRIC: return 2.25533E-10; diff --git a/ApplicationLibCode/Application/RiaFractureDefines.h b/ApplicationLibCode/Application/RiaFractureDefines.h index eb4819afc8..3a9b1dfd98 100644 --- a/ApplicationLibCode/Application/RiaFractureDefines.h +++ b/ApplicationLibCode/Application/RiaFractureDefines.h @@ -18,16 +18,16 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include namespace RiaDefines { QString conductivityResultName(); -QString unitStringConductivity( RiaEclipseUnitTools::UnitSystem unitSystem ); +QString unitStringConductivity( RiaDefines::EclipseUnitSystem unitSystem ); -double nonDarcyFlowAlpha( RiaEclipseUnitTools::UnitSystem unitSystem ); +double nonDarcyFlowAlpha( RiaDefines::EclipseUnitSystem unitSystem ); QString faciesColorLegendName(); QString rockTypeColorLegendName(); diff --git a/ApplicationLibCode/Application/RiaResultNames.cpp b/ApplicationLibCode/Application/RiaResultNames.cpp new file mode 100644 index 0000000000..f2fbb32215 --- /dev/null +++ b/ApplicationLibCode/Application/RiaResultNames.cpp @@ -0,0 +1,409 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2011- Statoil ASA +// Copyright (C) 2013- Ceetron Solutions AS +// Copyright (C) 2011-2012 Ceetron AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#include "RiaResultNames.h" + +#include "cafAppEnum.h" + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool RiaResultNames::isPerCellFaceResult( const QString& resultName ) +{ + if ( resultName.compare( RiaResultNames::combinedTransmissibilityResultName(), Qt::CaseInsensitive ) == 0 ) + { + return true; + } + else if ( resultName.compare( RiaResultNames::combinedMultResultName(), Qt::CaseInsensitive ) == 0 ) + { + return true; + } + else if ( resultName.compare( RiaResultNames::ternarySaturationResultName(), Qt::CaseInsensitive ) == 0 ) + { + return true; + } + else if ( resultName.compare( RiaResultNames::combinedRiTranResultName(), Qt::CaseInsensitive ) == 0 ) + { + return true; + } + else if ( resultName.compare( RiaResultNames::combinedRiMultResultName(), Qt::CaseInsensitive ) == 0 ) + { + return true; + } + else if ( resultName.compare( RiaResultNames::combinedRiAreaNormTranResultName(), Qt::CaseInsensitive ) == 0 ) + { + return true; + } + else if ( resultName.compare( RiaResultNames::combinedWaterFluxResultName(), Qt::CaseInsensitive ) == 0 ) + { + return true; + } + else if ( resultName.compare( RiaResultNames::combinedOilFluxResultName(), Qt::CaseInsensitive ) == 0 ) + { + return true; + } + else if ( resultName.compare( RiaResultNames::combinedGasFluxResultName(), Qt::CaseInsensitive ) == 0 ) + { + return true; + } + else if ( resultName.endsWith( "IJK" ) ) + { + return true; + } + + return false; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::activeFormationNamesResultName() +{ + return "Active Formation Names"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::undefinedResultName() +{ + const static QString undefResultName = "None"; + + return undefResultName; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::undefinedGridFaultName() +{ + return "Undefined Grid Faults"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::undefinedGridFaultWithInactiveName() +{ + return "Undefined Grid Faults With Inactive"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::combinedTransmissibilityResultName() +{ + return "TRANXYZ"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::combinedWaterFluxResultName() +{ + return "FLRWATIJK"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::combinedOilFluxResultName() +{ + return "FLROILIJK"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::combinedGasFluxResultName() +{ + return "FLRGASIJK"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::ternarySaturationResultName() +{ + return "TERNARY"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::combinedMultResultName() +{ + return "MULTXYZ"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::eqlnumResultName() +{ + return "EQLNUM"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::riTranXResultName() +{ + return "riTRANX"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::riTranYResultName() +{ + return "riTRANY"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::riTranZResultName() +{ + return "riTRANZ"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::combinedRiTranResultName() +{ + return "riTRANXYZ"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::riMultXResultName() +{ + return "riMULTX"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::riMultYResultName() +{ + return "riMULTY"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::riMultZResultName() +{ + return "riMULTZ"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::combinedRiMultResultName() +{ + return "riMULTXYZ"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::riAreaNormTranXResultName() +{ + return "riTRANXbyArea"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::riAreaNormTranYResultName() +{ + return "riTRANYbyArea"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::riAreaNormTranZResultName() +{ + return "riTRANZbyArea"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::combinedRiAreaNormTranResultName() +{ + return "riTRANXYZbyArea"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::riCellVolumeResultName() +{ + return "riCELLVOLUME"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::riOilVolumeResultName() +{ + return "riOILVOLUME"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::mobilePoreVolumeName() +{ + return "MOBPORV"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::completionTypeResultName() +{ + return "Completion Type"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::formationBinaryAllanResultName() +{ + return "Binary Formation Allan"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::formationAllanResultName() +{ + return "Formation Allan"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::wbsAzimuthResult() +{ + return "Azimuth"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::wbsInclinationResult() +{ + return "Inclination"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::wbsPPResult() +{ + return "PP"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::wbsSHResult() +{ + return "SHMIN"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::wbsSHMkResult() +{ + return "SH_MK"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::wbsOBGResult() +{ + return "OBG"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::wbsFGResult() +{ + return "FG"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::wbsSFGResult() +{ + return "SFG"; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +std::set RiaResultNames::nncResultNames() +{ + return { combinedTransmissibilityResultName(), + formationAllanResultName(), + formationBinaryAllanResultName(), + combinedWaterFluxResultName(), + combinedGasFluxResultName(), + combinedOilFluxResultName(), + combinedRiAreaNormTranResultName(), + combinedRiMultResultName(), + combinedRiTranResultName() }; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +std::vector RiaResultNames::wbsAngleResultNames() +{ + return { wbsAzimuthResult(), wbsInclinationResult() }; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +std::vector RiaResultNames::wbsDerivedResultNames() +{ + return { + wbsFGResult(), + wbsOBGResult(), + wbsPPResult(), + wbsSFGResult(), + wbsSHResult(), + wbsSHMkResult(), + }; +} diff --git a/ApplicationLibCode/Application/RiaResultNames.h b/ApplicationLibCode/Application/RiaResultNames.h new file mode 100644 index 0000000000..c0dc2a34d8 --- /dev/null +++ b/ApplicationLibCode/Application/RiaResultNames.h @@ -0,0 +1,86 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2011- Statoil ASA +// Copyright (C) 2013- Ceetron Solutions AS +// Copyright (C) 2011-2012 Ceetron AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include +#include +#include + +namespace RiaResultNames +{ +bool isPerCellFaceResult( const QString& resultName ); + +QString undefinedResultName(); +QString undefinedGridFaultName(); +QString undefinedGridFaultWithInactiveName(); +QString combinedTransmissibilityResultName(); +QString combinedWaterFluxResultName(); +QString combinedOilFluxResultName(); +QString combinedGasFluxResultName(); + +QString ternarySaturationResultName(); +QString combinedMultResultName(); + +QString eqlnumResultName(); + +QString riTranXResultName(); +QString riTranYResultName(); +QString riTranZResultName(); +QString combinedRiTranResultName(); + +QString riMultXResultName(); +QString riMultYResultName(); +QString riMultZResultName(); +QString combinedRiMultResultName(); + +QString riAreaNormTranXResultName(); +QString riAreaNormTranYResultName(); +QString riAreaNormTranZResultName(); +QString combinedRiAreaNormTranResultName(); + +QString riCellVolumeResultName(); +QString riOilVolumeResultName(); +QString mobilePoreVolumeName(); + +QString completionTypeResultName(); + +// Well path derived results +QString wbsAzimuthResult(); +QString wbsInclinationResult(); +QString wbsPPResult(); +QString wbsSHResult(); +QString wbsSHMkResult(); +QString wbsOBGResult(); +QString wbsFGResult(); +QString wbsSFGResult(); + +// Fault results +QString formationBinaryAllanResultName(); +QString formationAllanResultName(); +std::set nncResultNames(); + +// List of well path derived results +std::vector wbsAngleResultNames(); +std::vector wbsDerivedResultNames(); + +QString activeFormationNamesResultName(); + +}; // namespace RiaResultNames diff --git a/ApplicationLibCode/Application/RiaStimPlanModelDefines.h b/ApplicationLibCode/Application/RiaStimPlanModelDefines.h index 7e13f391f7..cb785430ba 100644 --- a/ApplicationLibCode/Application/RiaStimPlanModelDefines.h +++ b/ApplicationLibCode/Application/RiaStimPlanModelDefines.h @@ -18,8 +18,6 @@ #pragma once -#include "RiaEclipseUnitTools.h" - #include namespace RiaDefines diff --git a/ApplicationLibCode/Application/Tools/RiaEclipseUnitTools.cpp b/ApplicationLibCode/Application/Tools/RiaEclipseUnitTools.cpp index ab95acd2f6..96ce975e31 100644 --- a/ApplicationLibCode/Application/Tools/RiaEclipseUnitTools.cpp +++ b/ApplicationLibCode/Application/Tools/RiaEclipseUnitTools.cpp @@ -23,23 +23,10 @@ #include "cvfAssert.h" #include -namespace caf -{ -template <> -void RiaEclipseUnitTools::UnitSystemType::setUp() -{ - addItem( RiaEclipseUnitTools::UnitSystem::UNITS_METRIC, "UNITS_METRIC", "Metric" ); - addItem( RiaEclipseUnitTools::UnitSystem::UNITS_FIELD, "UNITS_FIELD", "Field" ); - addItem( RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN, "UNITS_UNKNOWN", "Unknown" ); - - setDefault( RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ); -} -} // namespace caf - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RiaEclipseUnitTools::darcysConstant( UnitSystem unitSystem ) +double RiaEclipseUnitTools::darcysConstant( RiaDefines::EclipseUnitSystem unitSystem ) { // See "Cartesian transmissibility calculations" in the "Eclipse Technical Description" // CDARCY Darcys constant @@ -49,9 +36,9 @@ double RiaEclipseUnitTools::darcysConstant( UnitSystem unitSystem ) // = 0.00864 (PVT - M) switch ( unitSystem ) { - case UnitSystem::UNITS_FIELD: + case RiaDefines::EclipseUnitSystem::UNITS_FIELD: return 0.001127; - case UnitSystem::UNITS_METRIC: + case RiaDefines::EclipseUnitSystem::UNITS_METRIC: return 0.008527; default: CVF_ASSERT( false ); @@ -62,20 +49,20 @@ double RiaEclipseUnitTools::darcysConstant( UnitSystem unitSystem ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaDefines::DepthUnitType RiaEclipseUnitTools::depthUnit( UnitSystem unit ) +RiaDefines::DepthUnitType RiaEclipseUnitTools::depthUnit( RiaDefines::EclipseUnitSystem unit ) { switch ( unit ) { - case RiaEclipseUnitTools::UnitSystem::UNITS_METRIC: + case RiaDefines::EclipseUnitSystem::UNITS_METRIC: return RiaDefines::DepthUnitType::UNIT_METER; break; - case RiaEclipseUnitTools::UnitSystem::UNITS_FIELD: + case RiaDefines::EclipseUnitSystem::UNITS_FIELD: return RiaDefines::DepthUnitType::UNIT_FEET; break; - case RiaEclipseUnitTools::UnitSystem::UNITS_LAB: + case RiaDefines::EclipseUnitSystem::UNITS_LAB: return RiaDefines::DepthUnitType::UNIT_NONE; break; - case RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN: + case RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN: return RiaDefines::DepthUnitType::UNIT_NONE; break; default: @@ -88,7 +75,8 @@ RiaDefines::DepthUnitType RiaEclipseUnitTools::depthUnit( UnitSystem unit ) /// Convert Gas to oil equivalents /// If field unit, the Gas is in Mega ft^3 while the others are in [stb] (barrel) //-------------------------------------------------------------------------------------------------- -double RiaEclipseUnitTools::convertSurfaceGasFlowRateToOilEquivalents( UnitSystem caseUnitSystem, double eclGasFlowRate ) +double RiaEclipseUnitTools::convertSurfaceGasFlowRateToOilEquivalents( RiaDefines::EclipseUnitSystem caseUnitSystem, + double eclGasFlowRate ) { /// Unused Gas to Barrel conversion : /// we convert gas to stb as well. Based on @@ -102,9 +90,9 @@ double RiaEclipseUnitTools::convertSurfaceGasFlowRateToOilEquivalents( UnitSyste double oilEquivalentGasRate = HUGE_VAL; - if ( caseUnitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + if ( caseUnitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) oilEquivalentGasRate = fieldGasToOilEquivalent * eclGasFlowRate; - if ( caseUnitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( caseUnitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) oilEquivalentGasRate = metricGasToOilEquivalent * eclGasFlowRate; return oilEquivalentGasRate; @@ -113,17 +101,17 @@ double RiaEclipseUnitTools::convertSurfaceGasFlowRateToOilEquivalents( UnitSyste //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RiaEclipseUnitTools::unitStringPressure( UnitSystem unitSystem ) +QString RiaEclipseUnitTools::unitStringPressure( RiaDefines::EclipseUnitSystem unitSystem ) { switch ( unitSystem ) { - case RiaEclipseUnitTools::UnitSystem::UNITS_METRIC: + case RiaDefines::EclipseUnitSystem::UNITS_METRIC: return "barsa"; - case RiaEclipseUnitTools::UnitSystem::UNITS_FIELD: + case RiaDefines::EclipseUnitSystem::UNITS_FIELD: return "psia"; - case RiaEclipseUnitTools::UnitSystem::UNITS_LAB: + case RiaDefines::EclipseUnitSystem::UNITS_LAB: return "atma"; - case RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN: + case RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN: return ""; default: return ""; diff --git a/ApplicationLibCode/Application/Tools/RiaEclipseUnitTools.h b/ApplicationLibCode/Application/Tools/RiaEclipseUnitTools.h index f2390ca932..d7331ba7f8 100644 --- a/ApplicationLibCode/Application/Tools/RiaEclipseUnitTools.h +++ b/ApplicationLibCode/Application/Tools/RiaEclipseUnitTools.h @@ -24,16 +24,6 @@ class RiaEclipseUnitTools { public: - enum class UnitSystem - { - UNITS_METRIC, - UNITS_FIELD, - UNITS_LAB, - UNITS_UNKNOWN, - }; - - typedef caf::AppEnum UnitSystemType; - static double feetPerMeter() { return 3.2808399; } static double meterPerFeet() { return 0.3048000; } @@ -52,13 +42,13 @@ public: static double barPerMeterToPsiPerFeet( double barPerMeter ) { return barPerMeter * 4.42075; } static double gigaPascalToPascal( double gigaPascal ) { return gigaPascal * 1.0e9; } - static double darcysConstant( UnitSystem unitSystem ); + static double darcysConstant( RiaDefines::EclipseUnitSystem unitSystem ); - static RiaDefines::DepthUnitType depthUnit( UnitSystem unit ); + static RiaDefines::DepthUnitType depthUnit( RiaDefines::EclipseUnitSystem unit ); - static double convertSurfaceGasFlowRateToOilEquivalents( UnitSystem, double eclGasFlowRate ); + static double convertSurfaceGasFlowRateToOilEquivalents( RiaDefines::EclipseUnitSystem, double eclGasFlowRate ); - static QString unitStringPressure( UnitSystem unitSystem ); + static QString unitStringPressure( RiaDefines::EclipseUnitSystem unitSystem ); static double convertToMeter( double sourceValue, const QString& unitText ); static double convertToFeet( double sourceValue, const QString& unitText ); diff --git a/ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp b/ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp index c34d93d971..7576d84efc 100644 --- a/ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp +++ b/ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp @@ -275,7 +275,7 @@ bool RiaImportEclipseCaseTools::openEclipseInputCaseFromFileNames( const QString if ( !riv->cellResult()->hasResult() ) { - riv->cellResult()->setResultVariable( RiaDefines::undefinedResultName() ); + riv->cellResult()->setResultVariable( RiaResultNames::undefinedResultName() ); } analysisModels->updateConnectedEditors(); @@ -342,7 +342,7 @@ int RiaImportEclipseCaseTools::openEclipseCaseShowTimeStepFilterImpl( const QStr if ( !riv->cellResult()->hasResult() ) { - riv->cellResult()->setResultVariable( RiaDefines::undefinedResultName() ); + riv->cellResult()->setResultVariable( RiaResultNames::undefinedResultName() ); } analysisModels->updateConnectedEditors(); diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp b/ApplicationLibCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp index 90c5d1a806..e0b76c7178 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp @@ -20,6 +20,7 @@ #include "RicWellPathFractureReportItem.h" +#include "RiaEclipseUnitTools.h" #include "RiaLogging.h" #include "RiaQDateTimeTools.h" #include "RiaSummaryTools.h" diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp b/ApplicationLibCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp index c7e222e3ac..ab47357a48 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp @@ -209,8 +209,8 @@ void RicFishbonesTransmissibilityCalculationFeatureImp::findFishboneLateralsWell RicMswExportInfo exportInfo = RicWellPathExportMswCompletionsImpl::generateFishbonesMswExportInfo( settings.caseToApply(), wellPath, false ); - RiaEclipseUnitTools::UnitSystem unitSystem = caseData->unitsType(); - bool isMainBore = false; + RiaDefines::EclipseUnitSystem unitSystem = caseData->unitsType(); + bool isMainBore = false; for ( std::shared_ptr location : exportInfo.segments() ) { @@ -284,7 +284,7 @@ void RicFishbonesTransmissibilityCalculationFeatureImp::findFishboneImportedLate const RimWellPath* wellPath, const RicExportCompletionDataSettingsUi& settings ) { - RiaEclipseUnitTools::UnitSystem unitSystem = settings.caseToApply->eclipseCaseData()->unitsType(); + RiaDefines::EclipseUnitSystem unitSystem = settings.caseToApply->eclipseCaseData()->unitsType(); if ( !wellPath ) return; if ( !wellPath->wellPathGeometry() ) return; diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicMswExportInfo.cpp b/ApplicationLibCode/Commands/CompletionExportCommands/RicMswExportInfo.cpp index 5cb04a8d84..9bd21bdb42 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicMswExportInfo.cpp +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicMswExportInfo.cpp @@ -31,11 +31,11 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicMswExportInfo::RicMswExportInfo( const RimWellPath* wellPath, - RiaEclipseUnitTools::UnitSystem unitSystem, - double initialMD, - const QString& lengthAndDepthText, - const QString& pressureDropText ) +RicMswExportInfo::RicMswExportInfo( const RimWellPath* wellPath, + RiaDefines::EclipseUnitSystem unitSystem, + double initialMD, + const QString& lengthAndDepthText, + const QString& pressureDropText ) : m_wellPath( wellPath ) , m_initialMD( initialMD ) , m_unitSystem( unitSystem ) @@ -117,7 +117,7 @@ double RicMswExportInfo::initialTVD() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RicMswExportInfo::unitSystem() const +RiaDefines::EclipseUnitSystem RicMswExportInfo::unitSystem() const { return m_unitSystem; } diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicMswExportInfo.h b/ApplicationLibCode/Commands/CompletionExportCommands/RicMswExportInfo.h index ecf320ea85..d1ae94315f 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicMswExportInfo.h +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicMswExportInfo.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RicMswSegment.h" @@ -35,11 +35,11 @@ class RimFishbonesMultipleSubs; class RicMswExportInfo { public: - RicMswExportInfo( const RimWellPath* wellPath, - RiaEclipseUnitTools::UnitSystem unitSystem, - double initialMD, - const QString& lengthAndDepthText, - const QString& pressureDropText ); + RicMswExportInfo( const RimWellPath* wellPath, + RiaDefines::EclipseUnitSystem unitSystem, + double initialMD, + const QString& lengthAndDepthText, + const QString& pressureDropText ); void setLinerDiameter( double linerDiameter ); void setRoughnessFactor( double roughnessFactor ); @@ -48,31 +48,31 @@ public: void addSegment( std::shared_ptr location ); void sortSegments(); - const RimWellPath* wellPath() const; - RiaEclipseUnitTools::UnitSystem unitSystem() const; - double initialMD() const; - double initialTVD() const; - double topWellBoreVolume() const; - double linerDiameter() const; - double roughnessFactor() const; - QString lengthAndDepthText() const; - QString pressureDropText() const; - bool hasSubGridIntersections() const; - static double defaultDoubleValue(); + const RimWellPath* wellPath() const; + RiaDefines::EclipseUnitSystem unitSystem() const; + double initialMD() const; + double initialTVD() const; + double topWellBoreVolume() const; + double linerDiameter() const; + double roughnessFactor() const; + QString lengthAndDepthText() const; + QString pressureDropText() const; + bool hasSubGridIntersections() const; + static double defaultDoubleValue(); const std::vector>& segments() const; std::vector>& segments(); private: - const RimWellPath* m_wellPath; - RiaEclipseUnitTools::UnitSystem m_unitSystem; - double m_initialMD; - double m_topWellBoreVolume; - double m_linerDiameter; - double m_roughnessFactor; - QString m_lengthAndDepthText; - QString m_pressureDropText; - bool m_hasSubGridIntersections; + const RimWellPath* m_wellPath; + RiaDefines::EclipseUnitSystem m_unitSystem; + double m_initialMD; + double m_topWellBoreVolume; + double m_linerDiameter; + double m_roughnessFactor; + QString m_lengthAndDepthText; + QString m_pressureDropText; + bool m_hasSubGridIntersections; std::vector> m_segments; }; diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicMswValveAccumulators.cpp b/ApplicationLibCode/Commands/CompletionExportCommands/RicMswValveAccumulators.cpp index b71bbb2fa0..f793cfd441 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicMswValveAccumulators.cpp +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicMswValveAccumulators.cpp @@ -27,7 +27,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicMswICDAccumulator::RicMswICDAccumulator( std::shared_ptr valve, RiaEclipseUnitTools::UnitSystem unitSystem ) +RicMswICDAccumulator::RicMswICDAccumulator( std::shared_ptr valve, RiaDefines::EclipseUnitSystem unitSystem ) : RicMswValveAccumulator( valve, unitSystem ) , m_areaSum( 0.0 ) { @@ -84,7 +84,7 @@ void RicMswICDAccumulator::applyToSuperValve() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicMswAICDAccumulator::RicMswAICDAccumulator( std::shared_ptr valve, RiaEclipseUnitTools::UnitSystem unitSystem ) +RicMswAICDAccumulator::RicMswAICDAccumulator( std::shared_ptr valve, RiaDefines::EclipseUnitSystem unitSystem ) : RicMswValveAccumulator( valve, unitSystem ) , m_deviceOpen( false ) , m_accumulatedLength( 0.0 ) diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicMswValveAccumulators.h b/ApplicationLibCode/Commands/CompletionExportCommands/RicMswValveAccumulators.h index 19222368b7..4f2b9baedf 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicMswValveAccumulators.h +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicMswValveAccumulators.h @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RiaWeightedMeanCalculator.h" #include "RimWellPathAicdParameters.h" @@ -33,7 +33,7 @@ class RicMswValve; class RicMswValveAccumulator { public: - RicMswValveAccumulator( std::shared_ptr valve, RiaEclipseUnitTools::UnitSystem unitSystem ) + RicMswValveAccumulator( std::shared_ptr valve, RiaDefines::EclipseUnitSystem unitSystem ) : m_valve( valve ) , m_unitSystem( unitSystem ) , m_valid( false ) @@ -47,9 +47,9 @@ public: std::shared_ptr superValve() const { return m_valve; } protected: - std::shared_ptr m_valve; - RiaEclipseUnitTools::UnitSystem m_unitSystem; - bool m_valid; + std::shared_ptr m_valve; + RiaDefines::EclipseUnitSystem m_unitSystem; + bool m_valid; }; //================================================================================================== @@ -58,7 +58,7 @@ protected: class RicMswICDAccumulator : public RicMswValveAccumulator { public: - RicMswICDAccumulator( std::shared_ptr valve, RiaEclipseUnitTools::UnitSystem unitSystem ); + RicMswICDAccumulator( std::shared_ptr valve, RiaDefines::EclipseUnitSystem unitSystem ); bool accumulateValveParameters( const RimWellPathValve* wellPathValve, double overlapLength, double perforationCompsegsLength ) override; @@ -75,7 +75,7 @@ private: class RicMswAICDAccumulator : public RicMswValveAccumulator { public: - RicMswAICDAccumulator( std::shared_ptr valve, RiaEclipseUnitTools::UnitSystem unitSystem ); + RicMswAICDAccumulator( std::shared_ptr valve, RiaDefines::EclipseUnitSystem unitSystem ); bool accumulateValveParameters( const RimWellPathValve* wellPathValve, double overlapLength, double perforationCompsegsLength ) override; diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp index ec6450b36b..8e81fb584c 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp @@ -1155,7 +1155,7 @@ std::vector RicWellPathExportCompletionDataFeatureImpl::gener const std::vector& intervals, const RicExportCompletionDataSettingsUi& settings ) { - RiaEclipseUnitTools::UnitSystem unitSystem = settings.caseToApply->eclipseCaseData()->unitsType(); + RiaDefines::EclipseUnitSystem unitSystem = settings.caseToApply->eclipseCaseData()->unitsType(); std::vector completionData; @@ -1608,8 +1608,8 @@ double RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityAsEc double permy = permyAccessObject->cellScalarGlobIdx( globalCellIndex ); double permz = permzAccessObject->cellScalarGlobIdx( globalCellIndex ); - RiaEclipseUnitTools::UnitSystem units = eclipseCaseData->unitsType(); - double darcy = RiaEclipseUnitTools::darcysConstant( units ); + RiaDefines::EclipseUnitSystem units = eclipseCaseData->unitsType(); + double darcy = RiaEclipseUnitTools::darcysConstant( units ); double trans = cvf::UNDEFINED_DOUBLE; if ( direction == CellDirection::DIR_I ) diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp index eb4a4918f9..0cde9a0e5d 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp @@ -843,7 +843,7 @@ RicMswExportInfo RicWellPathExportMswCompletionsImpl::generateFishbonesMswExport const std::vector& fishbonesSubs, bool enableSegmentSplitting ) { - RiaEclipseUnitTools::UnitSystem unitSystem = caseToApply->eclipseCaseData()->unitsType(); + RiaDefines::EclipseUnitSystem unitSystem = caseToApply->eclipseCaseData()->unitsType(); RicMswExportInfo exportInfo( wellPath, unitSystem, @@ -937,7 +937,7 @@ RicMswExportInfo const RigMainGrid* grid = caseToApply->eclipseCaseData()->mainGrid(); const RigActiveCellInfo* activeCellInfo = caseToApply->eclipseCaseData()->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL ); - RiaEclipseUnitTools::UnitSystem unitSystem = caseToApply->eclipseCaseData()->unitsType(); + RiaDefines::EclipseUnitSystem unitSystem = caseToApply->eclipseCaseData()->unitsType(); auto wellPathGeometry = wellPath->wellPathGeometry(); CVF_ASSERT( wellPathGeometry ); @@ -1058,7 +1058,7 @@ RicMswExportInfo RicWellPathExportMswCompletionsImpl::generatePerforationsMswExp int timeStep, const std::vector& perforationIntervals ) { - RiaEclipseUnitTools::UnitSystem unitSystem = eclipseCase->eclipseCaseData()->unitsType(); + RiaDefines::EclipseUnitSystem unitSystem = eclipseCase->eclipseCaseData()->unitsType(); const RigActiveCellInfo* activeCellInfo = eclipseCase->eclipseCaseData()->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL ); @@ -1329,7 +1329,7 @@ void RicWellPathExportMswCompletionsImpl::createValveCompletions( std::vector>& mainBoreSegments, const std::vector& perforationIntervals, const RimWellPath* wellPath, - RiaEclipseUnitTools::UnitSystem unitSystem ) + RiaDefines::EclipseUnitSystem unitSystem ) { for ( size_t nMainSegment = 0u; nMainSegment < mainBoreSegments.size(); ++nMainSegment ) { @@ -1477,7 +1477,7 @@ void RicWellPathExportMswCompletionsImpl::assignValveContributionsToSuperICDsOrA const std::vector& perforationIntervals, const std::vector& wellPathIntersections, const RigActiveCellInfo* activeCellInfo, - RiaEclipseUnitTools::UnitSystem unitSystem ) + RiaDefines::EclipseUnitSystem unitSystem ) { ValveContributionMap assignedRegularValves; @@ -1586,7 +1586,7 @@ void RicWellPathExportMswCompletionsImpl::assignValveContributionsToSuperICDsOrA void RicWellPathExportMswCompletionsImpl::moveIntersectionsToICVs( const std::vector>& mainBoreSegments, const std::vector& perforationIntervals, - RiaEclipseUnitTools::UnitSystem unitSystem ) + RiaDefines::EclipseUnitSystem unitSystem ) { std::map> icvCompletionMap; diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.h b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.h index c9ecfa4b48..c0eaad9cd7 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.h +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.h @@ -154,18 +154,18 @@ private: static void createValveCompletions( std::vector>& mainBoreSegments, const std::vector& perforationIntervals, const RimWellPath* wellPath, - RiaEclipseUnitTools::UnitSystem unitSystem ); + RiaDefines::EclipseUnitSystem unitSystem ); static void assignValveContributionsToSuperICDsOrAICDs( const std::vector>& mainBoreSegments, const std::vector& perforationIntervals, const std::vector& wellPathIntersections, const RigActiveCellInfo* activeCellInfo, - RiaEclipseUnitTools::UnitSystem unitSystem ); + RiaDefines::EclipseUnitSystem unitSystem ); static void moveIntersectionsToICVs( const std::vector>& mainBoreSegments, const std::vector& perforationIntervals, - RiaEclipseUnitTools::UnitSystem unitSystem ); + RiaDefines::EclipseUnitSystem unitSystem ); static void moveIntersectionsToSuperICDsOrAICDs( MainBoreSegments mainBoreSegments ); @@ -196,7 +196,7 @@ private: bool* foundSubGridIntersections ); static void - assignBranchNumbers( const RimEclipseCase* caseToApply, std::shared_ptr segment, int* branchNum ); + assignBranchNumbers( const RimEclipseCase* caseToApply, std::shared_ptr segment, int* branchNum ); static void assignBranchNumbers( const RimEclipseCase* caseToApply, RicMswExportInfo* exportInfo ); static double tvdFromMeasuredDepth( gsl::not_null wellPath, double measuredDepth ); diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.cpp b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.cpp index ce719be989..e80c5d3afa 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.cpp +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.cpp @@ -117,7 +117,7 @@ QString RicWellPathFractureReportItem::fractureTemplateName() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicWellPathFractureReportItem::setUnitSystem( RiaEclipseUnitTools::UnitSystem unitSystem ) +void RicWellPathFractureReportItem::setUnitSystem( RiaDefines::EclipseUnitSystem unitSystem ) { m_unitSystem = unitSystem; } @@ -145,7 +145,7 @@ void RicWellPathFractureReportItem::setPressureDepletionParameters( bool //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RicWellPathFractureReportItem::unitSystem() const +RiaDefines::EclipseUnitSystem RicWellPathFractureReportItem::unitSystem() const { return m_unitSystem; } diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.h b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.h index bdbeb2b75c..de980f7740 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.h +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include @@ -37,7 +37,7 @@ public: void setWidthAndConductivity( double width, double conductivity ); void setHeightAndHalfLength( double height, double halfLength ); void setAreaWeightedPermeability( double permeability ); - void setUnitSystem( RiaEclipseUnitTools::UnitSystem unitSystem ); + void setUnitSystem( RiaDefines::EclipseUnitSystem unitSystem ); void setPressureDepletionParameters( bool performPressureDepletionScaling, const QString& timeStepString, const QString& wbhpString, @@ -50,7 +50,7 @@ public: QString fractureName() const; QString fractureTemplateName() const; - RiaEclipseUnitTools::UnitSystem unitSystem() const; + RiaDefines::EclipseUnitSystem unitSystem() const; double transmissibility() const; size_t connectionCount() const; @@ -77,11 +77,11 @@ public: bool operator<( const RicWellPathFractureReportItem& other ) const; private: - RiaEclipseUnitTools::UnitSystem m_unitSystem; - QString m_wellPathNameForExport; - QString m_wellPathFracture; - QString m_wellPathFractureTemplate; - double m_mesuredDepth; + RiaDefines::EclipseUnitSystem m_unitSystem; + QString m_wellPathNameForExport; + QString m_wellPathFracture; + QString m_wellPathFractureTemplate; + double m_mesuredDepth; double m_transmissibility; size_t m_connectionCount; diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathFractureTextReportFeatureImpl.cpp b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathFractureTextReportFeatureImpl.cpp index b41a0d47d8..bb7487c86a 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathFractureTextReportFeatureImpl.cpp +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathFractureTextReportFeatureImpl.cpp @@ -313,8 +313,8 @@ QString RicWellPathFractureTextReportFeatureImpl::createStimPlanFractureText( QString tableText; - RiaEclipseUnitTools::UnitSystem unitSystem = stimPlanTemplates.front()->fractureTemplateUnit(); - bool isFieldUnits = unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD; + RiaDefines::EclipseUnitSystem unitSystem = stimPlanTemplates.front()->fractureTemplateUnit(); + bool isFieldUnits = unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD; QTextStream stream( &tableText ); RifTextDataTableFormatter formatter( stream ); @@ -365,8 +365,8 @@ QString RicWellPathFractureTextReportFeatureImpl::createEllipseFractureText( QString tableText; - RiaEclipseUnitTools::UnitSystem unitSystem = ellipseTemplates.front()->fractureTemplateUnit(); - bool isFieldUnits = unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD; + RiaDefines::EclipseUnitSystem unitSystem = ellipseTemplates.front()->fractureTemplateUnit(); + bool isFieldUnits = unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD; QTextStream stream( &tableText ); RifTextDataTableFormatter formatter( stream ); @@ -512,8 +512,8 @@ QString RicWellPathFractureTextReportFeatureImpl::createFractureInstancesText( { if ( fractures.empty() ) return ""; - RiaEclipseUnitTools::UnitSystem unitSystem = fractures.front()->fractureUnit(); // Fix - bool isFieldUnits = unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD; + RiaDefines::EclipseUnitSystem unitSystem = fractures.front()->fractureUnit(); // Fix + bool isFieldUnits = unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD; QString tableText; @@ -621,8 +621,8 @@ QString RicWellPathFractureTextReportFeatureImpl::createFractureCompletionSummar { QString tableText; - RiaEclipseUnitTools::UnitSystem unitSystem = wellPathFractureReportItems.front().unitSystem(); - bool isFieldUnits = unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD; + RiaDefines::EclipseUnitSystem unitSystem = wellPathFractureReportItems.front().unitSystem(); + bool isFieldUnits = unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD; QTextStream stream( &tableText ); RifTextDataTableFormatter formatter( stream ); diff --git a/ApplicationLibCode/Commands/EclipseCommands/RicEclipsePropertyFilterFeatureImpl.cpp b/ApplicationLibCode/Commands/EclipseCommands/RicEclipsePropertyFilterFeatureImpl.cpp index 4b0b1dfca3..eb021bf7d3 100644 --- a/ApplicationLibCode/Commands/EclipseCommands/RicEclipsePropertyFilterFeatureImpl.cpp +++ b/ApplicationLibCode/Commands/EclipseCommands/RicEclipsePropertyFilterFeatureImpl.cpp @@ -19,6 +19,8 @@ #include "RicEclipsePropertyFilterFeatureImpl.h" +#include "RiaResultNames.h" + #include "RimEclipseCellColors.h" #include "RimEclipsePropertyFilter.h" #include "RimEclipsePropertyFilterCollection.h" @@ -120,7 +122,7 @@ void RicEclipsePropertyFilterFeatureImpl::setDefaults( RimEclipsePropertyFilter* propertyFilter->resultDefinition()->setEclipseCase( reservoirView->eclipseCase() ); - if ( !RiaDefines::isPerCellFaceResult( reservoirView->cellResult()->resultVariable() ) ) + if ( !RiaResultNames::isPerCellFaceResult( reservoirView->cellResult()->resultVariable() ) ) { propertyFilter->resultDefinition()->simpleCopy( reservoirView->cellResult() ); } diff --git a/ApplicationLibCode/Commands/EclipseCommands/RicEclipsePropertyFilterNewInViewFeature.cpp b/ApplicationLibCode/Commands/EclipseCommands/RicEclipsePropertyFilterNewInViewFeature.cpp index a8164b20cf..75fa6d3862 100644 --- a/ApplicationLibCode/Commands/EclipseCommands/RicEclipsePropertyFilterNewInViewFeature.cpp +++ b/ApplicationLibCode/Commands/EclipseCommands/RicEclipsePropertyFilterNewInViewFeature.cpp @@ -22,6 +22,7 @@ #include "RicEclipsePropertyFilterNewExec.h" #include "RiaApplication.h" +#include "RiaResultNames.h" #include "Rim3dView.h" #include "RimEclipseCellColors.h" @@ -48,7 +49,7 @@ bool RicEclipsePropertyFilterNewInViewFeature::isCommandEnabled() RimEclipseCellColors* cellColors = eclView->cellResult(); if ( !cellColors ) return false; - if ( RiaDefines::isPerCellFaceResult( cellColors->resultVariable() ) ) return false; + if ( RiaResultNames::isPerCellFaceResult( cellColors->resultVariable() ) ) return false; RimEclipsePropertyFilterCollection* filterCollection = eclView->eclipsePropertyFilterCollection(); if ( filterCollection ) diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp index 41553bc076..087c71fde2 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp @@ -19,6 +19,8 @@ #include "RicExportEclipseSectorModelUi.h" #include "RiaApplication.h" +#include "RiaResultNames.h" + #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigEclipseCaseData.h" @@ -507,7 +509,7 @@ QList //-------------------------------------------------------------------------------------------------- std::set RicExportEclipseSectorModelUi::mainKeywords() { - return { RiaDefines::eqlnumResultName(), "FIPNUM", "NTG", "PERMX", "PERMY", "PERMZ", "PORO", "PVTNUM", "SATNUM", "SWATINIT" }; + return { RiaResultNames::eqlnumResultName(), "FIPNUM", "NTG", "PERMX", "PERMY", "PERMZ", "PORO", "PVTNUM", "SATNUM", "SWATINIT" }; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportFaultsFeature.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportFaultsFeature.cpp index 6b6c2478ab..561b101f07 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportFaultsFeature.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportFaultsFeature.cpp @@ -21,6 +21,7 @@ #include "RiaApplication.h" #include "RiaLogging.h" +#include "RiaResultNames.h" #include "RigEclipseCaseData.h" #include "RigFault.h" @@ -85,8 +86,8 @@ void RicExportFaultsFeature::onActionTriggered( bool isChecked ) QString caseName = eclCase->caseUserDescription(); QString faultName = rimFault->name(); - if ( faultName == RiaDefines::undefinedGridFaultName() ) faultName = "UNDEF"; - if ( faultName == RiaDefines::undefinedGridFaultWithInactiveName() ) faultName = "UNDEF_IA"; + if ( faultName == RiaResultNames::undefinedGridFaultName() ) faultName = "UNDEF"; + if ( faultName == RiaResultNames::undefinedGridFaultWithInactiveName() ) faultName = "UNDEF_IA"; QString baseFilename = "Fault_" + faultName + "_" + caseName; baseFilename = caf::Utils::makeValidFileBasename( baseFilename ); diff --git a/ApplicationLibCode/Commands/FractureCommands/RicConvertAllFractureTemplatesToFieldFeature.cpp b/ApplicationLibCode/Commands/FractureCommands/RicConvertAllFractureTemplatesToFieldFeature.cpp index 6ea5e819a0..0b86d618f1 100644 --- a/ApplicationLibCode/Commands/FractureCommands/RicConvertAllFractureTemplatesToFieldFeature.cpp +++ b/ApplicationLibCode/Commands/FractureCommands/RicConvertAllFractureTemplatesToFieldFeature.cpp @@ -18,7 +18,7 @@ #include "RicConvertAllFractureTemplatesToFieldFeature.h" -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "Rim3dView.h" #include "RimEclipseCase.h" @@ -59,7 +59,7 @@ void RicConvertAllFractureTemplatesToFieldFeature::onActionTriggered( bool isChe for ( auto ellipseFracTemplate : ellipseFracTemplates ) { - if ( ellipseFracTemplate->fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( ellipseFracTemplate->fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { ellipseFracTemplate->changeUnits(); diff --git a/ApplicationLibCode/Commands/FractureCommands/RicConvertAllFractureTemplatesToMetricFeature.cpp b/ApplicationLibCode/Commands/FractureCommands/RicConvertAllFractureTemplatesToMetricFeature.cpp index ff4bb8d92f..0fd14f78b8 100644 --- a/ApplicationLibCode/Commands/FractureCommands/RicConvertAllFractureTemplatesToMetricFeature.cpp +++ b/ApplicationLibCode/Commands/FractureCommands/RicConvertAllFractureTemplatesToMetricFeature.cpp @@ -18,7 +18,7 @@ #include "RicConvertAllFractureTemplatesToMetricFeature.h" -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "Rim3dView.h" #include "RimEclipseCase.h" @@ -60,7 +60,7 @@ void RicConvertAllFractureTemplatesToMetricFeature::onActionTriggered( bool isCh for ( auto ellipseFracTemplate : ellipseFracTemplates ) { - if ( ellipseFracTemplate->fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + if ( ellipseFracTemplate->fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { ellipseFracTemplate->changeUnits(); diff --git a/ApplicationLibCode/Commands/FractureCommands/RicCreateDuplicateTemplateInOtherUnitSystemFeature.cpp b/ApplicationLibCode/Commands/FractureCommands/RicCreateDuplicateTemplateInOtherUnitSystemFeature.cpp index d029021290..2a06ce8d85 100644 --- a/ApplicationLibCode/Commands/FractureCommands/RicCreateDuplicateTemplateInOtherUnitSystemFeature.cpp +++ b/ApplicationLibCode/Commands/FractureCommands/RicCreateDuplicateTemplateInOtherUnitSystemFeature.cpp @@ -18,7 +18,7 @@ #include "RicCreateDuplicateTemplateInOtherUnitSystemFeature.h" -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RicNewEllipseFractureTemplateFeature.h" @@ -66,13 +66,13 @@ void RicCreateDuplicateTemplateInOtherUnitSystemFeature::onActionTriggered( bool fractureTemplateCollection->addFractureTemplate( copyOfTemplate ); auto currentUnit = copyOfTemplate->fractureTemplateUnit(); - if ( currentUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( currentUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { - copyOfTemplate->convertToUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ); + copyOfTemplate->convertToUnitSystem( RiaDefines::EclipseUnitSystem::UNITS_FIELD ); } else { - copyOfTemplate->convertToUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ); + copyOfTemplate->convertToUnitSystem( RiaDefines::EclipseUnitSystem::UNITS_METRIC ); } QString name = copyOfTemplate->name(); @@ -98,11 +98,11 @@ void RicCreateDuplicateTemplateInOtherUnitSystemFeature::setupActionLook( QActio if ( !fractureTemplate ) return; QString destinationUnit; - if ( fractureTemplate->fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( fractureTemplate->fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { destinationUnit += "Field"; } - else if ( fractureTemplate->fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( fractureTemplate->fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { destinationUnit += "Metric"; } diff --git a/ApplicationLibCode/Commands/FractureCommands/RicNewSimWellFractureAtPosFeature.cpp b/ApplicationLibCode/Commands/FractureCommands/RicNewSimWellFractureAtPosFeature.cpp index 6f39ebab71..a9f76af66e 100644 --- a/ApplicationLibCode/Commands/FractureCommands/RicNewSimWellFractureAtPosFeature.cpp +++ b/ApplicationLibCode/Commands/FractureCommands/RicNewSimWellFractureAtPosFeature.cpp @@ -93,7 +93,7 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered( bool isChecked ) fracture->setName( QString( "Fracture_" ) + fracNum ); - auto unitSet = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + auto unitSet = RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; { RimEclipseResultCase* eclipseCase = nullptr; simWell->firstAncestorOrThisOfType( eclipseCase ); diff --git a/ApplicationLibCode/Commands/FractureCommands/RicNewSimWellFractureFeature.cpp b/ApplicationLibCode/Commands/FractureCommands/RicNewSimWellFractureFeature.cpp index d0a646ae8f..85015a824d 100644 --- a/ApplicationLibCode/Commands/FractureCommands/RicNewSimWellFractureFeature.cpp +++ b/ApplicationLibCode/Commands/FractureCommands/RicNewSimWellFractureFeature.cpp @@ -78,7 +78,7 @@ void RicNewSimWellFractureFeature::onActionTriggered( bool isChecked ) fracture->setName( RicFractureNameGenerator::nameForNewFracture() ); - auto unitSet = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + auto unitSet = RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; { RimEclipseResultCase* eclipseCase = nullptr; objHandle->firstAncestorOrThisOfType( eclipseCase ); diff --git a/ApplicationLibCode/Commands/RicImportFormationNamesFeature.cpp b/ApplicationLibCode/Commands/RicImportFormationNamesFeature.cpp index 2299ec8153..6ee33db26b 100644 --- a/ApplicationLibCode/Commands/RicImportFormationNamesFeature.cpp +++ b/ApplicationLibCode/Commands/RicImportFormationNamesFeature.cpp @@ -19,12 +19,18 @@ #include "RicImportFormationNamesFeature.h" #include "RiaApplication.h" +#include "RiaResultNames.h" + #include "RigEclipseCaseData.h" #include "RigFemPartResultsCollection.h" #include "RigFormationNames.h" #include "RigGeoMechCaseData.h" + #include "Rim3dView.h" #include "RimCase.h" +#include "RimColorLegend.h" +#include "RimColorLegendCollection.h" +#include "RimColorLegendItem.h" #include "RimEclipseCase.h" #include "RimEclipseCellColors.h" #include "RimEclipseView.h" @@ -35,12 +41,6 @@ #include "RimGeoMechView.h" #include "RimOilField.h" #include "RimProject.h" -#include "Riu3DMainWindowTools.h" -#include "RiuFileDialogTools.h" - -#include "RimColorLegend.h" -#include "RimColorLegendCollection.h" -#include "RimColorLegendItem.h" #include "RimRegularLegendConfig.h" #include "Riu3DMainWindowTools.h" @@ -218,7 +218,7 @@ void RicImportFormationNamesFeature::setFormationCellResultAndLegend( Rim3dView* if ( eclView ) { eclView->cellResult()->setResultType( RiaDefines::ResultCatType::FORMATION_NAMES ); - eclView->cellResult()->setResultVariable( RiaDefines::activeFormationNamesResultName() ); + eclView->cellResult()->setResultVariable( RiaResultNames::activeFormationNamesResultName() ); legendConfig = eclView->cellResult()->legendConfig(); diff --git a/ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp b/ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp index d871e9f237..8cfddc1678 100644 --- a/ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp +++ b/ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp @@ -20,6 +20,7 @@ #include "RiaColorTables.h" #include "RiaLogging.h" +#include "RiaResultNames.h" #include "RicNewWellLogCurveExtractionFeature.h" #include "RicNewWellLogFileCurveFeature.h" @@ -313,7 +314,7 @@ void RicNewWellBoreStabilityPlotFeature::createStabilityCurvesTrack( RimWellBore stabilityCurvesTrack->setAnnotationDisplay( RiuPlotAnnotationTool::LIGHT_LINES ); stabilityCurvesTrack->setShowRegionLabels( false ); - std::vector resultNames = RiaDefines::wbsDerivedResultNames(); + std::vector resultNames = RiaResultNames::wbsDerivedResultNames(); std::vector colors = { cvf::Color3f::BLUE, cvf::Color3f::BROWN, @@ -341,7 +342,7 @@ void RicNewWellBoreStabilityPlotFeature::createStabilityCurvesTrack( RimWellBore curve->loadDataAndUpdate( false ); curve->setSmoothCurve( true ); curve->setSmoothingThreshold( 0.002 ); - if ( resultNames[i] == RiaDefines::wbsSHMkResult() ) + if ( resultNames[i] == RiaResultNames::wbsSHMkResult() ) { curve->setCurveVisibility( false ); } @@ -380,7 +381,7 @@ void RicNewWellBoreStabilityPlotFeature::createAnglesTrack( RimWellBoreStability RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack( false, "Well Path Angles", plot ); double minValue = 360.0, maxValue = 0.0; const double angleIncrement = 90.0; - std::vector resultNames = RiaDefines::wbsAngleResultNames(); + std::vector resultNames = RiaResultNames::wbsAngleResultNames(); std::vector colors = { cvf::Color3f::GREEN, cvf::Color3f::DARK_ORANGE }; diff --git a/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsImpl.cpp b/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsImpl.cpp index 0d66cb0802..9e64073410 100644 --- a/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsImpl.cpp +++ b/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsImpl.cpp @@ -29,7 +29,7 @@ //-------------------------------------------------------------------------------------------------- bool RicWellPathsUnitSystemSettingsImpl::ensureHasUnitSystem( RimWellPath* wellPath ) { - if ( wellPath->unitSystem() != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ) + if ( wellPath->unitSystem() != RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ) { return true; } diff --git a/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsImpl.h b/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsImpl.h index 4d92c527ec..75c153786a 100644 --- a/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsImpl.h +++ b/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsImpl.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RimWellPath.h" //================================================================================================== diff --git a/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.cpp b/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.cpp index 7b6030e388..165caff678 100644 --- a/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.cpp +++ b/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.cpp @@ -40,12 +40,12 @@ QList QList options; if ( fieldNeedingOptions == &unitSystem ) { - options.push_back( caf::PdmOptionItemInfo( RiaEclipseUnitTools::UnitSystemType::uiText( - RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ), - RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) ); - options.push_back( caf::PdmOptionItemInfo( RiaEclipseUnitTools::UnitSystemType::uiText( - RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ), - RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) ); + options.push_back( caf::PdmOptionItemInfo( caf::AppEnum::uiText( + RiaDefines::EclipseUnitSystem::UNITS_METRIC ), + RiaDefines::EclipseUnitSystem::UNITS_METRIC ) ); + options.push_back( caf::PdmOptionItemInfo( caf::AppEnum::uiText( + RiaDefines::EclipseUnitSystem::UNITS_FIELD ), + RiaDefines::EclipseUnitSystem::UNITS_FIELD ) ); } return options; } diff --git a/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.h b/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.h index 6b56d5e7c8..8082511889 100644 --- a/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.h +++ b/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "cafPdmField.h" #include "cafPdmObject.h" @@ -34,7 +34,7 @@ class RicWellPathsUnitSystemSettingsUi : public caf::PdmObject public: RicWellPathsUnitSystemSettingsUi(); - caf::PdmField unitSystem; + caf::PdmField> unitSystem; protected: QList calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, diff --git a/ApplicationLibCode/FileInterface/RifColumnBasedUserData.cpp b/ApplicationLibCode/FileInterface/RifColumnBasedUserData.cpp index 3acf839c6f..f21b9acf48 100644 --- a/ApplicationLibCode/FileInterface/RifColumnBasedUserData.cpp +++ b/ApplicationLibCode/FileInterface/RifColumnBasedUserData.cpp @@ -135,9 +135,9 @@ std::string RifColumnBasedUserData::unitName( const RifEclipseSummaryAddress& re //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RifColumnBasedUserData::unitSystem() const +RiaDefines::EclipseUnitSystem RifColumnBasedUserData::unitSystem() const { - return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/FileInterface/RifColumnBasedUserData.h b/ApplicationLibCode/FileInterface/RifColumnBasedUserData.h index 71e43b8565..dfb049db97 100644 --- a/ApplicationLibCode/FileInterface/RifColumnBasedUserData.h +++ b/ApplicationLibCode/FileInterface/RifColumnBasedUserData.h @@ -46,8 +46,8 @@ public: bool values( const RifEclipseSummaryAddress& resultAddress, std::vector* values ) const override; - std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override; - RiaEclipseUnitTools::UnitSystem unitSystem() const override; + std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override; + RiaDefines::EclipseUnitSystem unitSystem() const override; private: void buildTimeStepsAndMappings(); diff --git a/ApplicationLibCode/FileInterface/RifCsvUserData.cpp b/ApplicationLibCode/FileInterface/RifCsvUserData.cpp index ea128b2766..68eba6c625 100644 --- a/ApplicationLibCode/FileInterface/RifCsvUserData.cpp +++ b/ApplicationLibCode/FileInterface/RifCsvUserData.cpp @@ -140,9 +140,9 @@ std::string RifCsvUserData::unitName( const RifEclipseSummaryAddress& resultAddr //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RifCsvUserData::unitSystem() const +RiaDefines::EclipseUnitSystem RifCsvUserData::unitSystem() const { - return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/FileInterface/RifCsvUserData.h b/ApplicationLibCode/FileInterface/RifCsvUserData.h index 9d67083c9c..028d43134e 100644 --- a/ApplicationLibCode/FileInterface/RifCsvUserData.h +++ b/ApplicationLibCode/FileInterface/RifCsvUserData.h @@ -50,7 +50,7 @@ public: std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override; - RiaEclipseUnitTools::UnitSystem unitSystem() const override; + RiaDefines::EclipseUnitSystem unitSystem() const override; private: void buildTimeStepsAndMappings(); diff --git a/ApplicationLibCode/FileInterface/RifDerivedEnsembleReader.cpp b/ApplicationLibCode/FileInterface/RifDerivedEnsembleReader.cpp index 7085b50579..3de42e42c4 100644 --- a/ApplicationLibCode/FileInterface/RifDerivedEnsembleReader.cpp +++ b/ApplicationLibCode/FileInterface/RifDerivedEnsembleReader.cpp @@ -98,7 +98,7 @@ std::string RifDerivedEnsembleReader::unitName( const RifEclipseSummaryAddress& //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RifDerivedEnsembleReader::unitSystem() const +RiaDefines::EclipseUnitSystem RifDerivedEnsembleReader::unitSystem() const { - return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; } diff --git a/ApplicationLibCode/FileInterface/RifDerivedEnsembleReader.h b/ApplicationLibCode/FileInterface/RifDerivedEnsembleReader.h index 89eef093d8..5b4106da6d 100644 --- a/ApplicationLibCode/FileInterface/RifDerivedEnsembleReader.h +++ b/ApplicationLibCode/FileInterface/RifDerivedEnsembleReader.h @@ -37,7 +37,7 @@ public: const std::vector& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override; bool values( const RifEclipseSummaryAddress& resultAddress, std::vector* values ) const override; std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override; - RiaEclipseUnitTools::UnitSystem unitSystem() const override; + RiaDefines::EclipseUnitSystem unitSystem() const override; private: RimDerivedSummaryCase* m_derivedCase; diff --git a/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp b/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp index 3383572cae..bf708c6f55 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp +++ b/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp @@ -120,8 +120,8 @@ bool RifEclipseInputFileTools::openGridFile( const QString& fileName, QFile gridFile( fileName ); if ( gridFile.open( QFile::ReadOnly ) ) { - RiaEclipseUnitTools::UnitSystem units = readUnitSystem( gridFile, gridunitPos ); - if ( units != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ) + RiaDefines::EclipseUnitSystem units = readUnitSystem( gridFile, gridunitPos ); + if ( units != RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ) { eclipseCase->setUnitsType( units ); } @@ -417,9 +417,9 @@ bool RifEclipseInputFileTools::exportGrid( const QString& fileName, } ert_ecl_unit_enum ecl_units = ECL_METRIC_UNITS; - if ( eclipseCase->unitsType() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + if ( eclipseCase->unitsType() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) ecl_units = ECL_FIELD_UNITS; - else if ( eclipseCase->unitsType() == RiaEclipseUnitTools::UnitSystem::UNITS_LAB ) + else if ( eclipseCase->unitsType() == RiaDefines::EclipseUnitSystem::UNITS_LAB ) ecl_units = ECL_LAB_UNITS; ecl_grid_fprintf_grdecl2( mainEclGrid, filePtr, ecl_units ); @@ -751,8 +751,8 @@ void RifEclipseInputFileTools::saveFaults( QTextStream& stream, const cvf::Collection& faults = mainGrid->faults(); for ( const auto& fault : faults ) { - if ( fault->name() != RiaDefines::undefinedGridFaultName() && - fault->name() != RiaDefines::undefinedGridFaultWithInactiveName() ) + if ( fault->name() != RiaResultNames::undefinedGridFaultName() && + fault->name() != RiaResultNames::undefinedGridFaultWithInactiveName() ) { saveFault( stream, mainGrid, fault->faultFaces(), fault->name(), min, max, refinement ); } @@ -1662,7 +1662,7 @@ void RifEclipseInputFileTools::readKeywordDataContent( QFile& data, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RifEclipseInputFileTools::readUnitSystem( QFile& file, qint64 gridunitPos ) +RiaDefines::EclipseUnitSystem RifEclipseInputFileTools::readUnitSystem( QFile& file, qint64 gridunitPos ) { bool stopParsing = false; QStringList unitText; @@ -1671,18 +1671,18 @@ RiaEclipseUnitTools::UnitSystem RifEclipseInputFileTools::readUnitSystem( QFile& { if ( unitString.contains( "FEET", Qt::CaseInsensitive ) ) { - return RiaEclipseUnitTools::UnitSystem::UNITS_FIELD; + return RiaDefines::EclipseUnitSystem::UNITS_FIELD; } else if ( unitString.contains( "CM", Qt::CaseInsensitive ) ) { - return RiaEclipseUnitTools::UnitSystem::UNITS_LAB; + return RiaDefines::EclipseUnitSystem::UNITS_LAB; } else if ( unitString.contains( "MET", Qt::CaseInsensitive ) ) { - return RiaEclipseUnitTools::UnitSystem::UNITS_METRIC; + return RiaDefines::EclipseUnitSystem::UNITS_METRIC; } } - return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.h b/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.h index acc323c2d2..380e9b7e68 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.h +++ b/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.h @@ -23,7 +23,7 @@ #include "cvfCollection.h" #include "cvfObject.h" -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RifReaderInterface.h" #include "RigFault.h" @@ -142,7 +142,7 @@ public: ); static void readKeywordDataContent( QFile& data, qint64 filePos, QStringList* textContent, bool* isEditKeywordDetected ); - static RiaEclipseUnitTools::UnitSystem readUnitSystem( QFile& file, qint64 gridunitPos ); + static RiaDefines::EclipseUnitSystem readUnitSystem( QFile& file, qint64 gridunitPos ); static cvf::StructGridInterface::FaceEnum faceEnumFromText( const QString& faceString ); diff --git a/ApplicationLibCode/FileInterface/RifEclipseInputPropertyLoader.cpp b/ApplicationLibCode/FileInterface/RifEclipseInputPropertyLoader.cpp index 20a320f1b9..d2023460d2 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseInputPropertyLoader.cpp +++ b/ApplicationLibCode/FileInterface/RifEclipseInputPropertyLoader.cpp @@ -143,7 +143,8 @@ bool RifEclipseInputPropertyLoader::importFaultsFromFile( RigEclipseCaseData* ec for ( size_t i = 0; i < faultCollection.size(); i++ ) { RigFault* f = faultCollection.at( i ); - if ( f->name() == RiaDefines::undefinedGridFaultName() || f->name() == RiaDefines::undefinedGridFaultName() ) + if ( f->name() == RiaResultNames::undefinedGridFaultName() || + f->name() == RiaResultNames::undefinedGridFaultName() ) { // Do not include undefined grid faults, as these are recomputed based on the imported faults from filesa continue; diff --git a/ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.cpp b/ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.cpp index e7460cd09c..f3a88870a7 100644 --- a/ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.cpp +++ b/ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.cpp @@ -104,7 +104,7 @@ std::string RifEnsembleStatisticsReader::unitName( const RifEclipseSummaryAddres //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RifEnsembleStatisticsReader::unitSystem() const +RiaDefines::EclipseUnitSystem RifEnsembleStatisticsReader::unitSystem() const { return m_ensembleStatCase->unitSystem(); } diff --git a/ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.h b/ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.h index ba649e81f6..0132b723ea 100644 --- a/ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.h +++ b/ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.h @@ -35,7 +35,7 @@ public: bool values( const RifEclipseSummaryAddress& resultAddress, std::vector* values ) const override; std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override; - RiaEclipseUnitTools::UnitSystem unitSystem() const override; + RiaDefines::EclipseUnitSystem unitSystem() const override; private: bool validateAddress( const RifEclipseSummaryAddress& address ) const; diff --git a/ApplicationLibCode/FileInterface/RifKeywordVectorUserData.cpp b/ApplicationLibCode/FileInterface/RifKeywordVectorUserData.cpp index 0bbe71be2b..0ebd9e92fd 100644 --- a/ApplicationLibCode/FileInterface/RifKeywordVectorUserData.cpp +++ b/ApplicationLibCode/FileInterface/RifKeywordVectorUserData.cpp @@ -230,9 +230,9 @@ std::string RifKeywordVectorUserData::unitName( const RifEclipseSummaryAddress& //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RifKeywordVectorUserData::unitSystem() const +RiaDefines::EclipseUnitSystem RifKeywordVectorUserData::unitSystem() const { - return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/FileInterface/RifKeywordVectorUserData.h b/ApplicationLibCode/FileInterface/RifKeywordVectorUserData.h index dc42a4ca39..baf150e54d 100644 --- a/ApplicationLibCode/FileInterface/RifKeywordVectorUserData.h +++ b/ApplicationLibCode/FileInterface/RifKeywordVectorUserData.h @@ -47,8 +47,8 @@ public: bool values( const RifEclipseSummaryAddress& resultAddress, std::vector* values ) const override; - std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override; - RiaEclipseUnitTools::UnitSystem unitSystem() const override; + std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override; + RiaDefines::EclipseUnitSystem unitSystem() const override; private: static bool isTimeHeader( const std::map& header ); diff --git a/ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp index 7f1787a99b..b62a94e1da 100644 --- a/ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp @@ -22,6 +22,7 @@ #include "RiaApplication.h" #include "RiaCellDividingTools.h" +#include "RiaEclipseUnitTools.h" #include "RiaLogging.h" #include "RiaPreferences.h" @@ -1023,8 +1024,8 @@ void RifReaderEclipseOutput::buildMetaData( ecl_grid_type* grid ) // Unit system { // Default units type is METRIC - RiaEclipseUnitTools::UnitSystem unitsType = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC; - int unitsTypeValue; + RiaDefines::EclipseUnitSystem unitsType = RiaDefines::EclipseUnitSystem::UNITS_METRIC; + int unitsTypeValue; if ( m_dynamicResultsAccess.notNull() ) { @@ -1044,11 +1045,11 @@ void RifReaderEclipseOutput::buildMetaData( ecl_grid_type* grid ) if ( unitsTypeValue == 2 ) { - unitsType = RiaEclipseUnitTools::UnitSystem::UNITS_FIELD; + unitsType = RiaDefines::EclipseUnitSystem::UNITS_FIELD; } else if ( unitsTypeValue == 3 ) { - unitsType = RiaEclipseUnitTools::UnitSystem::UNITS_LAB; + unitsType = RiaDefines::EclipseUnitSystem::UNITS_LAB; } m_eclipseCase->setUnitsType( unitsType ); } diff --git a/ApplicationLibCode/FileInterface/RifReaderEclipseSummary.cpp b/ApplicationLibCode/FileInterface/RifReaderEclipseSummary.cpp index a2c7307aac..6b623d0cf8 100644 --- a/ApplicationLibCode/FileInterface/RifReaderEclipseSummary.cpp +++ b/ApplicationLibCode/FileInterface/RifReaderEclipseSummary.cpp @@ -60,19 +60,19 @@ std::vector getTimeSteps( ecl_sum_type* ecl_sum ) return timeSteps; } -RiaEclipseUnitTools::UnitSystem readUnitSystem( ecl_sum_type* ecl_sum ) +RiaDefines::EclipseUnitSystem readUnitSystem( ecl_sum_type* ecl_sum ) { ert_ecl_unit_enum eclUnitEnum = ecl_sum_get_unit_system( ecl_sum ); switch ( eclUnitEnum ) { case ECL_METRIC_UNITS: - return RiaEclipseUnitTools::UnitSystem::UNITS_METRIC; + return RiaDefines::EclipseUnitSystem::UNITS_METRIC; case ECL_FIELD_UNITS: - return RiaEclipseUnitTools::UnitSystem::UNITS_FIELD; + return RiaDefines::EclipseUnitSystem::UNITS_FIELD; case ECL_LAB_UNITS: - return RiaEclipseUnitTools::UnitSystem::UNITS_LAB; + return RiaDefines::EclipseUnitSystem::UNITS_LAB; default: - return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; } } @@ -124,7 +124,7 @@ void closeEclSum( ecl_sum_type* ecl_sum ) RifReaderEclipseSummary::RifReaderEclipseSummary() : m_ecl_sum( nullptr ) , m_ecl_SmSpec( nullptr ) - , m_unitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + , m_unitSystem( RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_valuesCache.reset( new ValuesCache() ); } @@ -633,7 +633,7 @@ std::string RifReaderEclipseSummary::unitName( const RifEclipseSummaryAddress& r //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RifReaderEclipseSummary::unitSystem() const +RiaDefines::EclipseUnitSystem RifReaderEclipseSummary::unitSystem() const { return m_unitSystem; } diff --git a/ApplicationLibCode/FileInterface/RifReaderEclipseSummary.h b/ApplicationLibCode/FileInterface/RifReaderEclipseSummary.h index e101ef4377..1e93420151 100644 --- a/ApplicationLibCode/FileInterface/RifReaderEclipseSummary.h +++ b/ApplicationLibCode/FileInterface/RifReaderEclipseSummary.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RifEclipseSummaryAddress.h" #include "RifSummaryReaderInterface.h" @@ -75,8 +75,8 @@ public: bool values( const RifEclipseSummaryAddress& resultAddress, std::vector* values ) const override; std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override; - RiaEclipseUnitTools::UnitSystem unitSystem() const override; - QStringList warnings() const { return m_warnings; } + RiaDefines::EclipseUnitSystem unitSystem() const override; + QStringList warnings() const { return m_warnings; } static std::string differenceIdentifier() { return "_DIFF"; } static const std::string historyIdentifier() { return "H"; } @@ -96,7 +96,7 @@ private: const ecl_smspec_type* m_ecl_SmSpec; std::vector m_timeSteps; - RiaEclipseUnitTools::UnitSystem m_unitSystem; + RiaDefines::EclipseUnitSystem m_unitSystem; std::map m_resultAddressToErtNodeIdx; diff --git a/ApplicationLibCode/FileInterface/RifReaderObservedData.cpp b/ApplicationLibCode/FileInterface/RifReaderObservedData.cpp index d4c3864513..41d3a8446a 100644 --- a/ApplicationLibCode/FileInterface/RifReaderObservedData.cpp +++ b/ApplicationLibCode/FileInterface/RifReaderObservedData.cpp @@ -213,7 +213,7 @@ std::string RifReaderObservedData::unitName( const RifEclipseSummaryAddress& res //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RifReaderObservedData::unitSystem() const +RiaDefines::EclipseUnitSystem RifReaderObservedData::unitSystem() const { - return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; } diff --git a/ApplicationLibCode/FileInterface/RifReaderObservedData.h b/ApplicationLibCode/FileInterface/RifReaderObservedData.h index 66f8aa3f29..3385bf057f 100644 --- a/ApplicationLibCode/FileInterface/RifReaderObservedData.h +++ b/ApplicationLibCode/FileInterface/RifReaderObservedData.h @@ -51,7 +51,7 @@ public: std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override; - RiaEclipseUnitTools::UnitSystem unitSystem() const override; + RiaDefines::EclipseUnitSystem unitSystem() const override; private: RifEclipseSummaryAddress address( const QString& quantity, diff --git a/ApplicationLibCode/FileInterface/RifStimPlanModelAsymmetricFrkExporter.cpp b/ApplicationLibCode/FileInterface/RifStimPlanModelAsymmetricFrkExporter.cpp index 979392f8d8..eaff6fbb60 100644 --- a/ApplicationLibCode/FileInterface/RifStimPlanModelAsymmetricFrkExporter.cpp +++ b/ApplicationLibCode/FileInterface/RifStimPlanModelAsymmetricFrkExporter.cpp @@ -18,6 +18,8 @@ #include "RifStimPlanModelAsymmetricFrkExporter.h" +#include "RiaEclipseUnitTools.h" + #include "RimStimPlanModel.h" #include diff --git a/ApplicationLibCode/FileInterface/RifStimPlanModelDeviationFrkExporter.cpp b/ApplicationLibCode/FileInterface/RifStimPlanModelDeviationFrkExporter.cpp index a16ed4bfc3..4465756e38 100644 --- a/ApplicationLibCode/FileInterface/RifStimPlanModelDeviationFrkExporter.cpp +++ b/ApplicationLibCode/FileInterface/RifStimPlanModelDeviationFrkExporter.cpp @@ -18,6 +18,8 @@ #include "RifStimPlanModelDeviationFrkExporter.h" +#include "RiaEclipseUnitTools.h" + #include "RimStimPlanModel.h" #include "RimWellPath.h" diff --git a/ApplicationLibCode/FileInterface/RifStimPlanModelPerfsFrkExporter.cpp b/ApplicationLibCode/FileInterface/RifStimPlanModelPerfsFrkExporter.cpp index 480202e156..cfc52dad77 100644 --- a/ApplicationLibCode/FileInterface/RifStimPlanModelPerfsFrkExporter.cpp +++ b/ApplicationLibCode/FileInterface/RifStimPlanModelPerfsFrkExporter.cpp @@ -18,6 +18,7 @@ #include "RifStimPlanModelPerfsFrkExporter.h" +#include "RiaEclipseUnitTools.h" #include "RiaLogging.h" #include "RimStimPlanModel.h" diff --git a/ApplicationLibCode/FileInterface/RifStimPlanXmlReader.cpp b/ApplicationLibCode/FileInterface/RifStimPlanXmlReader.cpp index 7d7bbfc43b..1f3c689303 100644 --- a/ApplicationLibCode/FileInterface/RifStimPlanXmlReader.cpp +++ b/ApplicationLibCode/FileInterface/RifStimPlanXmlReader.cpp @@ -18,6 +18,7 @@ #include "RifStimPlanXmlReader.h" +#include "RiaDefines.h" #include "RiaEclipseUnitTools.h" #include "RiaFractureDefines.h" #include "RiaLogging.h" @@ -36,15 +37,14 @@ bool hasNegativeValues( std::vector xs ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref - RifStimPlanXmlReader::readStimPlanXMLFile( const QString& stimPlanFileName, - double conductivityScalingFactor, - double xScaleFactor, - double yScaleFactor, - double wellPathInterationY, - MirrorMode mirrorMode, - RiaEclipseUnitTools::UnitSystem requiredUnit, - QString* errorMessage ) +cvf::ref RifStimPlanXmlReader::readStimPlanXMLFile( const QString& stimPlanFileName, + double conductivityScalingFactor, + double xScaleFactor, + double yScaleFactor, + double wellPathInterationY, + MirrorMode mirrorMode, + RiaDefines::EclipseUnitSystem requiredUnit, + QString* errorMessage ) { RiaLogging::info( QString( "Starting to open StimPlan XML file: '%1'" ).arg( stimPlanFileName ) ); @@ -65,9 +65,9 @@ cvf::ref if ( xScaleFactor != 1.0 ) stimPlanFileData->scaleXs( xScaleFactor ); if ( yScaleFactor != 1.0 ) stimPlanFileData->scaleYs( yScaleFactor, wellPathInterationY ); - RiaEclipseUnitTools::UnitSystemType unitSystem = stimPlanFileData->unitSet(); + caf::AppEnum unitSystem = stimPlanFileData->unitSet(); - if ( unitSystem != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ) + if ( unitSystem != RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ) RiaLogging::info( QString( "Setting unit system for StimPlan fracture template %1 to %2" ) .arg( stimPlanFileName ) .arg( unitSystem.uiText() ) ); @@ -178,10 +178,10 @@ cvf::ref //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifStimPlanXmlReader::readStimplanGridAndTimesteps( QXmlStreamReader& xmlStream, - RigStimPlanFractureDefinition* stimPlanFileData, - MirrorMode mirrorMode, - RiaEclipseUnitTools::UnitSystem requiredUnit ) +void RifStimPlanXmlReader::readStimplanGridAndTimesteps( QXmlStreamReader& xmlStream, + RigStimPlanFractureDefinition* stimPlanFileData, + MirrorMode mirrorMode, + RiaDefines::EclipseUnitSystem requiredUnit ) { size_t startNegValuesYs = 0; @@ -201,7 +201,7 @@ void RifStimPlanXmlReader::readStimplanGridAndTimesteps( QXmlStreamReader& if ( xmlStream.isStartElement() ) { - RiaEclipseUnitTools::UnitSystem destinationUnit = requiredUnit; + RiaDefines::EclipseUnitSystem destinationUnit = requiredUnit; if ( xmlStream.name() == "grid" ) { @@ -211,13 +211,13 @@ void RifStimPlanXmlReader::readStimplanGridAndTimesteps( QXmlStreamReader& QString gridunit = getAttributeValueString( xmlStream, "uom" ); if ( gridunit == "m" ) - stimPlanFileData->m_unitSet = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC; + stimPlanFileData->m_unitSet = RiaDefines::EclipseUnitSystem::UNITS_METRIC; else if ( gridunit == "ft" ) - stimPlanFileData->m_unitSet = RiaEclipseUnitTools::UnitSystem::UNITS_FIELD; + stimPlanFileData->m_unitSet = RiaDefines::EclipseUnitSystem::UNITS_FIELD; else - stimPlanFileData->m_unitSet = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + stimPlanFileData->m_unitSet = RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; - if ( destinationUnit == RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ) + if ( destinationUnit == RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ) { // Use file unit set if requested unit is unknown destinationUnit = stimPlanFileData->m_unitSet; @@ -227,11 +227,11 @@ void RifStimPlanXmlReader::readStimplanGridAndTimesteps( QXmlStreamReader& double tvdToBotPerfFt = getAttributeValueDouble( xmlStream, "TVDToBottomPerfFt" ); tvdToTopPerf = - RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_FIELD, + RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaDefines::EclipseUnitSystem::UNITS_FIELD, destinationUnit, tvdToTopPerfFt ); tvdToBotPerf = - RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_FIELD, + RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaDefines::EclipseUnitSystem::UNITS_FIELD, destinationUnit, tvdToBotPerfFt ); } @@ -387,12 +387,12 @@ std::vector> RifStimPlanXmlReader::getAllDepthDataAtTimeStep //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RifStimPlanXmlReader::valuesInRequiredUnitSystem( RiaEclipseUnitTools::UnitSystem sourceUnit, - RiaEclipseUnitTools::UnitSystem requiredUnit, - const std::vector& values ) +std::vector RifStimPlanXmlReader::valuesInRequiredUnitSystem( RiaDefines::EclipseUnitSystem sourceUnit, + RiaDefines::EclipseUnitSystem requiredUnit, + const std::vector& values ) { - if ( sourceUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD && - requiredUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( sourceUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD && + requiredUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { std::vector convertedValues; for ( const auto& valueInFeet : values ) @@ -402,8 +402,8 @@ std::vector RifStimPlanXmlReader::valuesInRequiredUnitSystem( RiaEclipse return convertedValues; } - else if ( sourceUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC && - requiredUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( sourceUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC && + requiredUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { std::vector convertedValues; for ( const auto& valueInMeter : values ) @@ -420,17 +420,17 @@ std::vector RifStimPlanXmlReader::valuesInRequiredUnitSystem( RiaEclipse //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaEclipseUnitTools::UnitSystem sourceUnit, - RiaEclipseUnitTools::UnitSystem requiredUnit, - double value ) +double RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaDefines::EclipseUnitSystem sourceUnit, + RiaDefines::EclipseUnitSystem requiredUnit, + double value ) { - if ( sourceUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD && - requiredUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( sourceUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD && + requiredUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { return RiaEclipseUnitTools::feetToMeter( value ); } - else if ( sourceUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC && - requiredUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( sourceUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC && + requiredUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { return RiaEclipseUnitTools::meterToFeet( value ); } diff --git a/ApplicationLibCode/FileInterface/RifStimPlanXmlReader.h b/ApplicationLibCode/FileInterface/RifStimPlanXmlReader.h index efa0040657..e12ed6fef0 100644 --- a/ApplicationLibCode/FileInterface/RifStimPlanXmlReader.h +++ b/ApplicationLibCode/FileInterface/RifStimPlanXmlReader.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "cvfObject.h" @@ -45,14 +45,14 @@ public: double yScaleFactor, double wellPathIntersectionY, MirrorMode mirrorMode, - RiaEclipseUnitTools::UnitSystem requiredUnit, - QString* errorMessage ); + RiaDefines::EclipseUnitSystem requiredUnit, + QString* errorMessage ); private: - static void readStimplanGridAndTimesteps( QXmlStreamReader& xmlStream, - RigStimPlanFractureDefinition* stimPlanFileData, - MirrorMode mirrorMode, - RiaEclipseUnitTools::UnitSystem requiredUnit ); + static void readStimplanGridAndTimesteps( QXmlStreamReader& xmlStream, + RigStimPlanFractureDefinition* stimPlanFileData, + MirrorMode mirrorMode, + RiaDefines::EclipseUnitSystem requiredUnit ); static double getAttributeValueDouble( QXmlStreamReader& xmlStream, const QString& parameterName ); static QString getAttributeValueString( QXmlStreamReader& xmlStream, const QString& parameterName ); @@ -60,11 +60,11 @@ private: static std::vector> getAllDepthDataAtTimeStep( QXmlStreamReader& xmlStream ); - static std::vector valuesInRequiredUnitSystem( RiaEclipseUnitTools::UnitSystem sourceUnit, - RiaEclipseUnitTools::UnitSystem requiredUnit, - const std::vector& values ); + static std::vector valuesInRequiredUnitSystem( RiaDefines::EclipseUnitSystem sourceUnit, + RiaDefines::EclipseUnitSystem requiredUnit, + const std::vector& values ); - static double valueInRequiredUnitSystem( RiaEclipseUnitTools::UnitSystem sourceUnit, - RiaEclipseUnitTools::UnitSystem requiredUnit, - double value ); + static double valueInRequiredUnitSystem( RiaDefines::EclipseUnitSystem sourceUnit, + RiaDefines::EclipseUnitSystem requiredUnit, + double value ); }; diff --git a/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h b/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h index 84a6ce5d53..454b914fe0 100644 --- a/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h +++ b/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RifEclipseSummaryAddress.h" #include "cvfObject.h" @@ -48,8 +48,8 @@ public: virtual bool values( const RifEclipseSummaryAddress& resultAddress, std::vector* values ) const = 0; - virtual std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const = 0; - virtual RiaEclipseUnitTools::UnitSystem unitSystem() const = 0; + virtual std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const = 0; + virtual RiaDefines::EclipseUnitSystem unitSystem() const = 0; protected: std::set m_allResultAddresses; // Result and error addresses diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorInitialPorosity.cpp b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorInitialPorosity.cpp index 789ddd056f..bc528c6be5 100644 --- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorInitialPorosity.cpp +++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorInitialPorosity.cpp @@ -18,8 +18,6 @@ #include "RigFemPartResultCalculatorInitialPorosity.h" -#include "RiaEclipseUnitTools.h" - #include "RigFemPart.h" #include "RigFemPartCollection.h" #include "RigFemPartResultsCollection.h" diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp index b76447c86a..a5f2755307 100644 --- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp +++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp @@ -20,6 +20,7 @@ #include "RigFemPartResultsCollection.h" #include "RiaLogging.h" +#include "RiaResultNames.h" #include "RifElementPropertyReader.h" #include "RifGeoMechReaderInterface.h" @@ -796,12 +797,12 @@ std::map> } else if ( resPos == RIG_WELLPATH_DERIVED ) { - std::vector angles = RiaDefines::wbsAngleResultNames(); + std::vector angles = RiaResultNames::wbsAngleResultNames(); for ( QString angle : angles ) { fieldCompNames[angle.toStdString()]; } - std::vector derivedResults = RiaDefines::wbsDerivedResultNames(); + std::vector derivedResults = RiaResultNames::wbsDerivedResultNames(); for ( QString result : derivedResults ) { fieldCompNames[result.toStdString()]; diff --git a/ApplicationLibCode/ModelVisualization/Intersections/RivIntersectionResultsColoringTools.cpp b/ApplicationLibCode/ModelVisualization/Intersections/RivIntersectionResultsColoringTools.cpp index 7f510aefb4..b56ab56b48 100644 --- a/ApplicationLibCode/ModelVisualization/Intersections/RivIntersectionResultsColoringTools.cpp +++ b/ApplicationLibCode/ModelVisualization/Intersections/RivIntersectionResultsColoringTools.cpp @@ -171,7 +171,7 @@ void RivIntersectionResultsColoringTools::updateEclipseCellResultColors( const R cvf::ref resultAccessor; - if ( !RiaDefines::isPerCellFaceResult( eclipseResDef->resultVariable() ) ) + if ( !RiaResultNames::isPerCellFaceResult( eclipseResDef->resultVariable() ) ) { resultAccessor = diff --git a/ApplicationLibCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp b/ApplicationLibCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp index 27f25c0718..b3a0aecc38 100644 --- a/ApplicationLibCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp +++ b/ApplicationLibCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp @@ -175,11 +175,11 @@ void RivReservoirFaultsPartMgr::appendPartsToModel( cvf::ModelBasicList* model ) } { - QStringList stringsToMatch{ RiaDefines::combinedRiTranResultName(), - RiaDefines::combinedRiMultResultName(), - RiaDefines::combinedRiAreaNormTranResultName(), - RiaDefines::combinedTransmissibilityResultName(), - RiaDefines::combinedMultResultName() }; + QStringList stringsToMatch{ RiaResultNames::combinedRiTranResultName(), + RiaResultNames::combinedRiMultResultName(), + RiaResultNames::combinedRiAreaNormTranResultName(), + RiaResultNames::combinedTransmissibilityResultName(), + RiaResultNames::combinedMultResultName() }; for ( const auto& s : stringsToMatch ) { diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp index 2a3fc50265..efdefeee31 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp @@ -17,6 +17,8 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RimPlotDataFilterItem.h" +#include "RiaResultNames.h" + #include "RimAnalysisPlot.h" #include "RimSummaryAddress.h" #include "RimSummaryCaseCollection.h" @@ -288,7 +290,7 @@ QList QVariant::fromValue( address ) ) ); } - options.push_front( caf::PdmOptionItemInfo( RiaDefines::undefinedResultName(), + options.push_front( caf::PdmOptionItemInfo( RiaResultNames::undefinedResultName(), QVariant::fromValue( RifEclipseSummaryAddress() ) ) ); } } diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.h b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.h index 386fb7a6e3..b295145d6d 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.h @@ -18,8 +18,6 @@ #pragma once -#include "RiaEclipseUnitTools.h" - #include "RimAnnotationCollectionBase.h" #include "cafPdmChildArrayField.h" diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.h b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.h index 3c7e1724f7..8cd17def5c 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.h +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.h @@ -18,8 +18,6 @@ #pragma once -#include "RiaEclipseUnitTools.h" - #include "cafPdmChildArrayField.h" #include "cafPdmChildField.h" #include "cafPdmField.h" diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.h b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.h index 8e492b2610..229989eb4d 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.h @@ -18,8 +18,6 @@ #pragma once -#include "RiaEclipseUnitTools.h" - #include "cafPdmChildArrayField.h" #include "cafPdmField.h" #include "cafPdmObject.h" diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp index bd9c06a6e4..fbaabcb770 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp @@ -409,7 +409,7 @@ void RimEclipsePropertyFilter::computeResultValueRange() setCategoryNames( fnVector ); } - else if ( m_resultDefinition->resultVariable() == RiaDefines::completionTypeResultName() ) + else if ( m_resultDefinition->resultVariable() == RiaResultNames::completionTypeResultName() ) { std::vector componentTypes = { RiaDefines::WellPathComponentType::WELL_PATH, diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp index 4b62baa439..c119404c0c 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp @@ -127,7 +127,7 @@ bool RimEclipsePropertyFilterCollection::isUsingFormationNames() const { if ( propertyFilter->isActive() && propertyFilter->resultDefinition()->resultType() == RiaDefines::ResultCatType::FORMATION_NAMES && - propertyFilter->resultDefinition()->resultVariable() != RiaDefines::undefinedResultName() ) + propertyFilter->resultDefinition()->resultVariable() != RiaResultNames::undefinedResultName() ) return true; } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp index 137d9870e5..9a173f4978 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp @@ -20,7 +20,7 @@ #include "RiaApplication.h" #include "RiaCompletionTypeCalculationScheduler.h" -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RiaFractureDefines.h" #include "RiaLogging.h" @@ -139,13 +139,13 @@ std::vector RimEllipseFractureTemplate::fractureBorderPolygon() cons //-------------------------------------------------------------------------------------------------- void RimEllipseFractureTemplate::changeUnits() { - if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { - convertToUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ); + convertToUnitSystem( RiaDefines::EclipseUnitSystem::UNITS_FIELD ); } - else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { - convertToUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ); + convertToUnitSystem( RiaDefines::EclipseUnitSystem::UNITS_METRIC ); } this->updateConnectedEditors(); @@ -282,7 +282,7 @@ const RigFractureGrid* RimEllipseFractureTemplate::fractureGrid() const //-------------------------------------------------------------------------------------------------- void RimEllipseFractureTemplate::setDefaultValuesFromUnit() { - if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + if ( fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_width = 0.5; m_permeability = 80000.0; @@ -306,12 +306,12 @@ void RimEllipseFractureTemplate::setDefaultValuesFromUnit() double RimEllipseFractureTemplate::conductivity() const { double cond = cvf::UNDEFINED_DOUBLE; - if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { // Conductivity should be md-m, width is in m cond = m_permeability * m_width; } - else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { // Conductivity should be md-ft, but width is in inches cond = m_permeability * RiaEclipseUnitTools::inchToFeet( m_width ); @@ -394,20 +394,20 @@ void RimEllipseFractureTemplate::onLoadDataAndUpdateGeometryHasChanged() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimEllipseFractureTemplate::convertToUnitSystem( RiaEclipseUnitTools::UnitSystem neededUnit ) +void RimEllipseFractureTemplate::convertToUnitSystem( RiaDefines::EclipseUnitSystem neededUnit ) { if ( m_fractureTemplateUnit() == neededUnit ) return; setUnitSystem( neededUnit ); RimFractureTemplate::convertToUnitSystem( neededUnit ); - if ( neededUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + if ( neededUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_halfLength = RiaEclipseUnitTools::meterToFeet( m_halfLength ); m_height = RiaEclipseUnitTools::meterToFeet( m_height ); m_width = RiaEclipseUnitTools::meterToInch( m_width ); } - else if ( neededUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + else if ( neededUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_halfLength = RiaEclipseUnitTools::feetToMeter( m_halfLength ); m_height = RiaEclipseUnitTools::feetToMeter( m_height ); @@ -420,13 +420,13 @@ void RimEllipseFractureTemplate::convertToUnitSystem( RiaEclipseUnitTools::UnitS //-------------------------------------------------------------------------------------------------- void RimEllipseFractureTemplate::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { - if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_halfLength.uiCapability()->setUiName( "Halflength Xf [m]" ); m_height.uiCapability()->setUiName( "Height [m]" ); m_width.uiCapability()->setUiName( "Width [m]" ); } - else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_halfLength.uiCapability()->setUiName( "Halflength Xf [ft]" ); m_height.uiCapability()->setUiName( "Height [ft]" ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h b/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h index b011fa8369..aab1775330 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h @@ -62,7 +62,7 @@ public: MinMaxAccumulator& minMaxAccumulator, PosNegAccumulator& posNegAccumulator ) const override; - void convertToUnitSystem( RiaEclipseUnitTools::UnitSystem neededUnit ) override; + void convertToUnitSystem( RiaDefines::EclipseUnitSystem neededUnit ) override; void loadDataAndUpdate() override; std::vector> uiResultNamesWithUnit() const override; diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.h b/ApplicationLibCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.h index 1851196ee9..0c3fd4147f 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.h @@ -23,7 +23,7 @@ #include "RimFishboneWellPath.h" #include "RimFishbonesPipeProperties.h" -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "cafPdmChildArrayField.h" #include "cafPdmChildField.h" @@ -47,7 +47,7 @@ public: void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; std::vector wellPaths() const; - double holeDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const + double holeDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const { return m_pipeProperties->holeDiameter( unitSystem ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp index 60fd7c1a4b..2a197fc149 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp @@ -18,6 +18,8 @@ #include "RimFishbonesCollection.h" +#include "RiaEclipseUnitTools.h" + #include "RifWellPathImporter.h" #include "RigWellPath.h" @@ -116,12 +118,12 @@ void RimFishbonesCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiO firstAncestorOrThisOfType( wellPath ); if ( wellPath ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_startMD.uiCapability()->setUiName( "Start MD [m]" ); m_mainBoreDiameter.uiCapability()->setUiName( "Main Bore Diameter [m]" ); } - else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_startMD.uiCapability()->setUiName( "Start MD [ft]" ); m_mainBoreDiameter.uiCapability()->setUiName( "Main Bore Diameter [ft]" ); @@ -283,17 +285,17 @@ double RimFishbonesCollection::startMD() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFishbonesCollection::mainBoreDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const +double RimFishbonesCollection::mainBoreDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const { RimWellPath* wellPath; firstAncestorOrThisOfTypeAsserted( wellPath ); - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD && - unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD && + unitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { return RiaEclipseUnitTools::feetToMeter( m_mainBoreDiameter() ); } - else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC && - unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC && + unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { return RiaEclipseUnitTools::meterToFeet( m_mainBoreDiameter() ); } @@ -309,7 +311,7 @@ void RimFishbonesCollection::setUnitSystemSpecificDefaults() firstAncestorOrThisOfType( wellPath ); if ( wellPath ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_mainBoreDiameter = 0.216; } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.h b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.h index 82dc4531d4..6c99b45ff3 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.h @@ -21,7 +21,7 @@ #include "RimCheckableNamedObject.h" #include "RimMswCompletionParameters.h" -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "cafPdmChildArrayField.h" #include "cafPdmChildField.h" @@ -54,7 +54,7 @@ public: void recalculateStartMD(); double startMD() const; double mainBoreSkinFactor() const { return m_skinFactor; } - double mainBoreDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const; + double mainBoreDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const; void setUnitSystemSpecificDefaults(); protected: diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp index bd73c20897..648154fe41 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp @@ -242,13 +242,13 @@ double RimFishbonesMultipleSubs::buildAngle() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFishbonesMultipleSubs::tubingDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const +double RimFishbonesMultipleSubs::tubingDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const { RimWellPath* wellPath; firstAncestorOrThisOfTypeAsserted( wellPath ); - if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( unitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { return RiaEclipseUnitTools::inchToMeter( m_lateralTubingDiameter() ); } @@ -257,9 +257,9 @@ double RimFishbonesMultipleSubs::tubingDiameter( RiaEclipseUnitTools::UnitSystem return m_lateralTubingDiameter() / 1000; } } - else if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { return RiaEclipseUnitTools::meterToFeet( m_lateralTubingDiameter() / 1000 ); } @@ -275,7 +275,7 @@ double RimFishbonesMultipleSubs::tubingDiameter( RiaEclipseUnitTools::UnitSystem //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFishbonesMultipleSubs::effectiveDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const +double RimFishbonesMultipleSubs::effectiveDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const { double innerRadius = tubingDiameter( unitSystem ) / 2; double outerRadius = holeDiameter( unitSystem ) / 2; @@ -292,17 +292,17 @@ double RimFishbonesMultipleSubs::effectiveDiameter( RiaEclipseUnitTools::UnitSys //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFishbonesMultipleSubs::openHoleRoughnessFactor( RiaEclipseUnitTools::UnitSystem unitSystem ) const +double RimFishbonesMultipleSubs::openHoleRoughnessFactor( RiaDefines::EclipseUnitSystem unitSystem ) const { RimWellPath* wellPath; firstAncestorOrThisOfTypeAsserted( wellPath ); - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD && - unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD && + unitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { return RiaEclipseUnitTools::feetToMeter( m_lateralOpenHoleRoghnessFactor() ); } - else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC && - unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC && + unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { return RiaEclipseUnitTools::meterToFeet( m_lateralOpenHoleRoghnessFactor() ); } @@ -312,7 +312,7 @@ double RimFishbonesMultipleSubs::openHoleRoughnessFactor( RiaEclipseUnitTools::U //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFishbonesMultipleSubs::icdOrificeDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const +double RimFishbonesMultipleSubs::icdOrificeDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const { RimWellPath* wellPath; firstAncestorOrThisOfTypeAsserted( wellPath ); @@ -423,7 +423,7 @@ void RimFishbonesMultipleSubs::setUnitSystemSpecificDefaults() firstAncestorOrThisOfType( wellPath ); if ( wellPath ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_lateralLength = "11"; m_lateralBuildAngle = 6.0; @@ -432,7 +432,7 @@ void RimFishbonesMultipleSubs::setUnitSystemSpecificDefaults() m_lateralTubingRoghnessFactor = 1e-05; m_icdOrificeDiameter = 7; } - else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_lateralLength = "36"; m_lateralBuildAngle = 1.83; @@ -560,7 +560,7 @@ void RimFishbonesMultipleSubs::defineUiOrdering( QString uiConfigName, caf::PdmU firstAncestorOrThisOfType( wellPath ); if ( wellPath ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_lateralLength.uiCapability()->setUiName( "Length(s) [m]" ); m_lateralBuildAngle.uiCapability()->setUiName( "Build Angle [deg/m]" ); @@ -570,7 +570,7 @@ void RimFishbonesMultipleSubs::defineUiOrdering( QString uiConfigName, caf::PdmU m_icdOrificeDiameter.uiCapability()->setUiName( "ICD Orifice Diameter [mm]" ); } - else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_lateralLength.uiCapability()->setUiName( "Length(s) [ft]" ); m_lateralBuildAngle.uiCapability()->setUiName( "Build Angle [deg/ft]" ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.h b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.h index 04a81662aa..bf9d66a3bb 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "Rim3dPropertiesInterface.h" #include "RimCheckableNamedObject.h" @@ -87,15 +87,15 @@ public: double exitAngle() const; double buildAngle() const; - double tubingDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const; - double holeDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const + double tubingDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const; + double holeDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const { return m_pipeProperties()->holeDiameter( unitSystem ); } - double effectiveDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const; + double effectiveDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const; double skinFactor() const { return m_pipeProperties()->skinFactor(); } - double openHoleRoughnessFactor( RiaEclipseUnitTools::UnitSystem unitSystem ) const; - double icdOrificeDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const; + double openHoleRoughnessFactor( RiaDefines::EclipseUnitSystem unitSystem ) const; + double icdOrificeDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const; double icdFlowCoefficient() const; size_t icdCount() const; std::vector lateralLengths() const; diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.cpp index bc7ff56a75..cd762a403c 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.cpp @@ -18,6 +18,8 @@ #include "RimFishbonesPipeProperties.h" +#include "RiaEclipseUnitTools.h" + #include "RimWellPath.h" #include @@ -45,13 +47,13 @@ RimFishbonesPipeProperties::~RimFishbonesPipeProperties() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFishbonesPipeProperties::holeDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const +double RimFishbonesPipeProperties::holeDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const { RimWellPath* wellPath; firstAncestorOrThisOfTypeAsserted( wellPath ); - if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( unitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { return RiaEclipseUnitTools::inchToMeter( m_lateralHoleDiameter() ); } @@ -60,9 +62,9 @@ double RimFishbonesPipeProperties::holeDiameter( RiaEclipseUnitTools::UnitSystem return m_lateralHoleDiameter() / 1000; } } - else if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { return RiaEclipseUnitTools::meterToFeet( m_lateralHoleDiameter() / 1000 ); } @@ -84,11 +86,11 @@ void RimFishbonesPipeProperties::setUnitSystemSpecificDefaults() firstAncestorOrThisOfType( wellPath ); if ( wellPath ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_lateralHoleDiameter = 12.5; } - else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_lateralHoleDiameter = 0.5; } @@ -105,11 +107,11 @@ void RimFishbonesPipeProperties::defineUiOrdering( QString uiConfigName, caf::Pd firstAncestorOrThisOfType( wellPath ); if ( wellPath ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_lateralHoleDiameter.uiCapability()->setUiName( "Hole Diameter [mm]" ); } - else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_lateralHoleDiameter.uiCapability()->setUiName( "Hole Diameter [in]" ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.h b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.h index 6802aae375..90e5d14c02 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "cvfColor3.h" #include "cvfVector3.h" @@ -42,7 +42,7 @@ public: ~RimFishbonesPipeProperties() override; double skinFactor() const { return m_skinFactor(); } - double holeDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const; + double holeDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const; void setUnitSystemSpecificDefaults(); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp index e20aa42ba0..1fc6818104 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp @@ -22,7 +22,7 @@ #include "RiaApplication.h" #include "RiaColorTables.h" #include "RiaCompletionTypeCalculationScheduler.h" -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RiaLogging.h" #include "Riu3DMainWindowTools.h" @@ -138,7 +138,7 @@ RimFracture::RimFracture() CAF_PDM_InitField( &m_fractureUnit, "FractureUnit", - caf::AppEnum( RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ), + caf::AppEnum( RiaDefines::EclipseUnitSystem::UNITS_METRIC ), "Fracture Unit System", "", "", @@ -230,7 +230,7 @@ void RimFracture::fieldChangedByUi( const caf::PdmFieldHandle* changedField, con { if ( fractureUnit() != m_fractureTemplate->fractureTemplateUnit() ) { - QString fractureUnitText = RiaEclipseUnitTools::UnitSystemType::uiText( fractureUnit() ); + QString fractureUnitText = caf::AppEnum::uiText( fractureUnit() ); QString warningText = QString( "Using a fracture template defined in a different unit is not supported.\n\nPlease select a " @@ -465,11 +465,11 @@ cvf::BoundingBox RimFracture::boundingBoxInDomainCoords() const //-------------------------------------------------------------------------------------------------- double RimFracture::wellRadius() const { - if ( m_fractureUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( m_fractureUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { return m_wellDiameter / 2.0; } - else if ( m_fractureUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( m_fractureUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { return RiaEclipseUnitTools::inchToFeet( m_wellDiameter / 2.0 ); } @@ -533,7 +533,7 @@ void RimFracture::setFractureTemplateNoUpdate( RimFractureTemplate* fractureTemp { if ( fractureTemplate && fractureTemplate->fractureTemplateUnit() != fractureUnit() ) { - QString fractureUnitText = RiaEclipseUnitTools::UnitSystemType::uiText( fractureUnit() ); + QString fractureUnitText = caf::AppEnum::uiText( fractureUnit() ); QString warningText = QString( "Using a fracture template defined in a different unit is not supported.\n\nPlease select a " @@ -641,12 +641,12 @@ QList RimFracture::calculateValueOptions( const caf::Pdm //-------------------------------------------------------------------------------------------------- void RimFracture::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { - if ( m_fractureUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( m_fractureUnit() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_wellDiameter.uiCapability()->setUiName( "Well Diameter [m]" ); m_perforationLength.uiCapability()->setUiName( "Perforation Length [m]" ); } - else if ( m_fractureUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( m_fractureUnit() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_wellDiameter.uiCapability()->setUiName( "Well Diameter [inches]" ); m_perforationLength.uiCapability()->setUiName( "Perforation Length [ft]" ); @@ -776,7 +776,7 @@ void RimFracture::setAnchorPosition( const cvf::Vec3d& pos ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RimFracture::fractureUnit() const +RiaDefines::EclipseUnitSystem RimFracture::fractureUnit() const { return m_fractureUnit(); } @@ -784,7 +784,7 @@ RiaEclipseUnitTools::UnitSystem RimFracture::fractureUnit() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFracture::setFractureUnit( RiaEclipseUnitTools::UnitSystem unitSystem ) +void RimFracture::setFractureUnit( RiaDefines::EclipseUnitSystem unitSystem ) { m_fractureUnit = unitSystem; } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.h b/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.h index 8687b04f35..9af1a11faf 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.h @@ -19,7 +19,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "Rim3dPropertiesInterface.h" #include "RimCheckableNamedObject.h" @@ -83,11 +83,11 @@ public: void setStimPlanTimeIndexToPlot( int timeIndex ); - double wellRadius() const; - cvf::Vec3d anchorPosition() const; - void setAnchorPosition( const cvf::Vec3d& pos ); - RiaEclipseUnitTools::UnitSystem fractureUnit() const; - void setFractureUnit( RiaEclipseUnitTools::UnitSystem unitSystem ); + double wellRadius() const; + cvf::Vec3d anchorPosition() const; + void setAnchorPosition( const cvf::Vec3d& pos ); + RiaDefines::EclipseUnitSystem fractureUnit() const; + void setFractureUnit( RiaDefines::EclipseUnitSystem unitSystem ); bool isEclipseCellOpenForFlow( const RigMainGrid* mainGrid, const std::set& reservoirCellIndicesOpenForFlow, @@ -149,12 +149,12 @@ private: cvf::BoundingBox boundingBoxInDomainCoords() const override; protected: - caf::PdmPtrField m_fractureTemplate; - caf::PdmField m_editFractureTemplate; - caf::PdmField m_createEllipseFractureTemplate; - caf::PdmField m_createStimPlanFractureTemplate; - caf::PdmProxyValueField m_uiAnchorPosition; - caf::PdmField m_fractureUnit; + caf::PdmPtrField m_fractureTemplate; + caf::PdmField m_editFractureTemplate; + caf::PdmField m_createEllipseFractureTemplate; + caf::PdmField m_createStimPlanFractureTemplate; + caf::PdmProxyValueField m_uiAnchorPosition; + caf::PdmField> m_fractureUnit; caf::PdmProxyValueField m_uiWellPathAzimuth; caf::PdmProxyValueField m_uiWellFractureAzimuthDiff; diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp index 833d3f904f..a809db6758 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp @@ -18,7 +18,9 @@ #include "RimFractureTemplate.h" +#include "RiaEclipseUnitTools.h" #include "RiaFractureDefines.h" + #include "RigTesselatorTools.h" #include "RimFracture.h" @@ -120,7 +122,7 @@ RimFractureTemplate::RimFractureTemplate() CAF_PDM_InitField( &m_fractureTemplateUnit, "UnitSystem", - caf::AppEnum( RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ), + caf::AppEnum( RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ), "Units System", "", "", @@ -252,7 +254,7 @@ void RimFractureTemplate::setName( const QString& name ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureTemplate::setUnitSystem( RiaEclipseUnitTools::UnitSystemType unitSystem ) +void RimFractureTemplate::setUnitSystem( caf::AppEnum unitSystem ) { m_fractureTemplateUnit = unitSystem; } @@ -276,7 +278,7 @@ RimFractureTemplate::FracOrientationEnum RimFractureTemplate::orientationType() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystemType RimFractureTemplate::fractureTemplateUnit() const +caf::AppEnum RimFractureTemplate::fractureTemplateUnit() const { return m_fractureTemplateUnit(); } @@ -475,13 +477,13 @@ void RimFractureTemplate::defineEditorAttribute( const caf::PdmFieldHandle* fiel //-------------------------------------------------------------------------------------------------- void RimFractureTemplate::prepareFieldsForUiDisplay() { - if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( m_fractureTemplateUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_wellDiameter.uiCapability()->setUiName( "Well Diameter [m]" ); m_perforationLength.uiCapability()->setUiName( "Perforation Length [m]" ); m_fractureWidth.uiCapability()->setUiName( "Fracture Width [m]" ); } - else if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( m_fractureTemplateUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_wellDiameter.uiCapability()->setUiName( "Well Diameter [inches]" ); m_perforationLength.uiCapability()->setUiName( "Perforation Length [ft]" ); @@ -752,15 +754,15 @@ double RimFractureTemplate::computeKh( const RimFracture* fractureInstance ) con //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureTemplate::convertToUnitSystem( RiaEclipseUnitTools::UnitSystem neededUnit ) +void RimFractureTemplate::convertToUnitSystem( RiaDefines::EclipseUnitSystem neededUnit ) { - if ( neededUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( neededUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_perforationLength = RiaEclipseUnitTools::feetToMeter( m_perforationLength ); m_wellDiameter = RiaEclipseUnitTools::inchToMeter( m_wellDiameter ); m_fractureWidth = RiaEclipseUnitTools::feetToMeter( m_fractureWidth ); } - else if ( neededUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( neededUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_perforationLength = RiaEclipseUnitTools::meterToFeet( m_perforationLength ); m_wellDiameter = RiaEclipseUnitTools::meterToInch( m_wellDiameter ); @@ -912,11 +914,11 @@ QString RimFractureTemplate::nameAndUnit() const { QString decoratedName; - if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( m_fractureTemplateUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { decoratedName += "[M] - "; } - else if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( m_fractureTemplateUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { decoratedName += "[F] - "; } @@ -979,11 +981,11 @@ float RimFractureTemplate::skinFactor() const //-------------------------------------------------------------------------------------------------- void RimFractureTemplate::setDefaultWellDiameterFromUnit() { - if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + if ( m_fractureTemplateUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_wellDiameter = 8.5; } - else if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + else if ( m_fractureTemplateUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_wellDiameter = 0.216; } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.h b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.h index d7ad0797a1..d80105f953 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "cafAppEnum.h" #include "cafPdmChildField.h" @@ -127,13 +127,13 @@ public: QString name() const; QString nameAndUnit() const; - RiaEclipseUnitTools::UnitSystemType fractureTemplateUnit() const; - FracOrientationEnum orientationType() const; - float azimuthAngle() const; - float skinFactor() const; - double wellDiameter() const; - FracConductivityEnum conductivityType() const; - double perforationLength() const; + caf::AppEnum fractureTemplateUnit() const; + FracOrientationEnum orientationType() const; + float azimuthAngle() const; + float skinFactor() const; + double wellDiameter() const; + FracConductivityEnum conductivityType() const; + double perforationLength() const; virtual void fractureTriangleGeometry( std::vector* nodeCoords, std::vector* triangleIndices ) const = 0; @@ -149,12 +149,12 @@ public: virtual std::vector> uiResultNamesWithUnit() const = 0; void setName( const QString& name ); - void setUnitSystem( RiaEclipseUnitTools::UnitSystemType unitSystem ); + void setUnitSystem( caf::AppEnum unitSystem ); void setDefaultWellDiameterFromUnit(); bool isNonDarcyFlowEnabled() const; - virtual void convertToUnitSystem( RiaEclipseUnitTools::UnitSystem neededUnit ); + virtual void convertToUnitSystem( RiaDefines::EclipseUnitSystem neededUnit ); virtual void loadDataAndUpdate() = 0; @@ -200,15 +200,15 @@ protected: caf::PdmField m_name; caf::PdmProxyValueField m_nameAndUnit; - caf::PdmField m_fractureTemplateUnit; - caf::PdmField> m_orientationType; - caf::PdmField m_azimuthAngle; - caf::PdmField m_skinFactor; - caf::PdmField m_perforationLength; - caf::PdmField m_perforationEfficiency; - caf::PdmField m_wellDiameter; - caf::PdmField> m_conductivityType; - caf::PdmChildField m_fractureContainment; + caf::PdmField> m_fractureTemplateUnit; + caf::PdmField> m_orientationType; + caf::PdmField m_azimuthAngle; + caf::PdmField m_skinFactor; + caf::PdmField m_perforationLength; + caf::PdmField m_perforationEfficiency; + caf::PdmField m_wellDiameter; + caf::PdmField> m_conductivityType; + caf::PdmChildField m_fractureContainment; caf::PdmField> m_nonDarcyFlowType; caf::PdmField m_userDefinedDFactor; diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp index 66e3c3082e..c33a03c505 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp @@ -54,7 +54,7 @@ RimFractureTemplateCollection::RimFractureTemplateCollection() CAF_PDM_InitField( &m_defaultUnitsForFracTemplates, "DefaultUnitForTemplates", - caf::AppEnum( RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ), + caf::AppEnum( RiaDefines::EclipseUnitSystem::UNITS_METRIC ), "Default unit system for fracture templates", "", "", @@ -128,7 +128,7 @@ void RimFractureTemplateCollection::addFractureTemplate( RimFractureTemplate* te //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystemType RimFractureTemplateCollection::defaultUnitSystemType() const +caf::AppEnum RimFractureTemplateCollection::defaultUnitSystemType() const { return m_defaultUnitsForFracTemplates; } @@ -141,7 +141,7 @@ void RimFractureTemplateCollection::setDefaultUnitSystemBasedOnLoadedCases() RimProject* proj = RimProject::current(); auto commonUnitSystem = proj->commonUnitSystemForAllCases(); - if ( commonUnitSystem != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ) + if ( commonUnitSystem != RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ) { m_defaultUnitsForFracTemplates = commonUnitSystem; } @@ -150,7 +150,7 @@ void RimFractureTemplateCollection::setDefaultUnitSystemBasedOnLoadedCases() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureTemplate* RimFractureTemplateCollection::firstFractureOfUnit( RiaEclipseUnitTools::UnitSystem unitSet ) const +RimFractureTemplate* RimFractureTemplateCollection::firstFractureOfUnit( RiaDefines::EclipseUnitSystem unitSet ) const { for ( RimFractureTemplate* f : m_fractureDefinitions() ) { @@ -241,14 +241,14 @@ void RimFractureTemplateCollection::createAndAssignTemplateCopyForNonMatchingUni caf::PdmDefaultObjectFactory::instance() ) ); auto currentUnit = fractureTemplate->fractureTemplateUnit(); - auto neededUnit = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; - if ( currentUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + auto neededUnit = RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; + if ( currentUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { - neededUnit = RiaEclipseUnitTools::UnitSystem::UNITS_FIELD; + neededUnit = RiaDefines::EclipseUnitSystem::UNITS_FIELD; } - else if ( currentUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( currentUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { - neededUnit = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC; + neededUnit = RiaDefines::EclipseUnitSystem::UNITS_METRIC; } templateWithMatchingUnit->convertToUnitSystem( neededUnit ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h index e209ce3af5..21df3d9238 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "cafPdmChildArrayField.h" #include "cafPdmField.h" @@ -44,10 +44,10 @@ public: RimEllipseFractureTemplate* addDefaultEllipseTemplate(); void addFractureTemplate( RimFractureTemplate* templ ); - RiaEclipseUnitTools::UnitSystemType defaultUnitSystemType() const; - void setDefaultUnitSystemBasedOnLoadedCases(); + caf::AppEnum defaultUnitSystemType() const; + void setDefaultUnitSystemBasedOnLoadedCases(); - RimFractureTemplate* firstFractureOfUnit( RiaEclipseUnitTools::UnitSystem unitSet ) const; + RimFractureTemplate* firstFractureOfUnit( RiaDefines::EclipseUnitSystem unitSet ) const; std::vector> resultNamesAndUnits() const; void computeMinMax( const QString& uiResultName, @@ -71,8 +71,8 @@ protected: private: int nextFractureTemplateId(); - caf::PdmChildArrayField m_fractureDefinitions; - caf::PdmField m_defaultUnitsForFracTemplates; + caf::PdmChildArrayField m_fractureDefinitions; + caf::PdmField> m_defaultUnitsForFracTemplates; caf::PdmField m_nextValidFractureTemplateId; // Unique fracture template ID within a project, used to identify // a fracture template }; diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp index c78646128e..3b2f70d8ca 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp @@ -17,6 +17,8 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RimMswCompletionParameters.h" +#include "RiaEclipseUnitTools.h" + #include "RimWellPath.h" #include "cafPdmUiObjectEditorHandle.h" @@ -123,17 +125,17 @@ double RimMswCompletionParameters::manualReferenceMD() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimMswCompletionParameters::linerDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const +double RimMswCompletionParameters::linerDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const { RimWellPath* wellPath; firstAncestorOrThisOfTypeAsserted( wellPath ); - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD && - unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD && + unitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { return RiaEclipseUnitTools::feetToMeter( m_linerDiameter() ); } - else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC && - unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC && + unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { return RiaEclipseUnitTools::meterToFeet( m_linerDiameter() ); } @@ -143,9 +145,9 @@ double RimMswCompletionParameters::linerDiameter( RiaEclipseUnitTools::UnitSyste //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimMswCompletionParameters::defaultLinerDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) +double RimMswCompletionParameters::defaultLinerDiameter( RiaDefines::EclipseUnitSystem unitSystem ) { - if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( unitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { return 0.152; } @@ -158,17 +160,17 @@ double RimMswCompletionParameters::defaultLinerDiameter( RiaEclipseUnitTools::Un //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimMswCompletionParameters::roughnessFactor( RiaEclipseUnitTools::UnitSystem unitSystem ) const +double RimMswCompletionParameters::roughnessFactor( RiaDefines::EclipseUnitSystem unitSystem ) const { RimWellPath* wellPath; firstAncestorOrThisOfTypeAsserted( wellPath ); - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD && - unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD && + unitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { return RiaEclipseUnitTools::feetToMeter( m_roughnessFactor() ); } - else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC && - unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC && + unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { return RiaEclipseUnitTools::meterToFeet( m_roughnessFactor() ); } @@ -178,9 +180,9 @@ double RimMswCompletionParameters::roughnessFactor( RiaEclipseUnitTools::UnitSys //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimMswCompletionParameters::defaultRoughnessFactor( RiaEclipseUnitTools::UnitSystem unitSystem ) +double RimMswCompletionParameters::defaultRoughnessFactor( RiaDefines::EclipseUnitSystem unitSystem ) { - if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( unitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { return 1.0e-5; } @@ -292,12 +294,12 @@ void RimMswCompletionParameters::defineUiOrdering( QString uiConfigName, caf::Pd firstAncestorOrThisOfType( wellPath ); if ( wellPath ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_linerDiameter.uiCapability()->setUiName( "Liner Inner Diameter [m]" ); m_roughnessFactor.uiCapability()->setUiName( "Roughness Factor [m]" ); } - else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_linerDiameter.uiCapability()->setUiName( "Liner Inner Diameter [ft]" ); m_roughnessFactor.uiCapability()->setUiName( "Roughness Factor [ft]" ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.h b/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.h index ab4b95c11e..66b9a78417 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.h @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "cafPdmField.h" #include "cafPdmObject.h" @@ -56,10 +56,10 @@ public: ReferenceMDType referenceMDType() const; double manualReferenceMD() const; - double linerDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const; - static double defaultLinerDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ); - double roughnessFactor( RiaEclipseUnitTools::UnitSystem unitSystem ) const; - static double defaultRoughnessFactor( RiaEclipseUnitTools::UnitSystem unitSystem ); + double linerDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const; + static double defaultLinerDiameter( RiaDefines::EclipseUnitSystem unitSystem ); + double roughnessFactor( RiaDefines::EclipseUnitSystem unitSystem ) const; + static double defaultRoughnessFactor( RiaDefines::EclipseUnitSystem unitSystem ); PressureDropEnum pressureDrop() const; LengthAndDepthEnum lengthAndDepth() const; double maxSegmentLength() const; diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp index 027433e0e0..68e962432f 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp @@ -20,6 +20,8 @@ #include "RigWellPath.h" +#include "RiaEclipseUnitTools.h" + #include "RimFishbonesMultipleSubs.h" #include "RimPerforationInterval.h" #include "RimWellPath.h" @@ -225,14 +227,14 @@ void RimMultipleValveLocations::defineUiOrdering( QString uiConfigName, caf::Pdm firstAncestorOrThisOfType( wellPath ); if ( wellPath ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_locationOfValves.uiCapability()->setUiName( "Measured Depths [m]" ); m_rangeStart.uiCapability()->setUiName( "Start MD [m]" ); m_rangeEnd.uiCapability()->setUiName( "End MD [m]" ); m_rangeValveSpacing.uiCapability()->setUiName( "Spacing [m]" ); } - else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_locationOfValves.uiCapability()->setUiName( "Measured Depths [ft]" ); m_rangeStart.uiCapability()->setUiName( "Start MD [ft]" ); @@ -326,7 +328,7 @@ void RimMultipleValveLocations::fieldChangedByUi( const caf::PdmFieldHandle* cha RimWellPath* wellPath = nullptr; this->firstAncestorOrThisOfTypeAsserted( wellPath ); - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { double minimumDistanceFeet = RiaEclipseUnitTools::meterToFeet( minimumDistanceMeter ); m_rangeValveSpacing = cvf::Math::clamp( m_rangeValveSpacing(), diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.h b/ApplicationLibCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.h index b7f9f1e039..edca615d2c 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.h @@ -17,8 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "RiaEclipseUnitTools.h" - #include "cafPdmField.h" #include "cafPdmObject.h" #include "cafPdmUiGroup.h" diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp index 1ad9b6f1c2..a417a8e49f 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp @@ -20,6 +20,8 @@ #include "RimPerforationInterval.h" #include "RiaColorTables.h" +#include "RiaEclipseUnitTools.h" + #include "RigCaseCellResultsData.h" #include "RigWellPath.h" @@ -131,17 +133,17 @@ void RimPerforationInterval::setSkinFactor( double skinFactor ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimPerforationInterval::diameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const +double RimPerforationInterval::diameter( RiaDefines::EclipseUnitSystem unitSystem ) const { RimWellPath* wellPath; firstAncestorOrThisOfTypeAsserted( wellPath ); - if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC && - wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + if ( unitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC && + wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { return RiaEclipseUnitTools::feetToMeter( m_diameter() ); } - else if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD && - wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + else if ( unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD && + wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { return RiaEclipseUnitTools::meterToFeet( m_diameter() ); } @@ -198,11 +200,11 @@ void RimPerforationInterval::setUnitSystemSpecificDefaults() firstAncestorOrThisOfType( wellPath ); if ( wellPath ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_diameter = 0.216; } - else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_diameter = 0.709; } @@ -343,13 +345,13 @@ void RimPerforationInterval::defineUiOrdering( QString uiConfigName, caf::PdmUiO firstAncestorOrThisOfType( wellPath ); if ( wellPath ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_startMD.uiCapability()->setUiName( "Start MD [m]" ); m_endMD.uiCapability()->setUiName( "End MD [m]" ); m_diameter.uiCapability()->setUiName( "Diameter [m]" ); } - else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_startMD.uiCapability()->setUiName( "Start MD [ft]" ); m_endMD.uiCapability()->setUiName( "End MD [ft]" ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.h b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.h index acca773091..00eb4fce3e 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.h @@ -23,7 +23,7 @@ #include "RimCheckableNamedObject.h" #include "RimWellPathComponentInterface.h" -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "cafPdmChildArrayField.h" #include "cafPdmField.h" @@ -55,7 +55,7 @@ public: void setDiameter( double diameter ); void setSkinFactor( double skinFactor ); - double diameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const; + double diameter( RiaDefines::EclipseUnitSystem unitSystem ) const; double skinFactor() const; bool isActiveOnDate( const QDateTime& date ) const; diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp index f9108bbf82..0fb0b78486 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp @@ -20,6 +20,7 @@ #include "RiaApplication.h" #include "RiaCompletionTypeCalculationScheduler.h" +#include "RiaEclipseUnitTools.h" #include "RiaFractureDefines.h" #include "RiaLogging.h" #include "RiaWeightedGeometricMeanCalculator.h" @@ -292,7 +293,7 @@ void RimStimPlanFractureTemplate::loadDataAndUpdate() { setDefaultConductivityResultIfEmpty(); - if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ) + if ( fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ) { setUnitSystem( m_stimPlanFractureDefinitionData->unitSet() ); } @@ -306,7 +307,7 @@ void RimStimPlanFractureTemplate::loadDataAndUpdate() } else { - setUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ); + setUnitSystem( RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ); m_readError = true; } @@ -432,11 +433,11 @@ void RimStimPlanFractureTemplate::computePerforationLength() } } - if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC && m_perforationLength < 10 ) + if ( fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_METRIC && m_perforationLength < 10 ) { m_perforationLength = 10; } - else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD && + else if ( fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_FIELD && m_perforationLength < RiaEclipseUnitTools::meterToFeet( 10 ) ) { m_perforationLength = std::round( RiaEclipseUnitTools::meterToFeet( 10 ) ); @@ -447,22 +448,22 @@ void RimStimPlanFractureTemplate::computePerforationLength() /// //-------------------------------------------------------------------------------------------------- std::vector - RimStimPlanFractureTemplate::fractureGridResultsForUnitSystem( const QString& resultName, - const QString& unitName, - size_t timeStepIndex, - RiaEclipseUnitTools::UnitSystem requiredUnitSystem ) const + RimStimPlanFractureTemplate::fractureGridResultsForUnitSystem( const QString& resultName, + const QString& unitName, + size_t timeStepIndex, + RiaDefines::EclipseUnitSystem requiredUnitSystem ) const { auto resultValues = m_stimPlanFractureDefinitionData->fractureGridResults( resultName, unitName, m_activeTimeStepIndex ); - if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { for ( auto& v : resultValues ) { v = RiaEclipseUnitTools::convertToMeter( v, unitName ); } } - else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( fractureTemplateUnit() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { for ( auto& v : resultValues ) { @@ -797,7 +798,7 @@ bool RimStimPlanFractureTemplate::showStimPlanMesh() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimStimPlanFractureTemplate::convertToUnitSystem( RiaEclipseUnitTools::UnitSystem neededUnit ) +void RimStimPlanFractureTemplate::convertToUnitSystem( RiaDefines::EclipseUnitSystem neededUnit ) { if ( m_fractureTemplateUnit() == neededUnit ) return; @@ -809,11 +810,11 @@ void RimStimPlanFractureTemplate::convertToUnitSystem( RiaEclipseUnitTools::Unit if ( m_stimPlanFractureDefinitionData.isNull() ) return; - if ( neededUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + if ( neededUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_wellPathDepthAtFracture = RiaEclipseUnitTools::meterToFeet( m_wellPathDepthAtFracture ); } - else if ( neededUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + else if ( neededUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_wellPathDepthAtFracture = RiaEclipseUnitTools::feetToMeter( m_wellPathDepthAtFracture ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h b/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h index 7477fba23d..ba917bafaa 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h @@ -73,7 +73,7 @@ public: std::vector timeSteps(); std::vector> uiResultNamesWithUnit() const override; std::vector> - resultValues( const QString& uiResultName, const QString& unitName, size_t timeStepIndex ) const; + resultValues( const QString& uiResultName, const QString& unitName, size_t timeStepIndex ) const; std::vector fractureGridResults( const QString& resultName, const QString& unitName, size_t timeStepIndex ) const; bool hasConductivity() const; double resultValueAtIJ( const QString& uiResultName, const QString& unitName, size_t timeStepIndex, size_t i, size_t j ); @@ -89,7 +89,7 @@ public: bool showStimPlanMesh() const; - void convertToUnitSystem( RiaEclipseUnitTools::UnitSystem neededUnit ) override; + void convertToUnitSystem( RiaDefines::EclipseUnitSystem neededUnit ) override; protected: void initAfterRead() override; @@ -109,10 +109,10 @@ private: void computeDepthOfWellPathAtFracture(); void computePerforationLength(); - std::vector fractureGridResultsForUnitSystem( const QString& resultName, - const QString& unitName, - size_t timeStepIndex, - RiaEclipseUnitTools::UnitSystem requiredUnitSystem ) const; + std::vector fractureGridResultsForUnitSystem( const QString& resultName, + const QString& unitName, + size_t timeStepIndex, + RiaDefines::EclipseUnitSystem requiredUnitSystem ) const; WellFractureIntersectionData wellFractureIntersectionData( const RimFracture* fractureInstance ) const override; diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.cpp index 68d3174b91..9e57033c1b 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.cpp @@ -34,7 +34,7 @@ RimValveTemplate::RimValveTemplate() CAF_PDM_InitField( &m_valveTemplateUnit, "UnitSystem", - caf::AppEnum( RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ), + caf::AppEnum( RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ), "Units System", "", "", @@ -73,7 +73,7 @@ void RimValveTemplate::loadDataAndUpdate() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimValveTemplate::setUnitSystem( RiaEclipseUnitTools::UnitSystemType unitSystem ) +void RimValveTemplate::setUnitSystem( caf::AppEnum unitSystem ) { m_valveTemplateUnit = unitSystem; } @@ -83,11 +83,11 @@ void RimValveTemplate::setUnitSystem( RiaEclipseUnitTools::UnitSystemType unitSy //-------------------------------------------------------------------------------------------------- void RimValveTemplate::setDefaultValuesFromUnits() { - if ( m_valveTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( m_valveTemplateUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_orificeDiameter = 8; } - else if ( m_valveTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( m_valveTemplateUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_orificeDiameter = 0.315; } @@ -115,7 +115,7 @@ void RimValveTemplate::setType( RiaDefines::WellPathComponentType type ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystemType RimValveTemplate::templateUnits() const +caf::AppEnum RimValveTemplate::templateUnits() const { return m_valveTemplateUnit; } @@ -200,11 +200,11 @@ void RimValveTemplate::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin uiOrdering.add( &m_valveTemplateUnit ); if ( m_type() == RiaDefines::WellPathComponentType::ICV || m_type() == RiaDefines::WellPathComponentType::ICD ) { - if ( m_valveTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( m_valveTemplateUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_orificeDiameter.uiCapability()->setUiName( "Orifice Diameter [mm]" ); } - else if ( m_valveTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( m_valveTemplateUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_orificeDiameter.uiCapability()->setUiName( "Orifice Diameter [in]" ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.h b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.h index 7b7e4a9c13..a1713e4e0f 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.h @@ -19,7 +19,6 @@ #pragma once #include "RiaDefines.h" -#include "RiaEclipseUnitTools.h" #include "RimCheckableNamedObject.h" @@ -36,18 +35,18 @@ public: ~RimValveTemplate() override; void loadDataAndUpdate(); - void setUnitSystem( RiaEclipseUnitTools::UnitSystemType unitSystem ); + void setUnitSystem( caf::AppEnum unitSystem ); void setDefaultValuesFromUnits(); - RiaDefines::WellPathComponentType type() const; - void setType( RiaDefines::WellPathComponentType type ); - RiaEclipseUnitTools::UnitSystemType templateUnits() const; - double orificeDiameter() const; - double flowCoefficient() const; - const RimWellPathAicdParameters* aicdParameters() const; - QString typeLabel() const; - QString fullLabel() const; - void setUserLabel( const QString& userLabel ); + RiaDefines::WellPathComponentType type() const; + void setType( RiaDefines::WellPathComponentType type ); + caf::AppEnum templateUnits() const; + double orificeDiameter() const; + double flowCoefficient() const; + const RimWellPathAicdParameters* aicdParameters() const; + QString typeLabel() const; + QString fullLabel() const; + void setUserLabel( const QString& userLabel ); protected: QList calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, @@ -59,7 +58,7 @@ protected: private: typedef caf::AppEnum CompletionTypeEnum; - caf::PdmField m_valveTemplateUnit; + caf::PdmField> m_valveTemplateUnit; caf::PdmField m_type; caf::PdmField m_userLabel; diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp index e8f2a0d312..8a652a4d52 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp @@ -36,7 +36,7 @@ RimValveTemplateCollection::RimValveTemplateCollection() "", "", "" ); - m_defaultUnitsForValveTemplates = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC; + m_defaultUnitsForValveTemplates = RiaDefines::EclipseUnitSystem::UNITS_METRIC; m_valveDefinitions.uiCapability()->setUiHidden( true ); addDefaultValveTemplates(); } @@ -81,7 +81,7 @@ void RimValveTemplateCollection::removeAndDeleteValveTemplate( RimValveTemplate* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystemType RimValveTemplateCollection::defaultUnitSystemType() const +caf::AppEnum RimValveTemplateCollection::defaultUnitSystemType() const { return m_defaultUnitsForValveTemplates; } @@ -94,7 +94,7 @@ void RimValveTemplateCollection::setDefaultUnitSystemBasedOnLoadedCases() RimProject* proj = RimProject::current(); auto commonUnitSystem = proj->commonUnitSystemForAllCases(); - if ( commonUnitSystem != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ) + if ( commonUnitSystem != RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ) { m_defaultUnitsForValveTemplates = commonUnitSystem; } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.h b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.h index 394a4a45a4..d6befa5247 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "cafPdmChildArrayField.h" #include "cafPdmField.h" @@ -43,10 +43,10 @@ public: void removeAndDeleteValveTemplate( RimValveTemplate* valveTemplate ); void addDefaultValveTemplates(); - RiaEclipseUnitTools::UnitSystemType defaultUnitSystemType() const; - void setDefaultUnitSystemBasedOnLoadedCases(); + caf::AppEnum defaultUnitSystemType() const; + void setDefaultUnitSystemBasedOnLoadedCases(); private: - caf::PdmChildArrayField m_valveDefinitions; - caf::PdmField m_defaultUnitsForValveTemplates; + caf::PdmChildArrayField m_valveDefinitions; + caf::PdmField> m_defaultUnitsForValveTemplates; }; diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathAicdParameters.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathAicdParameters.cpp index ba1fe41378..2f32516afb 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathAicdParameters.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathAicdParameters.cpp @@ -292,7 +292,7 @@ bool RimWellPathAicdParameters::isMetric() const firstAncestorOrThisOfType( wellPath ); if ( wellPath ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { metric = true; } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp index b6968ba48a..96b9371c22 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp @@ -139,7 +139,7 @@ std::vector RimWellPathValve::valveLocations() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimWellPathValve::orificeDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const +double RimWellPathValve::orificeDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const { if ( m_valveTemplate() ) { @@ -230,13 +230,13 @@ const RimWellPathAicdParameters* RimWellPathValve::aicdParameters() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimWellPathValve::convertOrificeDiameter( double orificeDiameterWellPathUnits, - RiaEclipseUnitTools::UnitSystem wellPathUnits, - RiaEclipseUnitTools::UnitSystem unitSystem ) +double RimWellPathValve::convertOrificeDiameter( double orificeDiameterWellPathUnits, + RiaDefines::EclipseUnitSystem wellPathUnits, + RiaDefines::EclipseUnitSystem unitSystem ) { - if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( unitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { - if ( wellPathUnits == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + if ( wellPathUnits == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { return RiaEclipseUnitTools::inchToMeter( orificeDiameterWellPathUnits ); } @@ -245,9 +245,9 @@ double RimWellPathValve::convertOrificeDiameter( double return RiaEclipseUnitTools::mmToMeter( orificeDiameterWellPathUnits ); } } - else if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { - if ( wellPathUnits == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPathUnits == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { return RiaEclipseUnitTools::meterToFeet( RiaEclipseUnitTools::mmToMeter( orificeDiameterWellPathUnits ) ); } @@ -518,11 +518,11 @@ void RimWellPathValve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin firstAncestorOrThisOfType( wellPath ); if ( wellPath ) { - if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { m_measuredDepth.uiCapability()->setUiName( "Measured Depth [m]" ); } - else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { m_measuredDepth.uiCapability()->setUiName( "Measured Depth [ft]" ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.h b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.h index a07c4c9cb1..692b2d18f3 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.h @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RimCheckableNamedObject.h" #include "RimValveTemplate.h" @@ -49,16 +49,16 @@ public: void setMeasuredDepthAndCount( double startMD, double spacing, int valveCount ); void multipleValveGeometryUpdated(); std::vector valveLocations() const; - double orificeDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const; + double orificeDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const; double flowCoefficient() const; RimValveTemplate* valveTemplate() const; void setValveTemplate( RimValveTemplate* valveTemplate ); void applyValveLabelAndIcon(); const RimWellPathAicdParameters* aicdParameters() const; - static double convertOrificeDiameter( double orificeDiameterUi, - RiaEclipseUnitTools::UnitSystem wellPathUnitSystem, - RiaEclipseUnitTools::UnitSystem wantedUnitSystem ); + static double convertOrificeDiameter( double orificeDiameterUi, + RiaDefines::EclipseUnitSystem wellPathUnitSystem, + RiaDefines::EclipseUnitSystem wantedUnitSystem ); std::vector> valveSegments() const; diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp index 86f6d10e72..ea8707b2e7 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp @@ -476,7 +476,7 @@ std::map*> //-------------------------------------------------------------------------------------------------- void RimWellAllocationPlot::updateWellFlowPlotXAxisTitle( RimWellLogTrack* plotTrack ) { - RiaEclipseUnitTools::UnitSystem unitSet = m_case->eclipseCaseData()->unitsType(); + RiaDefines::EclipseUnitSystem unitSet = m_case->eclipseCaseData()->unitsType(); RimWellLogFile::WellFlowCondition condition = m_flowDiagSolution ? RimWellLogFile::WELL_FLOW_COND_RESERVOIR : RimWellLogFile::WELL_FLOW_COND_STANDARD; diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.cpp index 268d4707ac..2f334984b3 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.cpp @@ -805,7 +805,7 @@ std::set /// //-------------------------------------------------------------------------------------------------- QString RimWellPlotTools::flowPlotAxisTitle( RimWellLogFile::WellFlowCondition condition, - RiaEclipseUnitTools::UnitSystem unitSystem ) + RiaDefines::EclipseUnitSystem unitSystem ) { QString axisTitle; @@ -828,19 +828,19 @@ QString RimWellPlotTools::flowPlotAxisTitle( RimWellLogFile::WellFlowCondition c //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString flowConditionReservoirUnitText( RiaEclipseUnitTools::UnitSystem unitSystem ) +QString flowConditionReservoirUnitText( RiaDefines::EclipseUnitSystem unitSystem ) { QString unitText; switch ( unitSystem ) { - case RiaEclipseUnitTools::UnitSystem::UNITS_METRIC: + case RiaDefines::EclipseUnitSystem::UNITS_METRIC: unitText = "[m3/day]"; break; - case RiaEclipseUnitTools::UnitSystem::UNITS_FIELD: + case RiaDefines::EclipseUnitSystem::UNITS_FIELD: unitText = "[Brl/day]"; break; - case RiaEclipseUnitTools::UnitSystem::UNITS_LAB: + case RiaDefines::EclipseUnitSystem::UNITS_LAB: unitText = "[cm3/hr]"; break; default: @@ -854,7 +854,7 @@ QString flowConditionReservoirUnitText( RiaEclipseUnitTools::UnitSystem unitSyst /// //-------------------------------------------------------------------------------------------------- QString RimWellPlotTools::flowUnitText( RimWellLogFile::WellFlowCondition condition, - RiaEclipseUnitTools::UnitSystem unitSystem ) + RiaDefines::EclipseUnitSystem unitSystem ) { QString unitText; @@ -866,13 +866,13 @@ QString RimWellPlotTools::flowUnitText( RimWellLogFile::WellFlowCondition condit { switch ( unitSystem ) { - case RiaEclipseUnitTools::UnitSystem::UNITS_METRIC: + case RiaDefines::EclipseUnitSystem::UNITS_METRIC: unitText = "[Liquid Sm3/day], [Gas kSm3/day]"; break; - case RiaEclipseUnitTools::UnitSystem::UNITS_FIELD: + case RiaDefines::EclipseUnitSystem::UNITS_FIELD: unitText = "[Liquid BBL/day], [Gas BOE/day]"; break; - case RiaEclipseUnitTools::UnitSystem::UNITS_LAB: + case RiaDefines::EclipseUnitSystem::UNITS_LAB: unitText = "[cm3/hr]"; break; default: @@ -887,7 +887,7 @@ QString RimWellPlotTools::flowUnitText( RimWellLogFile::WellFlowCondition condit /// //-------------------------------------------------------------------------------------------------- QString RimWellPlotTools::curveUnitText( RimWellLogFile::WellFlowCondition condition, - RiaEclipseUnitTools::UnitSystem unitSystem, + RiaDefines::EclipseUnitSystem unitSystem, FlowPhase flowPhase ) { QString unitText; @@ -900,7 +900,7 @@ QString RimWellPlotTools::curveUnitText( RimWellLogFile::WellFlowCondition condi { switch ( unitSystem ) { - case RiaEclipseUnitTools::UnitSystem::UNITS_METRIC: + case RiaDefines::EclipseUnitSystem::UNITS_METRIC: switch ( flowPhase ) { case FLOW_PHASE_GAS: @@ -916,7 +916,7 @@ QString RimWellPlotTools::curveUnitText( RimWellLogFile::WellFlowCondition condi } break; - case RiaEclipseUnitTools::UnitSystem::UNITS_FIELD: + case RiaDefines::EclipseUnitSystem::UNITS_FIELD: switch ( flowPhase ) { case FLOW_PHASE_GAS: @@ -931,7 +931,7 @@ QString RimWellPlotTools::curveUnitText( RimWellLogFile::WellFlowCondition condi break; } break; - case RiaEclipseUnitTools::UnitSystem::UNITS_LAB: + case RiaDefines::EclipseUnitSystem::UNITS_LAB: unitText = "[cm3/hr]"; break; default: diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.h b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.h index f1e6c9ba32..fa044c4245 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.h +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RiaRftPltCurveDefinition.h" #include "RifDataSourceForRftPltQMetaType.h" @@ -121,12 +121,12 @@ public: const std::set& interestingRFTResults ); static QString flowPlotAxisTitle( RimWellLogFile::WellFlowCondition condition, - RiaEclipseUnitTools::UnitSystem unitSystem ); + RiaDefines::EclipseUnitSystem unitSystem ); - static QString flowUnitText( RimWellLogFile::WellFlowCondition condition, RiaEclipseUnitTools::UnitSystem unitSystem ); + static QString flowUnitText( RimWellLogFile::WellFlowCondition condition, RiaDefines::EclipseUnitSystem unitSystem ); static QString curveUnitText( RimWellLogFile::WellFlowCondition condition, - RiaEclipseUnitTools::UnitSystem unitSystem, + RiaDefines::EclipseUnitSystem unitSystem, FlowPhase flowPhase ); static bool hasFlowData( const RimWellPath* wellPath ); diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp index 85c5b06a6a..981f725a41 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp @@ -7,8 +7,8 @@ // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // -// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// ResInsight is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or // FITNESS FOR A PARTICULAR PURPOSE. // // See the GNU General Public License at @@ -154,7 +154,7 @@ RimWellPltPlot::~RimWellPltPlot() //-------------------------------------------------------------------------------------------------- void RimWellPltPlot::setPlotXAxisTitles( RimWellLogTrack* plotTrack ) { - std::set presentUnitSystems; + std::set presentUnitSystems; for ( const RifDataSourceForRftPlt& source : m_selectedSources.v() ) { if ( source.eclCase() && source.eclCase()->eclipseCaseData() ) @@ -170,13 +170,13 @@ void RimWellPltPlot::setPlotXAxisTitles( RimWellLogTrack* plotTrack ) switch ( source.wellLogFile()->wellLogFileData()->depthUnit() ) { case RiaDefines::DepthUnitType::UNIT_METER: - presentUnitSystems.insert( RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ); + presentUnitSystems.insert( RiaDefines::EclipseUnitSystem::UNITS_METRIC ); break; case RiaDefines::DepthUnitType::UNIT_FEET: - presentUnitSystems.insert( RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ); + presentUnitSystems.insert( RiaDefines::EclipseUnitSystem::UNITS_FIELD ); break; case RiaDefines::DepthUnitType::UNIT_NONE: - presentUnitSystems.insert( RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ); + presentUnitSystems.insert( RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ); break; } } @@ -190,7 +190,7 @@ void RimWellPltPlot::setPlotXAxisTitles( RimWellLogTrack* plotTrack ) if ( presentUnitSystems.empty() ) return; - RiaEclipseUnitTools::UnitSystem unitSet = *presentUnitSystems.begin(); + RiaDefines::EclipseUnitSystem unitSet = *presentUnitSystems.begin(); QString axisTitle; if ( m_useReservoirConditionCurves ) @@ -244,7 +244,8 @@ void RimWellPltPlot::updateFormationsOnPlot() const if ( !formationNamesCase ) { - /// Set default case. Todo : Use the first of the selected cases in the plot + /// Set default case. Todo : Use the first of the selected cases in the + /// plot std::vector cases; proj->allCases( cases ); @@ -372,7 +373,8 @@ public: RigWellResultPoint resPoint; resPoint.m_isOpen = true; resPoint.m_gridIndex = 0; // Always main grid - resPoint.m_gridCellIndex = globCellIdx; // Shortcut, since we only have main grid results from RFT + resPoint.m_gridCellIndex = globCellIdx; // Shortcut, since we only have + // main grid results from RFT resPoint.m_gasRate = RiaEclipseUnitTools::convertSurfaceGasFlowRateToOilEquivalents( eclCase->eclipseCaseData()->unitsType(), @@ -541,7 +543,7 @@ void RimWellPltPlot::syncCurvesFromUiSelection() resultPointCalc.reset( new RigSimWellResultPointCalculator( m_wellPathName, rimEclipseResultCase, timeStep ) ); } - RiaEclipseUnitTools::UnitSystem unitSet = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + RiaDefines::EclipseUnitSystem unitSet = RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; if ( rimEclipseResultCase ) { unitSet = rimEclipseResultCase->eclipseCaseData()->unitsType(); @@ -654,13 +656,13 @@ void RimWellPltPlot::syncCurvesFromUiSelection() std::vector depthValues = wellLogFileData->depthValues(); - RiaEclipseUnitTools::UnitSystem unitSystem = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + RiaDefines::EclipseUnitSystem unitSystem = RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; { RiaDefines::DepthUnitType depthUnit = wellLogFileData->depthUnit(); if ( depthUnit == RiaDefines::DepthUnitType::UNIT_FEET ) - unitSystem = RiaEclipseUnitTools::UnitSystem::UNITS_FIELD; + unitSystem = RiaDefines::EclipseUnitSystem::UNITS_FIELD; if ( depthUnit == RiaDefines::DepthUnitType::UNIT_METER ) - unitSystem = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC; + unitSystem = RiaDefines::EclipseUnitSystem::UNITS_METRIC; } for ( const ChannelValNameIdxTuple& channelInfo : sortedChannels ) @@ -693,8 +695,8 @@ void RimWellPltPlot::syncCurvesFromUiSelection() curveGroupId, true ); - // Total flow channel will end up first, so just increment the group - // idx to make the rest of the phases group together + // Total flow channel will end up first, so just increment the + // group idx to make the rest of the phases group together if ( RimWellPlotTools::isTotalFlowChannel( channelName ) ) curveGroupId++; } } @@ -914,9 +916,10 @@ void RimWellPltPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedField, { if ( !wellPath->wellPathGeometry() ) { - QString tmp = - QString( "Display of Measured Depth (MD) for Grid or RFT curves is not possible without a " - "well log path, and the curve will be hidden in this mode.\n\n" ); + QString tmp = QString( "Display of Measured Depth (MD) for Grid or " + "RFT curves is not possible without a " + "well log path, and the curve will be hidden " + "in this mode.\n\n" ); RiaLogging::errorInMessageBox( nullptr, "Grid/RFT curve without MD", tmp ); diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.cpp index 69fef44caa..b8016fa861 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.cpp @@ -137,7 +137,7 @@ void RimSaturationPressurePlot::assignCaseAndEquilibriumRegion( RiaDefines::Poro RimEclipseResultDefinition* resultDefinition = new RimEclipseResultDefinition(); resultDefinition->setEclipseCase( eclipseResultCase ); resultDefinition->setResultType( RiaDefines::ResultCatType::STATIC_NATIVE ); - resultDefinition->setResultVariable( RiaDefines::eqlnumResultName() ); + resultDefinition->setResultVariable( RiaResultNames::eqlnumResultName() ); cellFilter->setResultDefinition( resultDefinition ); } @@ -244,7 +244,7 @@ RimPlotCellPropertyFilter* RimEclipseResultDefinition* resultDefinition = new RimEclipseResultDefinition(); resultDefinition->setEclipseCase( eclipseResultCase ); resultDefinition->setResultType( RiaDefines::ResultCatType::STATIC_NATIVE ); - resultDefinition->setResultVariable( RiaDefines::eqlnumResultName() ); + resultDefinition->setResultVariable( RiaResultNames::eqlnumResultName() ); cellFilter->setResultDefinition( resultDefinition ); diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp index 0a2f0c590d..da915284e3 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp @@ -65,7 +65,7 @@ std::vector std::set eqlnumRegionIdsFound; { - RigEclipseResultAddress resAdr( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::eqlnumResultName() ); + RigEclipseResultAddress resAdr( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::eqlnumResultName() ); if ( results->hasResultEntry( resAdr ) ) { results->ensureKnownResultLoaded( resAdr ); diff --git a/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp b/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp index 086543422f..3abba416ec 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp @@ -215,7 +215,7 @@ QList RimCellEdgeColors::calculateValueOptions( const ca int i; for ( i = 0; i < varList.size(); ++i ) { - if ( RiaDefines::isPerCellFaceResult( varList[i] ) ) continue; + if ( RiaResultNames::isPerCellFaceResult( varList[i] ) ) continue; size_t cubeFaceIdx; for ( cubeFaceIdx = 0; cubeFaceIdx < EdgeFaceEnum::size(); ++cubeFaceIdx ) @@ -258,7 +258,7 @@ QList RimCellEdgeColors::calculateValueOptions( const ca options.push_back( caf::PdmOptionItemInfo( optionUiName, QVariant( it->first ) ) ); } - options.push_front( caf::PdmOptionItemInfo( RiaDefines::undefinedResultName(), "" ) ); + options.push_front( caf::PdmOptionItemInfo( RiaResultNames::undefinedResultName(), "" ) ); if ( useOptionsOnly ) *useOptionsOnly = true; @@ -317,7 +317,7 @@ QStringList RimCellEdgeColors::findResultVariableNames() int i; for ( i = 0; i < varList.size(); ++i ) { - if ( RiaDefines::isPerCellFaceResult( varList[i] ) ) continue; + if ( RiaResultNames::isPerCellFaceResult( varList[i] ) ) continue; if ( varList[i].startsWith( m_resultVariable ) ) { diff --git a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp index fe08dca20d..8be66e6571 100644 --- a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp @@ -401,10 +401,10 @@ RiaDefines::DepthUnitType RimDepthTrackPlot::caseDepthUnit() const { switch ( thecase->unitSystem() ) { - case RiaEclipseUnitTools::UnitSystem::UNITS_FIELD: + case RiaDefines::EclipseUnitSystem::UNITS_FIELD: return RiaDefines::DepthUnitType::UNIT_FEET; - case RiaEclipseUnitTools::UnitSystem::UNITS_METRIC: + case RiaDefines::EclipseUnitSystem::UNITS_METRIC: return RiaDefines::DepthUnitType::UNIT_METER; default: diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp index b22885ff1e..271c393ad7 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp @@ -531,7 +531,7 @@ void RimEclipseCase::updateFormationNamesData() { if ( eclView->cellResult()->resultType() == RiaDefines::ResultCatType::FORMATION_NAMES ) { - eclView->cellResult()->setResultVariable( RiaDefines::undefinedResultName() ); + eclView->cellResult()->setResultVariable( RiaResultNames::undefinedResultName() ); eclView->cellResult()->updateConnectedEditors(); } @@ -540,7 +540,7 @@ void RimEclipseCase::updateFormationNamesData() { if ( propFilter->resultDefinition()->resultType() == RiaDefines::ResultCatType::FORMATION_NAMES ) { - propFilter->resultDefinition()->setResultVariable( RiaDefines::undefinedResultName() ); + propFilter->resultDefinition()->setResultVariable( RiaResultNames::undefinedResultName() ); } } } @@ -948,7 +948,7 @@ bool RimEclipseCase::openReserviorCase() // make sure the nnc transmissibilities can be addressed by this scalarResultIndex as well RigEclipseResultAddress combinedTransmissibilityResAddr( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::combinedTransmissibilityResultName() ); + RiaResultNames::combinedTransmissibilityResultName() ); if ( results->hasResultEntry( combinedTransmissibilityResAddr ) ) { eclipseCaseData()->mainGrid()->nncData()->setEclResultAddress( RiaDefines::propertyNameCombTrans(), @@ -956,7 +956,7 @@ bool RimEclipseCase::openReserviorCase() } RigEclipseResultAddress combinedWaterFluxResAddr( RiaDefines::ResultCatType::DYNAMIC_NATIVE, - RiaDefines::combinedWaterFluxResultName() ); + RiaResultNames::combinedWaterFluxResultName() ); if ( results->hasResultEntry( combinedWaterFluxResAddr ) ) { eclipseCaseData()->mainGrid()->nncData()->setEclResultAddress( RiaDefines::propertyNameFluxWat(), @@ -964,14 +964,14 @@ bool RimEclipseCase::openReserviorCase() } RigEclipseResultAddress combinedOilFluxResAddr( RiaDefines::ResultCatType::DYNAMIC_NATIVE, - RiaDefines::combinedOilFluxResultName() ); + RiaResultNames::combinedOilFluxResultName() ); if ( results->hasResultEntry( combinedOilFluxResAddr ) ) { eclipseCaseData()->mainGrid()->nncData()->setEclResultAddress( RiaDefines::propertyNameFluxOil(), combinedOilFluxResAddr ); } RigEclipseResultAddress combinedGasFluxResAddr( RiaDefines::ResultCatType::DYNAMIC_NATIVE, - RiaDefines::combinedGasFluxResultName() ); + RiaResultNames::combinedGasFluxResultName() ); if ( results->hasResultEntry( combinedGasFluxResAddr ) ) { diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp index 48717fa9c0..7a71bb3eaa 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp @@ -100,7 +100,7 @@ void RimEclipseCellColors::fieldChangedByUi( const caf::PdmFieldHandle* changedF changeLegendConfig( this->resultVariable() ); } - if ( newValue != RiaDefines::undefinedResultName() ) + if ( newValue != RiaResultNames::undefinedResultName() ) { if ( m_reservoirView ) m_reservoirView->hasUserRequestedAnimation = true; } @@ -126,7 +126,7 @@ void RimEclipseCellColors::fieldChangedByUi( const caf::PdmFieldHandle* changedF //-------------------------------------------------------------------------------------------------- void RimEclipseCellColors::changeLegendConfig( QString resultVarNameOfNewLegend ) { - if ( resultVarNameOfNewLegend != RiaDefines::ternarySaturationResultName() ) + if ( resultVarNameOfNewLegend != RiaResultNames::ternarySaturationResultName() ) { QString legendResultVariable; @@ -248,7 +248,7 @@ void RimEclipseCellColors::defineUiOrdering( QString uiConfigName, caf::PdmUiOrd //-------------------------------------------------------------------------------------------------- void RimEclipseCellColors::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ ) { - if ( this->resultVariable() == RiaDefines::ternarySaturationResultName() ) + if ( this->resultVariable() == RiaResultNames::ternarySaturationResultName() ) { uiTreeOrdering.add( m_ternaryLegendConfig() ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp index 51d4071a1d..51615966f0 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -318,7 +318,7 @@ bool RimEclipseResultCase::openAndReadActiveCellData( RigEclipseCaseData* mainEc //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystemType RimEclipseResultCase::unitSystem() +caf::AppEnum RimEclipseResultCase::unitSystem() { return m_unitSystem(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.h b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.h index 5a352c43e6..7f334752ba 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.h +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.h @@ -20,7 +20,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RimEclipseCase.h" @@ -61,7 +61,7 @@ public: bool openAndReadActiveCellData( RigEclipseCaseData* mainEclipseCase ); void readGridDimensions( std::vector>& gridDimensions ); - RiaEclipseUnitTools::UnitSystemType unitSystem(); + caf::AppEnum unitSystem(); // Overrides from RimCase QString locationOnDisc() const override; @@ -94,9 +94,9 @@ private: cvf::ref m_readerEclipseRft; // Fields: - caf::PdmProxyValueField m_unitSystem; - caf::PdmChildArrayField m_flowDiagSolutions; - caf::PdmField m_sourSimFileName; + caf::PdmProxyValueField> m_unitSystem; + caf::PdmChildArrayField m_flowDiagSolutions; + caf::PdmField m_sourSimFileName; // Obsolete field caf::PdmField caseDirectory; diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp index e31513d8e4..b578c9bfa9 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -113,7 +113,13 @@ RimEclipseResultDefinition::RimEclipseResultDefinition( caf::PdmUiItemInfo::Labe CAF_PDM_InitScriptableFieldNoDefault( &m_porosityModel, "PorosityModelType", "Porosity", "", "", "" ); m_porosityModel.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableField( &m_resultVariable, "ResultVariable", RiaDefines::undefinedResultName(), "Variable", "", "", "" ); + CAF_PDM_InitScriptableField( &m_resultVariable, + "ResultVariable", + RiaResultNames::undefinedResultName(), + "Variable", + "", + "", + "" ); m_resultVariable.uiCapability()->setUiHidden( true ); CAF_PDM_InitFieldNoDefault( &m_flowSolution, "FlowDiagSolution", "Solution", "", "", "" ); @@ -167,7 +173,7 @@ RimEclipseResultDefinition::RimEclipseResultDefinition( caf::PdmUiItemInfo::Labe CAF_PDM_InitField( &m_resultVariableUiField, "MResultVariable", - RiaDefines::undefinedResultName(), + RiaResultNames::undefinedResultName(), "Result Property", "", "", @@ -769,7 +775,7 @@ QList for ( const QString& resultName : dynamicResultNames ) { - if ( !resultName.endsWith( "F" ) || resultName == RiaDefines::completionTypeResultName() ) + if ( !resultName.endsWith( "F" ) || resultName == RiaResultNames::completionTypeResultName() ) { continue; } @@ -1162,7 +1168,7 @@ void RimEclipseResultDefinition::loadResult() } QString resultName = m_resultVariable(); - std::set eclipseResultNamesWithNncData = RiaDefines::nncResultNames(); + std::set eclipseResultNamesWithNncData = RiaResultNames::nncResultNames(); if ( eclipseResultNamesWithNncData.find( resultName ) != eclipseResultNamesWithNncData.end() ) { eclipseCase()->ensureFaultDataIsComputed(); @@ -1269,12 +1275,12 @@ void RimEclipseResultDefinition::initAfterRead() if ( m_resultVariable == "Formation Allen" ) { - m_resultVariable = RiaDefines::formationAllanResultName(); + m_resultVariable = RiaResultNames::formationAllanResultName(); m_resultType = RiaDefines::ResultCatType::ALLAN_DIAGRAMS; } else if ( m_resultVariable == "Binary Formation Allen" ) { - m_resultVariable = RiaDefines::formationBinaryAllanResultName(); + m_resultVariable = RiaResultNames::formationBinaryAllanResultName(); m_resultType = RiaDefines::ResultCatType::ALLAN_DIAGRAMS; } @@ -1441,8 +1447,9 @@ void RimEclipseResultDefinition::setDiffResultOptionsEnabled( bool enabled ) //-------------------------------------------------------------------------------------------------- bool RimEclipseResultDefinition::isTernarySaturationSelected() const { - bool isTernary = ( m_resultType() == RiaDefines::ResultCatType::DYNAMIC_NATIVE ) && - ( m_resultVariable().compare( RiaDefines::ternarySaturationResultName(), Qt::CaseInsensitive ) == 0 ); + bool isTernary = + ( m_resultType() == RiaDefines::ResultCatType::DYNAMIC_NATIVE ) && + ( m_resultVariable().compare( RiaResultNames::ternarySaturationResultName(), Qt::CaseInsensitive ) == 0 ); return isTernary; } @@ -1453,7 +1460,7 @@ bool RimEclipseResultDefinition::isTernarySaturationSelected() const bool RimEclipseResultDefinition::isCompletionTypeSelected() const { return ( m_resultType() == RiaDefines::ResultCatType::DYNAMIC_NATIVE && - m_resultVariable() == RiaDefines::completionTypeResultName() ); + m_resultVariable() == RiaResultNames::completionTypeResultName() ); } //-------------------------------------------------------------------------------------------------- @@ -1466,15 +1473,15 @@ bool RimEclipseResultDefinition::hasCategoryResult() const return true; if ( this->m_resultType() == RiaDefines::ResultCatType::DYNAMIC_NATIVE && - this->resultVariable() == RiaDefines::completionTypeResultName() ) + this->resultVariable() == RiaResultNames::completionTypeResultName() ) return true; if ( this->m_resultType() == RiaDefines::ResultCatType::FLOW_DIAGNOSTICS && m_resultVariable() == RIG_FLD_MAX_FRACTION_TRACER_RESNAME ) return true; - if ( this->resultVariable() == RiaDefines::formationAllanResultName() || - this->resultVariable() == RiaDefines::formationBinaryAllanResultName() ) + if ( this->resultVariable() == RiaResultNames::formationAllanResultName() || + this->resultVariable() == RiaResultNames::formationBinaryAllanResultName() ) { return true; } @@ -1724,12 +1731,12 @@ QList for ( const QString& s : getResultNamesForResultType( resultCatType, results ) ) { - if ( s == RiaDefines::completionTypeResultName() ) + if ( s == RiaResultNames::completionTypeResultName() ) { if ( results->timeStepDates().empty() ) continue; } - if ( RiaDefines::isPerCellFaceResult( s ) ) + if ( RiaResultNames::isPerCellFaceResult( s ) ) { cellFaceResultNames.push_back( s ); } @@ -1775,14 +1782,14 @@ QList if ( resultCatType == RiaDefines::ResultCatType::DYNAMIC_NATIVE && hasAtLeastOneTernaryComponent ) { - optionList.push_front( caf::PdmOptionItemInfo( RiaDefines::ternarySaturationResultName(), - RiaDefines::ternarySaturationResultName() ) ); + optionList.push_front( caf::PdmOptionItemInfo( RiaResultNames::ternarySaturationResultName(), + RiaResultNames::ternarySaturationResultName() ) ); } } } optionList.push_front( - caf::PdmOptionItemInfo( RiaDefines::undefinedResultName(), RiaDefines::undefinedResultName() ) ); + caf::PdmOptionItemInfo( RiaResultNames::undefinedResultName(), RiaResultNames::undefinedResultName() ) ); return optionList; } @@ -1985,7 +1992,7 @@ void RimEclipseResultDefinition::updateRangesForExplicitLegends( RimRegularLegen } else if ( this->resultType() == RiaDefines::ResultCatType::ALLAN_DIAGRAMS ) { - if ( this->resultVariable() == RiaDefines::formationAllanResultName() ) + if ( this->resultVariable() == RiaResultNames::formationAllanResultName() ) { const std::vector fnVector = eclipseCaseData->formationNames(); std::vector fnameIdxes; @@ -2034,7 +2041,7 @@ void RimEclipseResultDefinition::updateRangesForExplicitLegends( RimRegularLegen legendConfigToUpdate->setCategoryItems( categories ); } - else if ( this->resultVariable() == RiaDefines::formationBinaryAllanResultName() ) + else if ( this->resultVariable() == RiaResultNames::formationBinaryAllanResultName() ) { std::vector> categories; categories.emplace_back( std::make_tuple( "Same formation", 0, cvf::Color3ub::BROWN ) ); @@ -2044,7 +2051,7 @@ void RimEclipseResultDefinition::updateRangesForExplicitLegends( RimRegularLegen } } else if ( this->resultType() == RiaDefines::ResultCatType::DYNAMIC_NATIVE && - this->resultVariable() == RiaDefines::completionTypeResultName() ) + this->resultVariable() == RiaResultNames::completionTypeResultName() ) { const std::vector& visibleCategories = cellResultsData->uniqueCellScalarValues( this->eclipseResultAddress() ); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp index 0f1109e05c..675628bda8 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp @@ -131,7 +131,7 @@ RimEclipseStatisticsCase::RimEclipseStatisticsCase() CAF_PDM_InitScriptableField( &m_wellDataSourceCase, "WellDataSourceCase", - RiaDefines::undefinedResultName(), + RiaResultNames::undefinedResultName(), "Well Data Source Case", "", "", @@ -529,7 +529,7 @@ QList else if ( &m_wellDataSourceCase == fieldNeedingOptions ) { QStringList sourceCaseNames; - sourceCaseNames += RiaDefines::undefinedResultName(); + sourceCaseNames += RiaResultNames::undefinedResultName(); for ( size_t i = 0; i < caseGroup()->caseCollection()->reservoirs().size(); i++ ) { diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp index 9dda840198..5fca502a60 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp @@ -1774,7 +1774,7 @@ void RimEclipseView::calculateCompletionTypeAndRedrawIfRequired() cellEdgeResult()->cellEdgeMetaData( &metaData ); for ( const auto& cellEdgeMeta : metaData ) { - if ( cellEdgeMeta.m_resultVariable == RiaDefines::completionTypeResultName() ) + if ( cellEdgeMeta.m_resultVariable == RiaResultNames::completionTypeResultName() ) { isDependingOnCompletionType = true; } @@ -1789,7 +1789,7 @@ void RimEclipseView::calculateCompletionTypeAndRedrawIfRequired() for ( const auto& propFilter : m_propertyFilterCollection()->propertyFilters ) { if ( propFilter->isActive() && - propFilter->resultDefinition()->resultVariable() == RiaDefines::completionTypeResultName() ) + propFilter->resultDefinition()->resultVariable() == RiaResultNames::completionTypeResultName() ) { isDependingOnCompletionType = true; } @@ -1812,7 +1812,7 @@ void RimEclipseView::calculateCompletionTypeAndRedrawIfRequired() for ( const auto& propFilter : m_propertyFilterCollection()->propertyFilters ) { if ( propFilter->isActive() && - propFilter->resultDefinition()->resultVariable() == RiaDefines::completionTypeResultName() ) + propFilter->resultDefinition()->resultVariable() == RiaResultNames::completionTypeResultName() ) { propFilter->updateConnectedEditors(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.cpp b/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.cpp index 2242b2811a..ae7db3fdaf 100644 --- a/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.cpp @@ -535,17 +535,17 @@ bool RimElementVectorResult::resultAddressesCombined( std::vector 0; } diff --git a/ApplicationLibCode/ProjectDataModel/RimFaultInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimFaultInViewCollection.cpp index fc761145d3..84c190edd6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimFaultInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimFaultInViewCollection.cpp @@ -21,11 +21,12 @@ #include "RiaApplication.h" #include "RiaColorTables.h" +#include "RiaDefines.h" #include "RiaPreferences.h" +#include "RiaResultNames.h" #include "RigMainGrid.h" -#include "RiaDefines.h" #include "RimEclipseCase.h" #include "RimEclipseView.h" #include "RimFaultInView.h" @@ -189,12 +190,12 @@ void RimFaultInViewCollection::syncronizeFaults() for ( size_t i = 0; i < sortedFaults.size(); i++ ) { QString faultName = sortedFaults[i]->name(); - if ( faultName.compare( RiaDefines::undefinedGridFaultName(), Qt::CaseInsensitive ) == 0 ) + if ( faultName.compare( RiaResultNames::undefinedGridFaultName(), Qt::CaseInsensitive ) == 0 ) { undefinedFaults = sortedFaults[i]; } - if ( faultName.startsWith( RiaDefines::undefinedGridFaultName(), Qt::CaseInsensitive ) && + if ( faultName.startsWith( RiaResultNames::undefinedGridFaultName(), Qt::CaseInsensitive ) && faultName.contains( "Inactive" ) ) { undefinedFaultsWInactive = sortedFaults[i]; @@ -234,7 +235,7 @@ void RimFaultInViewCollection::syncronizeFaults() rimFault->faultColor = colorTable.cycledColor3f( fIdx ); QString faultName = rigFaults[fIdx]->name(); - if ( faultName.startsWith( RiaDefines::undefinedGridFaultName(), Qt::CaseInsensitive ) && + if ( faultName.startsWith( RiaResultNames::undefinedGridFaultName(), Qt::CaseInsensitive ) && faultName.contains( "Inactive" ) ) { rimFault->showFault = false; // Turn fault against inactive cells off by default diff --git a/ApplicationLibCode/ProjectDataModel/RimGeoMechResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/RimGeoMechResultDefinition.cpp index 0240a43445..9def9809d4 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGeoMechResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGeoMechResultDefinition.cpp @@ -598,8 +598,8 @@ void RimGeoMechResultDefinition::loadResult() { if ( m_geomCase && m_geomCase->geoMechData() ) { - if ( this->resultAddress().fieldName == RiaDefines::wbsFGResult().toStdString() || - this->resultAddress().fieldName == RiaDefines::wbsSFGResult().toStdString() ) + if ( this->resultAddress().fieldName == RiaResultNames::wbsFGResult().toStdString() || + this->resultAddress().fieldName == RiaResultNames::wbsSFGResult().toStdString() ) { RigFemResultAddress stressResAddr( RIG_ELEMENT_NODAL, std::string( "ST" ), "" ); RigFemResultAddress porBarResAddr( RIG_ELEMENT_NODAL, std::string( "POR-Bar" ), "" ); @@ -839,7 +839,7 @@ QString RimGeoMechResultDefinition::currentResultUnits() const } else { - for ( auto resultName : RiaDefines::wbsDerivedResultNames() ) + for ( auto resultName : RiaResultNames::wbsDerivedResultNames() ) { if ( resultName == this->resultFieldName() ) { diff --git a/ApplicationLibCode/ProjectDataModel/RimHistogramCalculator.cpp b/ApplicationLibCode/ProjectDataModel/RimHistogramCalculator.cpp index e3adc0ed5c..41f5e88fe6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimHistogramCalculator.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimHistogramCalculator.cpp @@ -409,38 +409,39 @@ void RimHistogramCalculator::updateVisCellStatsIfNeeded( RimEclipseView* std::vector RimHistogramCalculator::sourcesForMultiPropertyResults( const QString& resultName ) { static const std::map> resultsWithMultiPropertySource = - { { RiaDefines::combinedTransmissibilityResultName(), + { { RiaResultNames::combinedTransmissibilityResultName(), { RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "TRANX" ), RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "TRANY" ), RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "TRANZ" ) } }, - { RiaDefines::combinedMultResultName(), + { RiaResultNames::combinedMultResultName(), { RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "MULTX" ), RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "MULTX-" ), RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "MULTY" ), RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "MULTY-" ), RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "MULTZ" ), RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "MULTZ-" ) } }, - { RiaDefines::combinedRiTranResultName(), - { RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riTranXResultName() ), - RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riTranYResultName() ), - RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riTranZResultName() ) } }, - { RiaDefines::combinedRiMultResultName(), - { RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riMultXResultName() ), - RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riMultYResultName() ), - RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riMultZResultName() ) } }, - { RiaDefines::combinedRiAreaNormTranResultName(), - { RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riAreaNormTranXResultName() ), - RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riAreaNormTranYResultName() ), - RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riAreaNormTranZResultName() ) } }, - { RiaDefines::combinedWaterFluxResultName(), + { RiaResultNames::combinedRiTranResultName(), + { RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riTranXResultName() ), + RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riTranYResultName() ), + RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riTranZResultName() ) } }, + { RiaResultNames::combinedRiMultResultName(), + { RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riMultXResultName() ), + RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riMultYResultName() ), + RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riMultZResultName() ) } }, + { RiaResultNames::combinedRiAreaNormTranResultName(), + { RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riAreaNormTranXResultName() ), + RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riAreaNormTranYResultName() ), + RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, + RiaResultNames::riAreaNormTranZResultName() ) } }, + { RiaResultNames::combinedWaterFluxResultName(), { RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "FLRWATI+" ), RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "FLRWATJ+" ), RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "FLRWATK+" ) } }, - { RiaDefines::combinedOilFluxResultName(), + { RiaResultNames::combinedOilFluxResultName(), { RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "FLROILI+" ), RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "FLROILJ+" ), RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "FLROILK+" ) } }, - { RiaDefines::combinedGasFluxResultName(), + { RiaResultNames::combinedGasFluxResultName(), { RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "FLRGASI+" ), RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "FLRGASJ+" ), RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "FLRGASK+" ) } } }; diff --git a/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp index 4e65c09a95..649324797e 100644 --- a/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp @@ -416,8 +416,8 @@ void RimIdenticalGridCaseGroup::clearStatisticsResults() for ( size_t j = 0; j < rimStaticsCase->reservoirViews.size(); j++ ) { RimEclipseView* rimReservoirView = rimStaticsCase->reservoirViews[j]; - rimReservoirView->cellResult()->setResultVariable( RiaDefines::undefinedResultName() ); - rimReservoirView->cellEdgeResult()->setResultVariable( RiaDefines::undefinedResultName() ); + rimReservoirView->cellResult()->setResultVariable( RiaResultNames::undefinedResultName() ); + rimReservoirView->cellEdgeResult()->setResultVariable( RiaResultNames::undefinedResultName() ); rimReservoirView->loadDataAndUpdate(); } } diff --git a/ApplicationLibCode/ProjectDataModel/RimIntersectionResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/RimIntersectionResultDefinition.cpp index d308a38799..9236f6f85d 100644 --- a/ApplicationLibCode/ProjectDataModel/RimIntersectionResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimIntersectionResultDefinition.cpp @@ -445,7 +445,7 @@ void RimIntersectionResultDefinition::defineUiTreeOrdering( caf::PdmUiTreeOrderi { RimGeoMechCase* geomCase = dynamic_cast( m_case.value() ); - if ( !geomCase && m_eclipseResultDefinition->resultVariable() == RiaDefines::ternarySaturationResultName() ) + if ( !geomCase && m_eclipseResultDefinition->resultVariable() == RiaResultNames::ternarySaturationResultName() ) { uiTreeOrdering.add( m_ternaryLegendConfig() ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimProject.cpp b/ApplicationLibCode/ProjectDataModel/RimProject.cpp index 469adfe1b4..a8cfefaba4 100644 --- a/ApplicationLibCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimProject.cpp @@ -1303,25 +1303,25 @@ std::vector RimProject::allValveTemplates() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystemType RimProject::commonUnitSystemForAllCases() const +caf::AppEnum RimProject::commonUnitSystemForAllCases() const { std::vector rimCases; allCases( rimCases ); - RiaEclipseUnitTools::UnitSystem commonUnitSystem = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + RiaDefines::EclipseUnitSystem commonUnitSystem = RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; for ( const auto& c : rimCases ) { auto eclipseCase = dynamic_cast( c ); if ( eclipseCase && eclipseCase->eclipseCaseData() ) { - if ( commonUnitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ) + if ( commonUnitSystem == RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ) { commonUnitSystem = eclipseCase->eclipseCaseData()->unitsType(); } else if ( commonUnitSystem != eclipseCase->eclipseCaseData()->unitsType() ) { - commonUnitSystem = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + commonUnitSystem = RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; break; } } diff --git a/ApplicationLibCode/ProjectDataModel/RimProject.h b/ApplicationLibCode/ProjectDataModel/RimProject.h index 9a320cbc23..9e5a522f3b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimProject.h +++ b/ApplicationLibCode/ProjectDataModel/RimProject.h @@ -21,7 +21,6 @@ #pragma once #include "RiaDefines.h" -#include "RiaEclipseUnitTools.h" #include "cafPdmChildArrayField.h" #include "cafPdmChildField.h" @@ -185,8 +184,8 @@ public: std::vector allValveTemplateCollections() const; std::vector allValveTemplates() const; - RiaEclipseUnitTools::UnitSystemType commonUnitSystemForAllCases() const; - RimMeasurement* measurement() const; + caf::AppEnum commonUnitSystemForAllCases() const; + RimMeasurement* measurement() const; RimPlotTemplateFolderItem* rootPlotTemlateItem() const; diff --git a/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp b/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp index f622925b31..87ac4eaf6a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp @@ -673,11 +673,11 @@ void RimRegularLegendConfig::initAfterRead() { if ( resultVariableName == "Binary Formation Allen" ) { - resultVariableName = RiaDefines::formationBinaryAllanResultName(); + resultVariableName = RiaResultNames::formationBinaryAllanResultName(); } else if ( resultVariableName == "Formation Allen" ) { - resultVariableName = RiaDefines::formationAllanResultName(); + resultVariableName = RiaResultNames::formationAllanResultName(); } if ( m_colorRangeMode_OBSOLETE() != RimRegularLegendConfig::ColorRangesType::UNDEFINED ) diff --git a/ApplicationLibCode/ProjectDataModel/RimWellLogExtractionCurve.cpp b/ApplicationLibCode/ProjectDataModel/RimWellLogExtractionCurve.cpp index 01bf219d8c..d25b234289 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWellLogExtractionCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimWellLogExtractionCurve.cpp @@ -481,8 +481,8 @@ void RimWellLogExtractionCurve::extractData( bool* isUsingPseudoLength, eclExtractor->curveData( resAcc.p(), &values ); } - RiaEclipseUnitTools::UnitSystem eclipseUnitsType = eclipseCase->eclipseCaseData()->unitsType(); - if ( eclipseUnitsType == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + RiaDefines::EclipseUnitSystem eclipseUnitsType = eclipseCase->eclipseCaseData()->unitsType(); + if ( eclipseUnitsType == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { // See https://github.com/OPM/ResInsight/issues/538 diff --git a/ApplicationLibCode/ProjectDataModel/RimWellLogRftCurve.cpp b/ApplicationLibCode/ProjectDataModel/RimWellLogRftCurve.cpp index b1b3a05deb..d950bc2799 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWellLogRftCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimWellLogRftCurve.cpp @@ -18,6 +18,7 @@ #include "RimWellLogRftCurve.h" +#include "RiaDefines.h" #include "RiaEclipseUnitTools.h" #include "RiaQDateTimeTools.h" #include "RiaSimWellBranchTools.h" @@ -400,7 +401,7 @@ void RimWellLogRftCurve::onLoadDataAndUpdate( bool updateParentPlot ) return; } - RiaEclipseUnitTools::UnitSystem unitSystem = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC; + RiaDefines::EclipseUnitSystem unitSystem = RiaDefines::EclipseUnitSystem::UNITS_METRIC; if ( m_eclipseResultCase ) { unitSystem = m_eclipseResultCase->eclipseCaseData()->unitsType(); @@ -416,7 +417,7 @@ void RimWellLogRftCurve::onLoadDataAndUpdate( bool updateParentPlot ) else if ( m_observedFmuRftData ) { // TODO: Read unit system somewhere for FMU RFT Data - unitSystem = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC; + unitSystem = RiaDefines::EclipseUnitSystem::UNITS_METRIC; perPointLabels = this->perPointLabels(); } else diff --git a/ApplicationLibCode/ProjectDataModel/RimWellLogTrack.cpp b/ApplicationLibCode/ProjectDataModel/RimWellLogTrack.cpp index 8bc40a77ef..b382e0bac9 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWellLogTrack.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimWellLogTrack.cpp @@ -2570,7 +2570,7 @@ void RimWellLogTrack::updateFormationNamesOnPlot() RiaDefines::PorosityModelType::MATRIX_MODEL, 0, RigEclipseResultAddress( RiaDefines::ResultCatType::FORMATION_NAMES, - RiaDefines::activeFormationNamesResultName() ) ); + RiaResultNames::activeFormationNamesResultName() ) ); curveData = RimWellLogTrack::curveSamplingPointData( eclWellLogExtractor, resultAccessor.p() ); } @@ -2581,7 +2581,7 @@ void RimWellLogTrack::updateFormationNamesOnPlot() dynamic_cast( m_formationCase() ) ); if ( !geoMechWellLogExtractor ) return; - std::string activeFormationNamesResultName = RiaDefines::activeFormationNamesResultName().toStdString(); + std::string activeFormationNamesResultName = RiaResultNames::activeFormationNamesResultName().toStdString(); curveData = RimWellLogTrack::curveSamplingPointData( geoMechWellLogExtractor, RigFemResultAddress( RIG_FORMATION_NAMES, activeFormationNamesResultName, diff --git a/ApplicationLibCode/ProjectDataModel/RimWellPath.cpp b/ApplicationLibCode/ProjectDataModel/RimWellPath.cpp index 7474c82818..d2e9b59cbf 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWellPath.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimWellPath.cpp @@ -709,7 +709,7 @@ double RimWellPath::combinedScaleFactor() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellPath::setUnitSystem( RiaEclipseUnitTools::UnitSystem unitSystem ) +void RimWellPath::setUnitSystem( RiaDefines::EclipseUnitSystem unitSystem ) { m_unitSystem = unitSystem; @@ -719,7 +719,7 @@ void RimWellPath::setUnitSystem( RiaEclipseUnitTools::UnitSystem unitSystem ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RimWellPath::unitSystem() const +RiaDefines::EclipseUnitSystem RimWellPath::unitSystem() const { return m_unitSystem(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimWellPath.h b/ApplicationLibCode/ProjectDataModel/RimWellPath.h index e0aeb9efbd..36ea5da87e 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWellPath.h +++ b/ApplicationLibCode/ProjectDataModel/RimWellPath.h @@ -20,7 +20,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RimWellPathComponentInterface.h" @@ -87,8 +87,8 @@ public: virtual void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ); - void setUnitSystem( RiaEclipseUnitTools::UnitSystem unitSystem ); - RiaEclipseUnitTools::UnitSystem unitSystem() const; + void setUnitSystem( RiaDefines::EclipseUnitSystem unitSystem ); + RiaDefines::EclipseUnitSystem unitSystem() const; double airGap() const; double datumElevation() const; @@ -173,7 +173,7 @@ private: caf::PdmField m_simWellName; caf::PdmField m_branchIndex; - caf::PdmField m_unitSystem; + caf::PdmField> m_unitSystem; caf::PdmField m_wellPathFormationFilePath; caf::PdmField m_formationKeyInFile; diff --git a/ApplicationLibCode/ProjectDataModel/RimWellPathCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimWellPathCollection.cpp index 95f1f75342..22edebd610 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWellPathCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimWellPathCollection.cpp @@ -904,13 +904,13 @@ RimWellPathGroup* RimWellPathCollection::findOrCreateWellPathGroup( gsl::not_nul //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystemType RimWellPathCollection::findUnitSystemForWellPath( const RimWellPath* wellPath ) +caf::AppEnum RimWellPathCollection::findUnitSystemForWellPath( const RimWellPath* wellPath ) { RimProject* project; firstAncestorOrThisOfTypeAsserted( project ); if ( project->activeOilField()->analysisModels->cases.empty() ) { - return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; } const RigEclipseCaseData* eclipseCaseData = project->activeOilField()->analysisModels->cases()[0]->eclipseCaseData(); @@ -925,7 +925,7 @@ RiaEclipseUnitTools::UnitSystemType RimWellPathCollection::findUnitSystemForWell { return eclipseCaseData->unitsType(); } - return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimWellPathCollection.h b/ApplicationLibCode/ProjectDataModel/RimWellPathCollection.h index 2e2b22bc15..fd27ebc2ed 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWellPathCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimWellPathCollection.h @@ -20,7 +20,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "cafAppEnum.h" #include "cafPdmChildArrayField.h" @@ -146,7 +146,7 @@ private: RimWellPathGroup* findOrCreateWellPathGroup( gsl::not_null wellPath, const std::vector& wellPathsToGroupWith ); - RiaEclipseUnitTools::UnitSystemType findUnitSystemForWellPath( const RimWellPath* wellPath ); + caf::AppEnum findUnitSystemForWellPath( const RimWellPath* wellPath ); std::unique_ptr m_wellPathImporter; std::unique_ptr m_wellPathFormationsImporter; diff --git a/ApplicationLibCode/ProjectDataModel/RimWellPathLateralGeometryDef.cpp b/ApplicationLibCode/ProjectDataModel/RimWellPathLateralGeometryDef.cpp index 75180c3e10..9ecc43dc22 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWellPathLateralGeometryDef.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimWellPathLateralGeometryDef.cpp @@ -407,12 +407,13 @@ RiaLineArcWellPathCalculator RimWellPathLateralGeometryDef::lineArcWellPathCalcu std::vector targetDatas; auto [pointVector, measuredDepths] = m_parentGeometry->clippedPointSubset( 0.0, m_connectionMdOnParentWellPath ); - cvf::Vec3d connectionPoint = anchorPointXyz(); + cvf::Vec3d connectionPoint = anchorPointXyz(); auto N = pointVector.size(); if ( N >= 2u ) { - targetDatas = createTargetsFromPoints( { pointVector[N - 2] - connectionPoint, pointVector[N - 1] - connectionPoint} ); + targetDatas = + createTargetsFromPoints( { pointVector[N - 2] - connectionPoint, pointVector[N - 1] - connectionPoint } ); } std::vector activeTargets = activeWellTargets(); @@ -422,7 +423,6 @@ RiaLineArcWellPathCalculator RimWellPathLateralGeometryDef::lineArcWellPathCalcu targetDatas.push_back( wellTarget->wellTargetData() ); } - RiaLineArcWellPathCalculator wellPathCalculator( connectionPoint, targetDatas ); const std::vector& targetStatuses = diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.cpp index 01a8c546ec..7cbb0a69bf 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.cpp @@ -20,7 +20,6 @@ #include "RiaApplication.h" #include "RiaCompletionTypeCalculationScheduler.h" -#include "RiaEclipseUnitTools.h" #include "RiaFractureDefines.h" #include "RiaLogging.h" #include "RiaStimPlanModelDefines.h" diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCalculator.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCalculator.cpp index 730b421363..1f6f2586de 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCalculator.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCalculator.cpp @@ -18,6 +18,7 @@ #include "RimStimPlanModelCalculator.h" #include "RiaDefines.h" +#include "RiaEclipseUnitTools.h" #include "RiaLogging.h" #include "RiaStimPlanModelDefines.h" diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp index 8e85e471be..519fa6e21f 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp @@ -147,8 +147,8 @@ void RimStimPlanModelCurve::performDataExtraction( bool* isUsingPseudoLength ) return; } - RiaEclipseUnitTools::UnitSystem eclipseUnitsType = eclipseCase->eclipseCaseData()->unitsType(); - if ( eclipseUnitsType == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + RiaDefines::EclipseUnitSystem eclipseUnitsType = eclipseCase->eclipseCaseData()->unitsType(); + if ( eclipseUnitsType == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { // See https://github.com/OPM/ResInsight/issues/538 diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelElasticPropertyCalculator.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelElasticPropertyCalculator.cpp index cd5438d7fe..1f3fd7d1b9 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelElasticPropertyCalculator.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelElasticPropertyCalculator.cpp @@ -125,7 +125,7 @@ bool RimStimPlanModelElasticPropertyCalculator::calculate( RiaDefines::CurveProp RiaDefines::PorosityModelType::MATRIX_MODEL, 0, RigEclipseResultAddress( RiaDefines::ResultCatType::FORMATION_NAMES, - RiaDefines::activeFormationNamesResultName() ) ); + RiaResultNames::activeFormationNamesResultName() ) ); if ( !formationResultAccessor.notNull() ) { RiaLogging::error( QString( "No formation result found." ) ); diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelLayerCalculator.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelLayerCalculator.cpp index 07c18fc8b9..603f1d44bd 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelLayerCalculator.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelLayerCalculator.cpp @@ -97,7 +97,7 @@ bool RimStimPlanModelLayerCalculator::calculate( RiaDefines::CurveProperty curve RiaDefines::PorosityModelType::MATRIX_MODEL, 0, RigEclipseResultAddress( RiaDefines::ResultCatType::FORMATION_NAMES, - RiaDefines::activeFormationNamesResultName() ) ); + RiaResultNames::activeFormationNamesResultName() ) ); if ( !formationResultAccessor.notNull() ) { RiaLogging::error( QString( "No formation result found." ) ); diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelStressCalculator.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelStressCalculator.cpp index ebca33cd51..24390efa19 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelStressCalculator.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelStressCalculator.cpp @@ -18,6 +18,7 @@ #include "RimStimPlanModelStressCalculator.h" #include "RiaDefines.h" +#include "RiaEclipseUnitTools.h" #include "RiaLogging.h" #include "RiaStimPlanModelDefines.h" diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp index f9d8fadd13..e2300ecc07 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp @@ -20,7 +20,6 @@ #include "RiaColorTables.h" #include "RiaCompletionTypeCalculationScheduler.h" -#include "RiaEclipseUnitTools.h" #include "RiaFractureDefines.h" #include "RiaLogging.h" #include "RiaStimPlanModelDefines.h" diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h index 64dce7b795..d1e1ed006a 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h @@ -18,7 +18,6 @@ #pragma once -#include "RiaEclipseUnitTools.h" #include "RiaStimPlanModelDefines.h" #include "RimNamedObject.h" diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp index df0300dd5a..d926e8765e 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp @@ -106,7 +106,7 @@ RimSummaryCalculation* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RifCalculatedSummaryCurveReader::unitSystem() const +RiaDefines::EclipseUnitSystem RifCalculatedSummaryCurveReader::unitSystem() const { - return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h b/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h index 5f2186eaf6..b2c2df45c7 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h @@ -41,7 +41,7 @@ public: void buildMetaData(); - RiaEclipseUnitTools::UnitSystem unitSystem() const override; + RiaDefines::EclipseUnitSystem unitSystem() const override; private: RimSummaryCalculation* findCalculationByName( const RifEclipseSummaryAddress& resultAddress ) const; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp index 1804a5d61b..f023ed7ec5 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp @@ -21,6 +21,7 @@ #include "RiaColorTools.h" #include "RiaGuiApplication.h" #include "RiaPreferences.h" +#include "RiaResultNames.h" #include "RiaStatisticsTools.h" #include "RiaSummaryCurveAnalyzer.h" #include "RiaSummaryCurveDefinition.h" @@ -1282,7 +1283,7 @@ void RimEnsembleCurveSet::appendOptionItemsForSummaryAddresses( QListpush_back( caf::PdmOptionItemInfo( s, QVariant::fromValue( addr ) ) ); } - options->push_front( caf::PdmOptionItemInfo( RiaDefines::undefinedResultName(), + options->push_front( caf::PdmOptionItemInfo( RiaResultNames::undefinedResultName(), QVariant::fromValue( RifEclipseSummaryAddress() ) ) ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp index 8e04e4128a..f5f78dace8 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp @@ -203,13 +203,13 @@ void RimEnsembleStatisticsCase::calculate( const std::vector su //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RimEnsembleStatisticsCase::unitSystem() const +RiaDefines::EclipseUnitSystem RimEnsembleStatisticsCase::unitSystem() const { if ( m_curveSet ) { return m_curveSet->summaryCaseCollection()->unitSystem(); } - return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.h b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.h index 1f32b73b58..e5579e8257 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RifEclipseSummaryAddress.h" #include "RimSummaryCase.h" @@ -54,7 +54,7 @@ public: const RimEnsembleCurveSet* curveSet() const; void calculate( const std::vector& sumCases, bool includeIncompleteCurves ); - RiaEclipseUnitTools::UnitSystem unitSystem() const; + RiaDefines::EclipseUnitSystem unitSystem() const; private: void calculate( const std::vector sumCases, diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp index 6923b7f1da..ba1de2153b 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp @@ -234,14 +234,14 @@ QString RimSummaryCase::nativeCaseName() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystemType RimSummaryCase::unitsSystem() +caf::AppEnum RimSummaryCase::unitsSystem() { RifSummaryReaderInterface* reader = summaryReader(); if ( reader ) { return reader->unitSystem(); } - return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h index d5f40614ca..4101956284 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RigCaseRealizationParameters.h" #include "RimCaseDisplayNameTools.h" @@ -57,7 +57,7 @@ public: void setCaseId( int caseId ); int caseId() const; - RiaEclipseUnitTools::UnitSystemType unitsSystem(); + caf::AppEnum unitsSystem(); void setDisplayNameOption( RimCaseDisplayNameTools::DisplayName displayNameOption ); void updateAutoShortName(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp index 9af8d43d5e..d573ade53b 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp @@ -961,11 +961,11 @@ bool RimSummaryCaseCollection::operator<( const RimSummaryCaseCollection& rhs ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RimSummaryCaseCollection::unitSystem() const +RiaDefines::EclipseUnitSystem RimSummaryCaseCollection::unitSystem() const { if ( m_cases.empty() ) { - return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; } return m_cases[0]->unitsSystem(); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h index 4d4f68eee5..5ba578cabb 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RifEclipseRftAddress.h" #include "RifEclipseSummaryAddress.h" #include "RifReaderEnsembleStatisticsRft.h" @@ -144,7 +144,7 @@ public: static bool validateEnsembleCases( const std::vector cases ); bool operator<( const RimSummaryCaseCollection& rhs ) const; - RiaEclipseUnitTools::UnitSystem unitSystem() const; + RiaDefines::EclipseUnitSystem unitSystem() const; private: EnsembleParameter createEnsembleParameter( const QString& paramName ) const; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index 0d216bd4ee..b46ea2cb93 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -817,7 +817,7 @@ void RimSummaryCurve::appendOptionItemsForSummaryAddresses( QListpush_front( caf::PdmOptionItemInfo( RiaDefines::undefinedResultName(), + options->push_front( caf::PdmOptionItemInfo( RiaResultNames::undefinedResultName(), QVariant::fromValue( RifEclipseSummaryAddress() ) ) ); } } diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.cpp index d045a27520..b6ab8840e1 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.cpp @@ -19,6 +19,7 @@ #include "RimSurfaceResultDefinition.h" #include "RiaDefines.h" +#include "RiaResultNames.h" #include "RigStatisticsMath.h" #include "RigSurface.h" @@ -176,7 +177,8 @@ QList if ( fieldNeedingOptions == &m_propertyName ) { - options.push_back( caf::PdmOptionItemInfo( RiaDefines::undefinedResultName(), RiaDefines::undefinedResultName() ) ); + options.push_back( + caf::PdmOptionItemInfo( RiaResultNames::undefinedResultName(), RiaResultNames::undefinedResultName() ) ); RigSurface* surfData = surfaceData(); if ( surfData ) diff --git a/ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp b/ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp index f2f4f69e19..f08a9221f5 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp @@ -21,6 +21,7 @@ #include "RigCaseCellResultsData.h" #include "RiaApplication.h" +#include "RiaEclipseUnitTools.h" #include "RiaLogging.h" #include "RigAllanDiagramData.h" @@ -323,7 +324,7 @@ size_t RigCaseCellResultsData::findOrCreateScalarResultIndex( const RigEclipseRe cvf::ref statisticsCalculator; - if ( resultName == RiaDefines::combinedTransmissibilityResultName() ) + if ( resultName == RiaResultNames::combinedTransmissibilityResultName() ) { cvf::ref calc = new RigEclipseMultiPropertyStatCalc(); @@ -336,7 +337,7 @@ size_t RigCaseCellResultsData::findOrCreateScalarResultIndex( const RigEclipseRe statisticsCalculator = calc; } - else if ( resultName == RiaDefines::combinedMultResultName() ) + else if ( resultName == RiaResultNames::combinedMultResultName() ) { cvf::ref calc = new RigEclipseMultiPropertyStatCalc(); @@ -355,49 +356,49 @@ size_t RigCaseCellResultsData::findOrCreateScalarResultIndex( const RigEclipseRe statisticsCalculator = calc; } - else if ( resultName == RiaDefines::combinedRiTranResultName() ) + else if ( resultName == RiaResultNames::combinedRiTranResultName() ) { cvf::ref calc = new RigEclipseMultiPropertyStatCalc(); calc->addNativeStatisticsCalculator( this, RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riTranXResultName() ) ); + RiaResultNames::riTranXResultName() ) ); calc->addNativeStatisticsCalculator( this, RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riTranYResultName() ) ); + RiaResultNames::riTranYResultName() ) ); calc->addNativeStatisticsCalculator( this, RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riTranZResultName() ) ); + RiaResultNames::riTranZResultName() ) ); statisticsCalculator = calc; } - else if ( resultName == RiaDefines::combinedRiMultResultName() ) + else if ( resultName == RiaResultNames::combinedRiMultResultName() ) { cvf::ref calc = new RigEclipseMultiPropertyStatCalc(); calc->addNativeStatisticsCalculator( this, RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riMultXResultName() ) ); + RiaResultNames::riMultXResultName() ) ); calc->addNativeStatisticsCalculator( this, RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riMultYResultName() ) ); + RiaResultNames::riMultYResultName() ) ); calc->addNativeStatisticsCalculator( this, RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riMultZResultName() ) ); + RiaResultNames::riMultZResultName() ) ); statisticsCalculator = calc; } - else if ( resultName == RiaDefines::combinedRiAreaNormTranResultName() ) + else if ( resultName == RiaResultNames::combinedRiAreaNormTranResultName() ) { cvf::ref calc = new RigEclipseMultiPropertyStatCalc(); calc->addNativeStatisticsCalculator( this, RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riAreaNormTranXResultName() ) ); + RiaResultNames::riAreaNormTranXResultName() ) ); calc->addNativeStatisticsCalculator( this, RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riAreaNormTranYResultName() ) ); + RiaResultNames::riAreaNormTranYResultName() ) ); calc->addNativeStatisticsCalculator( this, RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riAreaNormTranZResultName() ) ); + RiaResultNames::riAreaNormTranZResultName() ) ); statisticsCalculator = calc; } - else if ( resultName == RiaDefines::combinedWaterFluxResultName() ) + else if ( resultName == RiaResultNames::combinedWaterFluxResultName() ) { cvf::ref calc = new RigEclipseMultiPropertyStatCalc(); calc->addNativeStatisticsCalculator( this, @@ -411,7 +412,7 @@ size_t RigCaseCellResultsData::findOrCreateScalarResultIndex( const RigEclipseRe "FLRWATK+" ) ); statisticsCalculator = calc; } - else if ( resultName == RiaDefines::combinedOilFluxResultName() ) + else if ( resultName == RiaResultNames::combinedOilFluxResultName() ) { cvf::ref calc = new RigEclipseMultiPropertyStatCalc(); calc->addNativeStatisticsCalculator( this, @@ -425,7 +426,7 @@ size_t RigCaseCellResultsData::findOrCreateScalarResultIndex( const RigEclipseRe "FLROILK+" ) ); statisticsCalculator = calc; } - else if ( resultName == RiaDefines::combinedGasFluxResultName() ) + else if ( resultName == RiaResultNames::combinedGasFluxResultName() ) { cvf::ref calc = new RigEclipseMultiPropertyStatCalc(); calc->addNativeStatisticsCalculator( this, @@ -454,8 +455,8 @@ size_t RigCaseCellResultsData::findOrCreateScalarResultIndex( const RigEclipseRe QString( "%1K" ).arg( baseName ) ) ); statisticsCalculator = calc; } - else if ( resultName == RiaDefines::formationAllanResultName() || - resultName == RiaDefines::formationBinaryAllanResultName() ) + else if ( resultName == RiaResultNames::formationAllanResultName() || + resultName == RiaResultNames::formationBinaryAllanResultName() ) { cvf::ref calc = new RigEclipseAllanFaultsStatCalc( m_ownerMainGrid->nncData(), resVarAddr ); @@ -929,7 +930,7 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() if ( hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "SOIL" ) ) ) { findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, - RiaDefines::riOilVolumeResultName() ), + RiaResultNames::riOilVolumeResultName() ), false ); } } @@ -937,18 +938,18 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() // Completion type { findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, - RiaDefines::completionTypeResultName() ), + RiaResultNames::completionTypeResultName() ), false ); } // Fault results { findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::ALLAN_DIAGRAMS, - RiaDefines::formationBinaryAllanResultName() ), + RiaResultNames::formationBinaryAllanResultName() ), false ); findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::ALLAN_DIAGRAMS, - RiaDefines::formationAllanResultName() ), + RiaResultNames::formationAllanResultName() ), false ); } @@ -959,7 +960,7 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "FLRWATK+" ) ) ) { findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, - RiaDefines::combinedWaterFluxResultName() ), + RiaResultNames::combinedWaterFluxResultName() ), false ); } @@ -968,7 +969,7 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "FLROILK+" ) ) ) { findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, - RiaDefines::combinedOilFluxResultName() ), + RiaResultNames::combinedOilFluxResultName() ), false ); } @@ -977,7 +978,7 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "FLRGASK+" ) ) ) { findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, - RiaDefines::combinedGasFluxResultName() ), + RiaResultNames::combinedGasFluxResultName() ), false ); } } @@ -987,7 +988,7 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() if ( hasCompleteTransmissibilityResults() ) { addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::combinedTransmissibilityResultName(), + RiaResultNames::combinedTransmissibilityResultName(), false, 0 ); } @@ -1001,7 +1002,10 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "MULTZ" ) ) && hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "MULTZ-" ) ) ) { - addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::combinedMultResultName(), false, 0 ); + addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, + RiaResultNames::combinedMultResultName(), + false, + 0 ); } } @@ -1011,10 +1015,13 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PERMY" ) ) && hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PERMZ" ) ) ) { - addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riTranXResultName(), false, 0 ); - addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riTranYResultName(), false, 0 ); - addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riTranZResultName(), false, 0 ); - addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::combinedRiTranResultName(), false, 0 ); + addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riTranXResultName(), false, 0 ); + addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riTranYResultName(), false, 0 ); + addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riTranZResultName(), false, 0 ); + addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, + RiaResultNames::combinedRiTranResultName(), + false, + 0 ); } } @@ -1022,16 +1029,19 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() { if ( hasCompleteTransmissibilityResults() && hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riTranXResultName() ) ) && + RiaResultNames::riTranXResultName() ) ) && hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riTranYResultName() ) ) && + RiaResultNames::riTranYResultName() ) ) && hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riTranZResultName() ) ) ) + RiaResultNames::riTranZResultName() ) ) ) { - addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riMultXResultName(), false, 0 ); - addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riMultYResultName(), false, 0 ); - addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riMultZResultName(), false, 0 ); - addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::combinedRiMultResultName(), false, 0 ); + addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riMultXResultName(), false, 0 ); + addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riMultYResultName(), false, 0 ); + addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riMultZResultName(), false, 0 ); + addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, + RiaResultNames::combinedRiMultResultName(), + false, + 0 ); } } @@ -1040,7 +1050,7 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() if ( hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "TRANX" ) ) ) { addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riAreaNormTranXResultName(), + RiaResultNames::riAreaNormTranXResultName(), false, 0 ); } @@ -1048,7 +1058,7 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() if ( hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "TRANY" ) ) ) { addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riAreaNormTranYResultName(), + RiaResultNames::riAreaNormTranYResultName(), false, 0 ); } @@ -1056,7 +1066,7 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() if ( hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "TRANZ" ) ) ) { addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riAreaNormTranZResultName(), + RiaResultNames::riAreaNormTranZResultName(), false, 0 ); } @@ -1064,7 +1074,7 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() if ( hasCompleteTransmissibilityResults() ) { addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::combinedRiAreaNormTranResultName(), + RiaResultNames::combinedRiAreaNormTranResultName(), false, 0 ); } @@ -1072,14 +1082,14 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() // Cell Volume { - addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::riCellVolumeResultName(), false, 0 ); + addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::riCellVolumeResultName(), false, 0 ); } // Mobile Pore Volume { if ( hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PORV" ) ) ) { - addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::mobilePoreVolumeName(), false, 0 ); + addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::mobilePoreVolumeName(), false, 0 ); } } } @@ -1223,13 +1233,13 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu if ( type == RiaDefines::ResultCatType::STATIC_NATIVE ) { - if ( resultName == RiaDefines::combinedTransmissibilityResultName() ) + if ( resultName == RiaResultNames::combinedTransmissibilityResultName() ) { this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "TRANX" ) ); this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "TRANY" ) ); this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "TRANZ" ) ); } - else if ( resultName == RiaDefines::combinedMultResultName() ) + else if ( resultName == RiaResultNames::combinedMultResultName() ) { this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTX" ) ); this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTX-" ) ); @@ -1238,46 +1248,46 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTZ" ) ); this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTZ-" ) ); } - else if ( resultName == RiaDefines::combinedRiTranResultName() ) + else if ( resultName == RiaResultNames::combinedRiTranResultName() ) { - computeRiTransComponent( RiaDefines::riTranXResultName() ); - computeRiTransComponent( RiaDefines::riTranYResultName() ); - computeRiTransComponent( RiaDefines::riTranZResultName() ); + computeRiTransComponent( RiaResultNames::riTranXResultName() ); + computeRiTransComponent( RiaResultNames::riTranYResultName() ); + computeRiTransComponent( RiaResultNames::riTranZResultName() ); computeNncCombRiTrans(); } - else if ( resultName == RiaDefines::riTranXResultName() || resultName == RiaDefines::riTranYResultName() || - resultName == RiaDefines::riTranZResultName() ) + else if ( resultName == RiaResultNames::riTranXResultName() || + resultName == RiaResultNames::riTranYResultName() || resultName == RiaResultNames::riTranZResultName() ) { computeRiTransComponent( resultName ); } - else if ( resultName == RiaDefines::combinedRiMultResultName() ) + else if ( resultName == RiaResultNames::combinedRiMultResultName() ) { - computeRiMULTComponent( RiaDefines::riMultXResultName() ); - computeRiMULTComponent( RiaDefines::riMultYResultName() ); - computeRiMULTComponent( RiaDefines::riMultZResultName() ); + computeRiMULTComponent( RiaResultNames::riMultXResultName() ); + computeRiMULTComponent( RiaResultNames::riMultYResultName() ); + computeRiMULTComponent( RiaResultNames::riMultZResultName() ); computeNncCombRiTrans(); computeNncCombRiMULT(); } - else if ( resultName == RiaDefines::riMultXResultName() || resultName == RiaDefines::riMultYResultName() || - resultName == RiaDefines::riMultZResultName() ) + else if ( resultName == RiaResultNames::riMultXResultName() || + resultName == RiaResultNames::riMultYResultName() || resultName == RiaResultNames::riMultZResultName() ) { computeRiMULTComponent( resultName ); } - else if ( resultName == RiaDefines::combinedRiAreaNormTranResultName() ) + else if ( resultName == RiaResultNames::combinedRiAreaNormTranResultName() ) { - computeRiTRANSbyAreaComponent( RiaDefines::riAreaNormTranXResultName() ); - computeRiTRANSbyAreaComponent( RiaDefines::riAreaNormTranYResultName() ); - computeRiTRANSbyAreaComponent( RiaDefines::riAreaNormTranZResultName() ); + computeRiTRANSbyAreaComponent( RiaResultNames::riAreaNormTranXResultName() ); + computeRiTRANSbyAreaComponent( RiaResultNames::riAreaNormTranYResultName() ); + computeRiTRANSbyAreaComponent( RiaResultNames::riAreaNormTranZResultName() ); computeNncCombRiTRANSbyArea(); } - else if ( resultName == RiaDefines::riAreaNormTranXResultName() || - resultName == RiaDefines::riAreaNormTranYResultName() || - resultName == RiaDefines::riAreaNormTranZResultName() ) + else if ( resultName == RiaResultNames::riAreaNormTranXResultName() || + resultName == RiaResultNames::riAreaNormTranYResultName() || + resultName == RiaResultNames::riAreaNormTranZResultName() ) { computeRiTRANSbyAreaComponent( resultName ); } - else if ( resultName == RiaDefines::formationAllanResultName() || - resultName == RiaDefines::formationBinaryAllanResultName() ) + else if ( resultName == RiaResultNames::formationAllanResultName() || + resultName == RiaResultNames::formationBinaryAllanResultName() ) { bool includeInactiveCells = false; if ( m_readerInterface.notNull() ) @@ -1289,19 +1299,19 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu } else if ( type == RiaDefines::ResultCatType::DYNAMIC_NATIVE ) { - if ( resultName == RiaDefines::combinedWaterFluxResultName() ) + if ( resultName == RiaResultNames::combinedWaterFluxResultName() ) { this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRWATI+" ) ); this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRWATJ+" ) ); this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRWATK+" ) ); } - else if ( resultName == RiaDefines::combinedOilFluxResultName() ) + else if ( resultName == RiaResultNames::combinedOilFluxResultName() ) { this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLROILI+" ) ); this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLROILJ+" ) ); this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLROILK+" ) ); } - else if ( resultName == RiaDefines::combinedGasFluxResultName() ) + else if ( resultName == RiaResultNames::combinedGasFluxResultName() ) { this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRGASI+" ) ); this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRGASJ+" ) ); @@ -1336,7 +1346,7 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu return scalarResultIndex; } } - else if ( resultName == RiaDefines::completionTypeResultName() ) + else if ( resultName == RiaResultNames::completionTypeResultName() ) { caf::ProgressInfo progressInfo( this->maxTimeStepCount(), "Calculate Completion Type Results" ); m_cellScalarResults[scalarResultIndex].resize( this->maxTimeStepCount() ); @@ -1346,7 +1356,7 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu progressInfo.incrementProgress(); } } - else if ( resultName == RiaDefines::mobilePoreVolumeName() ) + else if ( resultName == RiaResultNames::mobilePoreVolumeName() ) { computeMobilePV(); } @@ -1415,18 +1425,19 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu } } - if ( resultName == RiaDefines::riCellVolumeResultName() ) + if ( resultName == RiaResultNames::riCellVolumeResultName() ) { computeCellVolumes(); } - else if ( resultName == RiaDefines::riOilVolumeResultName() ) + else if ( resultName == RiaResultNames::riOilVolumeResultName() ) { computeCellVolumes(); computeOilVolumes(); } // Allan results - if ( resultName == RiaDefines::formationAllanResultName() || resultName == RiaDefines::formationBinaryAllanResultName() ) + if ( resultName == RiaResultNames::formationAllanResultName() || + resultName == RiaResultNames::formationBinaryAllanResultName() ) { bool includeInactiveCells = false; if ( m_readerInterface.notNull() ) @@ -1530,7 +1541,7 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResultForTimeStep( const Rig return soilScalarResultIndex; } } - else if ( type == RiaDefines::ResultCatType::DYNAMIC_NATIVE && resultName == RiaDefines::completionTypeResultName() ) + else if ( type == RiaDefines::ResultCatType::DYNAMIC_NATIVE && resultName == RiaResultNames::completionTypeResultName() ) { size_t completionTypeScalarResultIndex = this->findScalarResultIndexFromAddress( resVarAddr ); computeCompletionTypeForTimeStep( timeStepIndex ); @@ -2068,17 +2079,17 @@ void RigCaseCellResultsData::computeRiTransComponent( const QString& riTransComp cvf::StructGridInterface::FaceType faceId = cvf::StructGridInterface::NO_FACE; QString permCompName; - if ( riTransComponentResultName == RiaDefines::riTranXResultName() ) + if ( riTransComponentResultName == RiaResultNames::riTranXResultName() ) { permCompName = "PERMX"; faceId = cvf::StructGridInterface::POS_I; } - else if ( riTransComponentResultName == RiaDefines::riTranYResultName() ) + else if ( riTransComponentResultName == RiaResultNames::riTranYResultName() ) { permCompName = "PERMY"; faceId = cvf::StructGridInterface::POS_J; } - else if ( riTransComponentResultName == RiaDefines::riTranZResultName() ) + else if ( riTransComponentResultName == RiaResultNames::riTranZResultName() ) { permCompName = "PERMZ"; faceId = cvf::StructGridInterface::POS_K; @@ -2252,7 +2263,7 @@ void RigCaseCellResultsData::computeRiTransComponent( const QString& riTransComp void RigCaseCellResultsData::computeNncCombRiTrans() { RigEclipseResultAddress riCombTransEclResAddr( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::combinedRiTranResultName() ); + RiaResultNames::combinedRiTranResultName() ); if ( m_ownerMainGrid->nncData()->staticConnectionScalarResult( riCombTransEclResAddr ) ) return; double cdarchy = darchysValue(); @@ -2457,19 +2468,19 @@ void RigCaseCellResultsData::computeRiMULTComponent( const QString& riMultCompNa QString riTransCompName; QString transCompName; - if ( riMultCompName == RiaDefines::riMultXResultName() ) + if ( riMultCompName == RiaResultNames::riMultXResultName() ) { - riTransCompName = RiaDefines::riTranXResultName(); + riTransCompName = RiaResultNames::riTranXResultName(); transCompName = "TRANX"; } - else if ( riMultCompName == RiaDefines::riMultYResultName() ) + else if ( riMultCompName == RiaResultNames::riMultYResultName() ) { - riTransCompName = RiaDefines::riTranYResultName(); + riTransCompName = RiaResultNames::riTranYResultName(); transCompName = "TRANY"; } - else if ( riMultCompName == RiaDefines::riMultZResultName() ) + else if ( riMultCompName == RiaResultNames::riMultZResultName() ) { - riTransCompName = RiaDefines::riTranZResultName(); + riTransCompName = RiaResultNames::riTranZResultName(); transCompName = "TRANZ"; } else @@ -2518,11 +2529,11 @@ void RigCaseCellResultsData::computeRiMULTComponent( const QString& riMultCompNa void RigCaseCellResultsData::computeNncCombRiMULT() { auto riCombMultEclResAddr = - RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::combinedRiMultResultName() ); + RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::combinedRiMultResultName() ); auto riCombTransEclResAddr = - RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::combinedRiTranResultName() ); + RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::combinedRiTranResultName() ); auto combTransEclResAddr = RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::combinedTransmissibilityResultName() ); + RiaResultNames::combinedTransmissibilityResultName() ); if ( m_ownerMainGrid->nncData()->staticConnectionScalarResult( riCombMultEclResAddr ) ) return; @@ -2556,17 +2567,17 @@ void RigCaseCellResultsData::computeRiTRANSbyAreaComponent( const QString& riTra cvf::StructGridInterface::FaceType faceId = cvf::StructGridInterface::NO_FACE; QString transCompName; - if ( riTransByAreaCompResultName == RiaDefines::riAreaNormTranXResultName() ) + if ( riTransByAreaCompResultName == RiaResultNames::riAreaNormTranXResultName() ) { transCompName = "TRANX"; faceId = cvf::StructGridInterface::POS_I; } - else if ( riTransByAreaCompResultName == RiaDefines::riAreaNormTranYResultName() ) + else if ( riTransByAreaCompResultName == RiaResultNames::riAreaNormTranYResultName() ) { transCompName = "TRANY"; faceId = cvf::StructGridInterface::POS_J; } - else if ( riTransByAreaCompResultName == RiaDefines::riAreaNormTranZResultName() ) + else if ( riTransByAreaCompResultName == RiaResultNames::riAreaNormTranZResultName() ) { transCompName = "TRANZ"; faceId = cvf::StructGridInterface::POS_K; @@ -2664,9 +2675,9 @@ void RigCaseCellResultsData::computeRiTRANSbyAreaComponent( const QString& riTra void RigCaseCellResultsData::computeNncCombRiTRANSbyArea() { auto riCombTransByAreaEclResAddr = RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::combinedRiAreaNormTranResultName() ); + RiaResultNames::combinedRiAreaNormTranResultName() ); auto combTransEclResAddr = RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::combinedTransmissibilityResultName() ); + RiaResultNames::combinedTransmissibilityResultName() ); if ( m_ownerMainGrid->nncData()->staticConnectionScalarResult( riCombTransByAreaEclResAddr ) ) return; @@ -2701,7 +2712,7 @@ void RigCaseCellResultsData::computeNncCombRiTRANSbyArea() void RigCaseCellResultsData::computeCompletionTypeForTimeStep( size_t timeStep ) { size_t completionTypeResultIndex = this->findScalarResultIndexFromAddress( - RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaDefines::completionTypeResultName() ) ); + RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::completionTypeResultName() ) ); if ( m_cellScalarResults[completionTypeResultIndex].size() < this->maxTimeStepCount() ) { @@ -2742,7 +2753,7 @@ void RigCaseCellResultsData::computeCellVolumes() { size_t cellVolIdx = this->findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riCellVolumeResultName() ), + RiaResultNames::riCellVolumeResultName() ), false ); if ( m_cellScalarResults[cellVolIdx].empty() ) @@ -2770,7 +2781,7 @@ void RigCaseCellResultsData::computeCellVolumes() } // Clear oil volume so it will have to be recalculated. - clearScalarResult( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaDefines::riOilVolumeResultName() ); + clearScalarResult( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::riOilVolumeResultName() ); } //-------------------------------------------------------------------------------------------------- @@ -2780,7 +2791,7 @@ void RigCaseCellResultsData::computeOilVolumes() { size_t cellVolIdx = this->findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::riCellVolumeResultName() ), + RiaResultNames::riCellVolumeResultName() ), false ); const std::vector& cellVolumeResults = m_cellScalarResults[cellVolIdx][0]; @@ -2788,7 +2799,7 @@ void RigCaseCellResultsData::computeOilVolumes() this->findOrLoadKnownScalarResult( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "SOIL" ) ); size_t oilVolIdx = this->findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, - RiaDefines::riOilVolumeResultName() ), + RiaResultNames::riOilVolumeResultName() ), false ); m_cellScalarResults[oilVolIdx].resize( this->maxTimeStepCount() ); @@ -2846,7 +2857,7 @@ void RigCaseCellResultsData::computeMobilePV() size_t mobPVIdx = this->findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::mobilePoreVolumeName() ), + RiaResultNames::mobilePoreVolumeName() ), false ); std::vector& mobPVResults = m_cellScalarResults[mobPVIdx][0]; @@ -2923,13 +2934,13 @@ void RigCaseCellResultsData::setActiveFormationNames( RigFormationNames* activeF size_t totalGlobCellCount = m_ownerMainGrid->globalCellArray().size(); this->addStaticScalarResult( RiaDefines::ResultCatType::FORMATION_NAMES, - RiaDefines::activeFormationNamesResultName(), + RiaResultNames::activeFormationNamesResultName(), false, totalGlobCellCount ); std::vector* fnData = this->modifiableCellScalarResult( RigEclipseResultAddress( RiaDefines::ResultCatType::FORMATION_NAMES, - RiaDefines::activeFormationNamesResultName() ), + RiaResultNames::activeFormationNamesResultName() ), 0 ); if ( m_activeFormationNamesData.isNull() ) @@ -2982,7 +2993,7 @@ void RigCaseCellResultsData::setActiveFormationNames( RigFormationNames* activeF // As the Allan formation diagram is depending on formation results, we need to clear the data set // Will be recomputed when required auto fnNamesResAddr = - RigEclipseResultAddress( RiaDefines::ResultCatType::ALLAN_DIAGRAMS, RiaDefines::formationAllanResultName() ); + RigEclipseResultAddress( RiaDefines::ResultCatType::ALLAN_DIAGRAMS, RiaResultNames::formationAllanResultName() ); clearScalarResult( fnNamesResAddr ); } @@ -3105,35 +3116,35 @@ void RigCaseCellResultsData::computeAllanResults( RigCaseCellResultsData* cellRe if ( cellResultsData && cellResultsData->activeFormationNames() && !cellResultsData->activeFormationNames()->formationNames().empty() ) { - auto fnNamesResAddr = RigEclipseResultAddress( RiaDefines::ResultCatType::FORMATION_NAMES, - RiaDefines::activeFormationNamesResultName() ); - auto fnAllanResultResAddr = - RigEclipseResultAddress( RiaDefines::ResultCatType::ALLAN_DIAGRAMS, RiaDefines::formationAllanResultName() ); - auto fnBinAllanResAddr = RigEclipseResultAddress( RiaDefines::ResultCatType::ALLAN_DIAGRAMS, - RiaDefines::formationBinaryAllanResultName() ); + auto fnNamesResAddr = RigEclipseResultAddress( RiaDefines::ResultCatType::FORMATION_NAMES, + RiaResultNames::activeFormationNamesResultName() ); + auto fnAllanResultResAddr = RigEclipseResultAddress( RiaDefines::ResultCatType::ALLAN_DIAGRAMS, + RiaResultNames::formationAllanResultName() ); + auto fnBinAllanResAddr = RigEclipseResultAddress( RiaDefines::ResultCatType::ALLAN_DIAGRAMS, + RiaResultNames::formationBinaryAllanResultName() ); // Create and retrieve nnc result arrays std::vector& fnAllanNncResults = - mainGrid->nncData()->makeStaticConnectionScalarResult( RiaDefines::formationAllanResultName() ); + mainGrid->nncData()->makeStaticConnectionScalarResult( RiaResultNames::formationAllanResultName() ); std::vector& fnBinAllanNncResults = - mainGrid->nncData()->makeStaticConnectionScalarResult( RiaDefines::formationBinaryAllanResultName() ); + mainGrid->nncData()->makeStaticConnectionScalarResult( RiaResultNames::formationBinaryAllanResultName() ); // Associate them with eclipse result address - mainGrid->nncData()->setEclResultAddress( RiaDefines::formationAllanResultName(), fnAllanResultResAddr ); - mainGrid->nncData()->setEclResultAddress( RiaDefines::formationBinaryAllanResultName(), fnBinAllanResAddr ); + mainGrid->nncData()->setEclResultAddress( RiaResultNames::formationAllanResultName(), fnAllanResultResAddr ); + mainGrid->nncData()->setEclResultAddress( RiaResultNames::formationBinaryAllanResultName(), fnBinAllanResAddr ); const std::vector& fnData = cellResultsData->cellScalarResults( fnNamesResAddr, 0 ); // Add a result entry for the special Allan grid data (used only for the grid cells without nnc coverage) cellResultsData->addStaticScalarResult( RiaDefines::ResultCatType::ALLAN_DIAGRAMS, - RiaDefines::formationAllanResultName(), + RiaResultNames::formationAllanResultName(), false, fnData.size() ); cellResultsData->addStaticScalarResult( RiaDefines::ResultCatType::ALLAN_DIAGRAMS, - RiaDefines::formationBinaryAllanResultName(), + RiaResultNames::formationBinaryAllanResultName(), false, fnData.size() ); diff --git a/ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.cpp b/ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.cpp index 4984c674f7..4a393be9fd 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.cpp @@ -54,7 +54,7 @@ RigEclipseCaseData::RigEclipseCaseData( RimEclipseCase* ownerCase ) m_matrixModelResults->setActiveCellInfo( m_activeCellInfo.p() ); m_fractureModelResults->setActiveCellInfo( m_fractureActiveCellInfo.p() ); - m_unitsType = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC; + m_unitsType = RiaDefines::EclipseUnitSystem::UNITS_METRIC; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.h b/ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.h index 0f7aa45a6e..5fca88dfc2 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.h +++ b/ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.h @@ -22,7 +22,7 @@ #include "RifReaderInterface.h" -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "cvfArray.h" #include "cvfAssert.h" @@ -105,8 +105,8 @@ public: void computeActiveCellBoundingBoxes(); - RiaEclipseUnitTools::UnitSystem unitsType() const { return m_unitsType; } - void setUnitsType( RiaEclipseUnitTools::UnitSystem unitsType ) { m_unitsType = unitsType; } + RiaDefines::EclipseUnitSystem unitsType() const { return m_unitsType; } + void setUnitsType( RiaDefines::EclipseUnitSystem unitsType ) { m_unitsType = unitsType; } std::vector simulationWellNames() const; bool hasSimulationWell( const QString& simWellName ) const; @@ -149,7 +149,7 @@ private: cvf::Collection m_gridCellToResultWellIndex; //< Array pr grid with index to well pr cell telling // which well a cell is in - RiaEclipseUnitTools::UnitSystem m_unitsType; + RiaDefines::EclipseUnitSystem m_unitsType; bool m_hasParsedDeckForEquilData; std::vector m_equil; diff --git a/ApplicationLibCode/ReservoirDataModel/RigEclipseNativeStatCalc.cpp b/ApplicationLibCode/ReservoirDataModel/RigEclipseNativeStatCalc.cpp index 3b7f169c84..8b75882002 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigEclipseNativeStatCalc.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigEclipseNativeStatCalc.cpp @@ -100,7 +100,8 @@ size_t RigEclipseNativeStatCalc::timeStepCount() //-------------------------------------------------------------------------------------------------- void RigEclipseNativeStatCalc::mobileVolumeWeightedMean( size_t timeStepIndex, double& mean ) { - RigEclipseResultAddress mobPorvAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::mobilePoreVolumeName() ); + RigEclipseResultAddress mobPorvAddress( RiaDefines::ResultCatType::STATIC_NATIVE, + RiaResultNames::mobilePoreVolumeName() ); // For statistics result cases, the pore volume is not available, as // RigCaseCellResultsData::createPlaceholderResultEntries has not been executed diff --git a/ApplicationLibCode/ReservoirDataModel/RigEclipseNativeVisibleCellsStatCalc.cpp b/ApplicationLibCode/ReservoirDataModel/RigEclipseNativeVisibleCellsStatCalc.cpp index b4da3429df..c9b9ac3c22 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigEclipseNativeVisibleCellsStatCalc.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigEclipseNativeVisibleCellsStatCalc.cpp @@ -103,7 +103,8 @@ size_t RigEclipseNativeVisibleCellsStatCalc::timeStepCount() //-------------------------------------------------------------------------------------------------- void RigEclipseNativeVisibleCellsStatCalc::mobileVolumeWeightedMean( size_t timeStepIndex, double& result ) { - RigEclipseResultAddress mobPorvAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::mobilePoreVolumeName() ); + RigEclipseResultAddress mobPorvAddress( RiaDefines::ResultCatType::STATIC_NATIVE, + RiaResultNames::mobilePoreVolumeName() ); // For statistics result cases, the pore volume is not available, as // RigCaseCellResultsData::createPlaceholderResultEntries has not been executed diff --git a/ApplicationLibCode/ReservoirDataModel/RigEclipseResultAddress.h b/ApplicationLibCode/ReservoirDataModel/RigEclipseResultAddress.h index 3b4c1734fd..0d60f1a789 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigEclipseResultAddress.h +++ b/ApplicationLibCode/ReservoirDataModel/RigEclipseResultAddress.h @@ -18,6 +18,7 @@ #pragma once #include "RiaDefines.h" +#include "RiaResultNames.h" #include @@ -52,7 +53,7 @@ public: bool isValid() const { - if ( m_resultName.isEmpty() || m_resultName == RiaDefines::undefinedResultName() ) + if ( m_resultName.isEmpty() || m_resultName == RiaResultNames::undefinedResultName() ) { return false; } diff --git a/ApplicationLibCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp b/ApplicationLibCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp index 4ceb95d979..446ab786a7 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp @@ -115,9 +115,9 @@ void RigFlowDiagTimeStepResult::addResult( const RigFlowDiagResultAddress& resAd class RigOpmFlowDiagStaticData : public cvf::Object { public: - RigOpmFlowDiagStaticData( const ecl_grid_type* mainGrid, - const std::wstring& init, - RiaEclipseUnitTools::UnitSystem caseUnitSystem ) + RigOpmFlowDiagStaticData( const ecl_grid_type* mainGrid, + const std::wstring& init, + RiaDefines::EclipseUnitSystem caseUnitSystem ) { Opm::ECLInitFileData initData( init ); @@ -147,11 +147,11 @@ public: // Try and set output unit system to the same system as the eclipse case system std::unique_ptr eclUnitSystem; - if ( caseUnitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + if ( caseUnitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) eclUnitSystem = Opm::ECLUnits::metricUnitConventions(); - else if ( caseUnitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + else if ( caseUnitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) eclUnitSystem = Opm::ECLUnits::fieldUnitConventions(); - else if ( caseUnitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_LAB ) + else if ( caseUnitSystem == RiaDefines::EclipseUnitSystem::UNITS_LAB ) eclUnitSystem = Opm::ECLUnits::labUnitConventions(); if ( eclUnitSystem ) @@ -542,7 +542,7 @@ bool RigFlowDiagSolverInterface::ensureStaticDataObjectInstanceCreated() return false; } - RiaEclipseUnitTools::UnitSystem caseUnitSystem = eclipseCaseData->unitsType(); + RiaDefines::EclipseUnitSystem caseUnitSystem = eclipseCaseData->unitsType(); m_opmFlowDiagStaticData = new RigOpmFlowDiagStaticData( mainGrid, initFileName, caseUnitSystem ); ecl_grid_free( mainGrid ); diff --git a/ApplicationLibCode/ReservoirDataModel/RigFlowDiagStatCalc.cpp b/ApplicationLibCode/ReservoirDataModel/RigFlowDiagStatCalc.cpp index b6680e90a7..65ba85c816 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigFlowDiagStatCalc.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigFlowDiagStatCalc.cpp @@ -120,7 +120,7 @@ void RigFlowDiagStatCalc::mobileVolumeWeightedMean( size_t timeStepIndex, double RigCaseCellResultsData* caseCellResultsData = eclCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL ); RigEclipseResultAddress mobPoreVolResAddr( RiaDefines::ResultCatType::STATIC_NATIVE, - RiaDefines::mobilePoreVolumeName() ); + RiaResultNames::mobilePoreVolumeName() ); caseCellResultsData->ensureKnownResultLoaded( mobPoreVolResAddr ); diff --git a/ApplicationLibCode/ReservoirDataModel/RigFlowDiagVisibleCellsStatCalc.cpp b/ApplicationLibCode/ReservoirDataModel/RigFlowDiagVisibleCellsStatCalc.cpp index f1f401a6a8..ebb8a30e8f 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigFlowDiagVisibleCellsStatCalc.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigFlowDiagVisibleCellsStatCalc.cpp @@ -111,7 +111,7 @@ void RigFlowDiagVisibleCellsStatCalc::mobileVolumeWeightedMean( size_t timeStepI RigCaseCellResultsData* caseCellResultsData = eclCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL ); - RigEclipseResultAddress mobPorvAddr( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::mobilePoreVolumeName() ); + RigEclipseResultAddress mobPorvAddr( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::mobilePoreVolumeName() ); caseCellResultsData->ensureKnownResultLoaded( mobPorvAddr ); const std::vector& weights = caseCellResultsData->cellScalarResults( mobPorvAddr, 0 ); diff --git a/ApplicationLibCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp b/ApplicationLibCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp index c50ec12e5a..9cd44595ce 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp @@ -24,7 +24,9 @@ #include "RiaDefines.h" #include "RiaLogging.h" +#include "RiaResultNames.h" #include "RiaWeightedMeanCalculator.h" + #include "RigFemPart.h" #include "RigFemPartCollection.h" #include "RigFemPartResultsCollection.h" @@ -134,30 +136,30 @@ QString RigGeoMechWellLogExtractor::curveData( const RigFemResultAddress& resAdd return ""; } - if ( resAddr.fieldName == RiaDefines::wbsFGResult().toStdString() ) + if ( resAddr.fieldName == RiaResultNames::wbsFGResult().toStdString() ) { wellBoreWallCurveData( resAddr, frameIndex, values ); // Try to replace invalid values with Shale-values wellBoreFGShale( frameIndex, values ); values->front() = wbsCurveValuesAtMsl(); } - else if ( resAddr.fieldName == RiaDefines::wbsSFGResult().toStdString() ) + else if ( resAddr.fieldName == RiaResultNames::wbsSFGResult().toStdString() ) { wellBoreWallCurveData( resAddr, frameIndex, values ); } - else if ( resAddr.fieldName == RiaDefines::wbsPPResult().toStdString() || - resAddr.fieldName == RiaDefines::wbsOBGResult().toStdString() || - resAddr.fieldName == RiaDefines::wbsSHResult().toStdString() ) + else if ( resAddr.fieldName == RiaResultNames::wbsPPResult().toStdString() || + resAddr.fieldName == RiaResultNames::wbsOBGResult().toStdString() || + resAddr.fieldName == RiaResultNames::wbsSHResult().toStdString() ) { wellPathScaledCurveData( resAddr, frameIndex, values ); values->front() = wbsCurveValuesAtMsl(); } - else if ( resAddr.fieldName == RiaDefines::wbsAzimuthResult().toStdString() || - resAddr.fieldName == RiaDefines::wbsInclinationResult().toStdString() ) + else if ( resAddr.fieldName == RiaResultNames::wbsAzimuthResult().toStdString() || + resAddr.fieldName == RiaResultNames::wbsInclinationResult().toStdString() ) { wellPathAngles( resAddr, values ); } - else if ( resAddr.fieldName == RiaDefines::wbsSHMkResult().toStdString() ) + else if ( resAddr.fieldName == RiaResultNames::wbsSHMkResult().toStdString() ) { wellBoreSH_MatthewsKelly( frameIndex, values ); values->front() = wbsCurveValuesAtMsl(); @@ -510,7 +512,7 @@ std::vector values->resize( m_intersections.size(), std::numeric_limits::infinity() ); std::vector sources( m_intersections.size(), RigWbsParameter::UNDEFINED ); - if ( resAddr.fieldName == RiaDefines::wbsPPResult().toStdString() ) + if ( resAddr.fieldName == RiaResultNames::wbsPPResult().toStdString() ) { // Las or element property table values std::vector ppSandValues( m_intersections.size(), std::numeric_limits::infinity() ); @@ -557,7 +559,7 @@ std::vector } } } - else if ( resAddr.fieldName == RiaDefines::wbsOBGResult().toStdString() ) + else if ( resAddr.fieldName == RiaResultNames::wbsOBGResult().toStdString() ) { sources = calculateWbsParameterForAllSegments( RigWbsParameter::OBG(), frameIndex, values, true ); } @@ -577,8 +579,8 @@ void RigGeoMechWellLogExtractor::wellBoreWallCurveData( const RigFemResultAddres std::vector* values ) { CVF_ASSERT( values ); - CVF_ASSERT( resAddr.fieldName == RiaDefines::wbsFGResult().toStdString() || - resAddr.fieldName == RiaDefines::wbsSFGResult().toStdString() ); + CVF_ASSERT( resAddr.fieldName == RiaResultNames::wbsFGResult().toStdString() || + resAddr.fieldName == RiaResultNames::wbsSFGResult().toStdString() ); // The result addresses needed RigFemResultAddress stressResAddr( RIG_ELEMENT_NODAL, "ST", "" ); @@ -644,7 +646,7 @@ void RigGeoMechWellLogExtractor::wellBoreWallCurveData( const RigFemResultAddres RigGeoMechBoreHoleStressCalculator sigmaCalculator( wellPathStressDouble, porePressureBar, poissonRatio, ucsBar, 32 ); double resultValue = std::numeric_limits::infinity(); - if ( resAddr.fieldName == RiaDefines::wbsFGResult().toStdString() ) + if ( resAddr.fieldName == RiaResultNames::wbsFGResult().toStdString() ) { if ( isFGregion && validSegmentStress ) { @@ -653,7 +655,7 @@ void RigGeoMechWellLogExtractor::wellBoreWallCurveData( const RigFemResultAddres } else { - CVF_ASSERT( resAddr.fieldName == RiaDefines::wbsSFGResult().toStdString() ); + CVF_ASSERT( resAddr.fieldName == RiaResultNames::wbsSFGResult().toStdString() ); if ( !isFGregion && validSegmentStress ) { resultValue = sigmaCalculator.solveStassiDalia(); @@ -683,7 +685,7 @@ void RigGeoMechWellLogExtractor::wellBoreFGShale( int frameIndex, std::vector PP0; // results std::vector K0_FG, OBG0; // parameters - RigFemResultAddress ppAddr( RIG_WELLPATH_DERIVED, RiaDefines::wbsPPResult().toStdString(), "" ); + RigFemResultAddress ppAddr( RIG_WELLPATH_DERIVED, RiaResultNames::wbsPPResult().toStdString(), "" ); wellPathScaledCurveData( ppAddr, 0, &PP0, true ); calculateWbsParameterForAllSegments( RigWbsParameter::K0_FG(), frameIndex, &K0_FG, true ); @@ -732,7 +734,7 @@ void RigGeoMechWellLogExtractor::wellBoreSH_MatthewsKelly( int frameIndex, std:: std::vector PP, PP0; // results std::vector K0_SH, OBG0, DF; // parameters - RigFemResultAddress ppAddr( RIG_WELLPATH_DERIVED, RiaDefines::wbsPPResult().toStdString(), "" ); + RigFemResultAddress ppAddr( RIG_WELLPATH_DERIVED, RiaResultNames::wbsPPResult().toStdString(), "" ); curveData( ppAddr, frameIndex, &PP ); curveData( ppAddr, 0, &PP0 ); @@ -815,7 +817,7 @@ QString RigGeoMechWellLogExtractor::parameterInputUnits( const RigWbsParameter& //-------------------------------------------------------------------------------------------------- std::vector RigGeoMechWellLogExtractor::porePressureSourceRegions( int frameIndex ) { - RigFemResultAddress ppResAddr( RIG_ELEMENT_NODAL, RiaDefines::wbsPPResult().toStdString(), "" ); + RigFemResultAddress ppResAddr( RIG_ELEMENT_NODAL, RiaResultNames::wbsPPResult().toStdString(), "" ); std::vector values; std::vector sources = wellPathScaledCurveData( ppResAddr, frameIndex, &values ); diff --git a/ApplicationLibCode/ReservoirDataModel/RigMainGrid.cpp b/ApplicationLibCode/ReservoirDataModel/RigMainGrid.cpp index eb4ff5f6cc..4a49c55ceb 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigMainGrid.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigMainGrid.cpp @@ -20,8 +20,8 @@ #include "RigMainGrid.h" -#include "RiaDefines.h" #include "RiaLogging.h" +#include "RiaResultNames.h" #include "RigActiveCellInfo.h" #include "RigHexIntersectionTools.h" @@ -419,8 +419,8 @@ bool RigMainGrid::hasFaultWithName( const QString& name ) const //-------------------------------------------------------------------------------------------------- void RigMainGrid::calculateFaults( const RigActiveCellInfo* activeCellInfo ) { - if ( hasFaultWithName( RiaDefines::undefinedGridFaultName() ) && - hasFaultWithName( RiaDefines::undefinedGridFaultWithInactiveName() ) ) + if ( hasFaultWithName( RiaResultNames::undefinedGridFaultName() ) && + hasFaultWithName( RiaResultNames::undefinedGridFaultWithInactiveName() ) ) { // RiaLogging::debug(QString("Calculate faults already run for grid.")); @@ -439,12 +439,12 @@ void RigMainGrid::calculateFaults( const RigActiveCellInfo* activeCellInfo ) // Separate the grid faults that has an inactive cell as member RigFault* unNamedFault = new RigFault; - unNamedFault->setName( RiaDefines::undefinedGridFaultName() ); + unNamedFault->setName( RiaResultNames::undefinedGridFaultName() ); int unNamedFaultIdx = static_cast( m_faults.size() ); m_faults.push_back( unNamedFault ); RigFault* unNamedFaultWithInactive = new RigFault; - unNamedFaultWithInactive->setName( RiaDefines::undefinedGridFaultWithInactiveName() ); + unNamedFaultWithInactive->setName( RiaResultNames::undefinedGridFaultWithInactiveName() ); int unNamedFaultWithInactiveIdx = static_cast( m_faults.size() ); m_faults.push_back( unNamedFaultWithInactive ); diff --git a/ApplicationLibCode/ReservoirDataModel/RigResultAccessorFactory.cpp b/ApplicationLibCode/ReservoirDataModel/RigResultAccessorFactory.cpp index 4cb629c283..d012b01c9d 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigResultAccessorFactory.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigResultAccessorFactory.cpp @@ -127,7 +127,7 @@ cvf::ref RigEclipseResultAddress nativeAddr( resVarAddr ); const RigGridBase* grid = eclipseCase->grid( gridIndex ); - if ( resVarAddr.m_resultName == RiaDefines::combinedTransmissibilityResultName() ) + if ( resVarAddr.m_resultName == RiaResultNames::combinedTransmissibilityResultName() ) { CVF_ASSERT( timeStepIndex == 0 ); // Static result, only data for first time step @@ -158,7 +158,7 @@ cvf::ref return cellFaceAccessObject; } - else if ( resVarAddr.m_resultName == RiaDefines::combinedMultResultName() ) + else if ( resVarAddr.m_resultName == RiaResultNames::combinedMultResultName() ) { CVF_ASSERT( timeStepIndex == 0 ); // Static result, only data for first time step @@ -206,27 +206,27 @@ cvf::ref return cellFaceAccessObject; } - else if ( resVarAddr.m_resultName == RiaDefines::combinedRiTranResultName() ) + else if ( resVarAddr.m_resultName == RiaResultNames::combinedRiTranResultName() ) { CVF_ASSERT( timeStepIndex == 0 ); // Static result, only data for first time step cvf::ref cellFaceAccessObject = new RigCombTransResultAccessor( grid ); - nativeAddr.m_resultName = RiaDefines::riTranXResultName(); + nativeAddr.m_resultName = RiaResultNames::riTranXResultName(); cvf::ref xTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, gridIndex, porosityModel, timeStepIndex, nativeAddr ); - nativeAddr.m_resultName = RiaDefines::riTranYResultName(); + nativeAddr.m_resultName = RiaResultNames::riTranYResultName(); cvf::ref yTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, gridIndex, porosityModel, timeStepIndex, nativeAddr ); - nativeAddr.m_resultName = RiaDefines::riTranZResultName(); + nativeAddr.m_resultName = RiaResultNames::riTranZResultName(); cvf::ref zTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, gridIndex, @@ -238,26 +238,26 @@ cvf::ref return cellFaceAccessObject; } - else if ( resVarAddr.m_resultName == RiaDefines::combinedRiMultResultName() ) + else if ( resVarAddr.m_resultName == RiaResultNames::combinedRiMultResultName() ) { CVF_ASSERT( timeStepIndex == 0 ); // Static result, only data for first time step cvf::ref cellFaceAccessObject = new RigCombTransResultAccessor( grid ); - nativeAddr.m_resultName = RiaDefines::riMultXResultName(); + nativeAddr.m_resultName = RiaResultNames::riMultXResultName(); cvf::ref xRiMultAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, gridIndex, porosityModel, timeStepIndex, nativeAddr ); - nativeAddr.m_resultName = RiaDefines::riMultYResultName(); + nativeAddr.m_resultName = RiaResultNames::riMultYResultName(); cvf::ref yRiMultAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, gridIndex, porosityModel, timeStepIndex, nativeAddr ); - nativeAddr.m_resultName = RiaDefines::riMultZResultName(); + nativeAddr.m_resultName = RiaResultNames::riMultZResultName(); cvf::ref zRiMultAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, gridIndex, @@ -269,27 +269,27 @@ cvf::ref return cellFaceAccessObject; } - else if ( resVarAddr.m_resultName == RiaDefines::combinedRiAreaNormTranResultName() ) + else if ( resVarAddr.m_resultName == RiaResultNames::combinedRiAreaNormTranResultName() ) { CVF_ASSERT( timeStepIndex == 0 ); // Static result, only data for first time step cvf::ref cellFaceAccessObject = new RigCombTransResultAccessor( grid ); - nativeAddr.m_resultName = RiaDefines::riAreaNormTranXResultName(); + nativeAddr.m_resultName = RiaResultNames::riAreaNormTranXResultName(); cvf::ref xRiAreaNormTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, gridIndex, porosityModel, timeStepIndex, nativeAddr ); - nativeAddr.m_resultName = RiaDefines::riAreaNormTranYResultName(); + nativeAddr.m_resultName = RiaResultNames::riAreaNormTranYResultName(); cvf::ref yRiAreaNormTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, gridIndex, porosityModel, timeStepIndex, nativeAddr ); - nativeAddr.m_resultName = RiaDefines::riAreaNormTranZResultName(); + nativeAddr.m_resultName = RiaResultNames::riAreaNormTranZResultName(); cvf::ref zRiAreaNormTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, gridIndex, @@ -303,7 +303,7 @@ cvf::ref return cellFaceAccessObject; } - else if ( resVarAddr.m_resultName == RiaDefines::combinedWaterFluxResultName() ) + else if ( resVarAddr.m_resultName == RiaResultNames::combinedWaterFluxResultName() ) { cvf::ref cellFaceAccessObject = new RigCombTransResultAccessor( grid ); @@ -335,7 +335,7 @@ cvf::ref return cellFaceAccessObject; } - else if ( resVarAddr.m_resultName == RiaDefines::combinedOilFluxResultName() ) + else if ( resVarAddr.m_resultName == RiaResultNames::combinedOilFluxResultName() ) { cvf::ref cellFaceAccessObject = new RigCombTransResultAccessor( grid ); @@ -367,7 +367,7 @@ cvf::ref return cellFaceAccessObject; } - else if ( resVarAddr.m_resultName == RiaDefines::combinedGasFluxResultName() ) + else if ( resVarAddr.m_resultName == RiaResultNames::combinedGasFluxResultName() ) { cvf::ref cellFaceAccessObject = new RigCombTransResultAccessor( grid ); diff --git a/ApplicationLibCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp b/ApplicationLibCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp index e781844b07..b031b996f8 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp @@ -18,6 +18,7 @@ #include "RigStimPlanFractureDefinition.h" +#include "RiaEclipseUnitTools.h" #include "RiaFractureDefines.h" #include "RiaLogging.h" @@ -45,7 +46,7 @@ const double RigStimPlanFractureDefinition::THRESHOLD_VALUE = 1e-5; /// //-------------------------------------------------------------------------------------------------- RigStimPlanFractureDefinition::RigStimPlanFractureDefinition() - : m_unitSet( RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ) + : m_unitSet( RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ) , m_xMirrorMode( false ) , m_topPerfTvd( HUGE_VAL ) , m_bottomPerfTvd( HUGE_VAL ) @@ -64,7 +65,7 @@ RigStimPlanFractureDefinition::~RigStimPlanFractureDefinition() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RigStimPlanFractureDefinition::unitSet() const +RiaDefines::EclipseUnitSystem RigStimPlanFractureDefinition::unitSet() const { return m_unitSet; } @@ -316,9 +317,9 @@ std::vector> RigStimPlanFractureDefinition::getStimP /// //-------------------------------------------------------------------------------------------------- std::vector> - RigStimPlanFractureDefinition::conductivityValuesAtTimeStep( const QString& resultName, - int activeTimeStepIndex, - RiaEclipseUnitTools::UnitSystem requiredUnitSet ) const + RigStimPlanFractureDefinition::conductivityValuesAtTimeStep( const QString& resultName, + int activeTimeStepIndex, + RiaDefines::EclipseUnitSystem requiredUnitSet ) const { std::vector> conductivityValues; @@ -350,11 +351,11 @@ std::vector> { for ( auto& xVal : yValues ) { - if ( requiredUnitSet == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) + if ( requiredUnitSet == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) { xVal = RiaEclipseUnitTools::convertToFeet( xVal, conductivityUnitTextOnFile ); } - else if ( requiredUnitSet == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) + else if ( requiredUnitSet == RiaDefines::EclipseUnitSystem::UNITS_METRIC ) { xVal = RiaEclipseUnitTools::convertToMeter( xVal, conductivityUnitTextOnFile ); } @@ -371,7 +372,7 @@ cvf::ref RigStimPlanFractureDefinition::createFractureGrid( const QString& resultName, int activeTimeStepIndex, double wellPathIntersectionAtFractureDepth, - RiaEclipseUnitTools::UnitSystem requiredUnitSet ) const + RiaDefines::EclipseUnitSystem requiredUnitSet ) const { std::vector> conductivityValues = conductivityValuesAtTimeStep( resultName, activeTimeStepIndex, requiredUnitSet ); diff --git a/ApplicationLibCode/ReservoirDataModel/RigStimPlanFractureDefinition.h b/ApplicationLibCode/ReservoirDataModel/RigStimPlanFractureDefinition.h index 84da7f1f74..6d0b62ff69 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigStimPlanFractureDefinition.h +++ b/ApplicationLibCode/ReservoirDataModel/RigStimPlanFractureDefinition.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "cvfObject.h" #include "cvfVector3.h" @@ -59,11 +59,11 @@ public: RigStimPlanFractureDefinition(); ~RigStimPlanFractureDefinition() override; - RiaEclipseUnitTools::UnitSystem unitSet() const; - size_t xCount() const; - size_t yCount() const; - double minDepth() const; - double maxDepth() const; + RiaDefines::EclipseUnitSystem unitSet() const; + size_t xCount() const; + size_t yCount() const; + double minDepth() const; + double maxDepth() const; double topPerfTvd() const; double bottomPerfTvd() const; @@ -75,10 +75,10 @@ public: void setMdToTopPerf( double topPerfMd ); void setMdToBottomPerf( double bottomPerfMd ); - cvf::ref createFractureGrid( const QString& resultName, - int activeTimeStepIndex, - double wellPathIntersectionAtFractureDepth, - RiaEclipseUnitTools::UnitSystem requiredUnitSet ) const; + cvf::ref createFractureGrid( const QString& resultName, + int activeTimeStepIndex, + double wellPathIntersectionAtFractureDepth, + RiaDefines::EclipseUnitSystem requiredUnitSet ) const; void createFractureTriangleGeometry( double wellPathIntersectionAtFractureDepth, const QString& fractureUserName, @@ -121,15 +121,15 @@ private: void scaleXs( double scaleFactor ); void scaleYs( double scaleFactor, double wellPathIntersectionY ); - std::vector> conductivityValuesAtTimeStep( const QString& resultName, - int activeTimeStepIndex, - RiaEclipseUnitTools::UnitSystem requiredUnitSet ) const; + std::vector> conductivityValuesAtTimeStep( const QString& resultName, + int activeTimeStepIndex, + RiaDefines::EclipseUnitSystem requiredUnitSet ) const; private: - RiaEclipseUnitTools::UnitSystem m_unitSet; // To be deleted - std::vector m_fileXs; - std::vector m_Ys; - std::vector m_timeSteps; + RiaDefines::EclipseUnitSystem m_unitSet; // To be deleted + std::vector m_fileXs; + std::vector m_Ys; + std::vector m_timeSteps; std::vector m_stimPlanResults; std::vector m_Xs; diff --git a/ApplicationLibCode/ReservoirDataModel/RigWellLogCurveData.cpp b/ApplicationLibCode/ReservoirDataModel/RigWellLogCurveData.cpp index 607042e6e5..112972c071 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigWellLogCurveData.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigWellLogCurveData.cpp @@ -20,7 +20,6 @@ #include "RigWellLogCurveData.h" #include "RiaCurveDataTools.h" -#include "RiaEclipseUnitTools.h" #include "RiaWellLogUnitTools.h" #include "cvfAssert.h" diff --git a/ApplicationLibCode/UnitTests/RifStimPlanXmlReader-Test.cpp b/ApplicationLibCode/UnitTests/RifStimPlanXmlReader-Test.cpp index accb6ec056..a9ead65c45 100644 --- a/ApplicationLibCode/UnitTests/RifStimPlanXmlReader-Test.cpp +++ b/ApplicationLibCode/UnitTests/RifStimPlanXmlReader-Test.cpp @@ -18,7 +18,7 @@ TEST( RifStimPlanXmlReaderTest, LoadFile ) double halfLengthScaleFactor = 1.0; double heightScaleFactor = 1.0; double wellPathDepthAtFracture = 100.0; - RiaEclipseUnitTools::UnitSystem unit = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC; + RiaDefines::EclipseUnitSystem unit = RiaDefines::EclipseUnitSystem::UNITS_METRIC; QString errorMessage; RifStimPlanXmlReader::MirrorMode mode = RifStimPlanXmlReader::MIRROR_AUTO; @@ -53,7 +53,7 @@ TEST( RifStimPlanXmlReaderTest, LoadFileNewFormat ) double halfLengthScaleFactor = 1.0; double heightScaleFactor = 1.0; double wellPathDepthAtFracture = 100.0; - RiaEclipseUnitTools::UnitSystem unit = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC; + RiaDefines::EclipseUnitSystem unit = RiaDefines::EclipseUnitSystem::UNITS_METRIC; QString errorMessage; RifStimPlanXmlReader::MirrorMode mode = RifStimPlanXmlReader::MIRROR_AUTO; diff --git a/ApplicationLibCode/UserInterface/RiuPvtPlotPanel.cpp b/ApplicationLibCode/UserInterface/RiuPvtPlotPanel.cpp index 4f23528563..3a77acf4d4 100644 --- a/ApplicationLibCode/UserInterface/RiuPvtPlotPanel.cpp +++ b/ApplicationLibCode/UserInterface/RiuPvtPlotPanel.cpp @@ -22,6 +22,8 @@ #include "RiuGuiTheme.h" #include "RiuPvtPlotUpdater.h" +#include "RiaEclipseUnitTools.h" + #include "RigFlowDiagSolverInterface.h" #include "cvfAssert.h" @@ -177,7 +179,7 @@ void RiuPvtPlotWidget::setPlotDefaults( QwtPlot* plot ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuPvtPlotWidget::plotCurves( RiaEclipseUnitTools::UnitSystem unitSystem, +void RiuPvtPlotWidget::plotCurves( RiaDefines::EclipseUnitSystem unitSystem, const std::vector& curveArr, double pressure, double pointMarkerYValue, @@ -511,7 +513,7 @@ void RiuPvtPlotWidget::slotPickerActivated( bool on ) //-------------------------------------------------------------------------------------------------- RiuPvtPlotPanel::RiuPvtPlotPanel( QDockWidget* parent ) : QWidget( parent ) - , m_unitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ) + , m_unitSystem( RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ) , m_plotUpdater( new RiuPvtPlotUpdater( this ) ) { m_phaseComboBox = new QComboBox( this ); @@ -563,7 +565,7 @@ RiuPvtPlotPanel::~RiuPvtPlotPanel() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuPvtPlotPanel::setPlotData( RiaEclipseUnitTools::UnitSystem unitSystem, +void RiuPvtPlotPanel::setPlotData( RiaDefines::EclipseUnitSystem unitSystem, const std::vector& fvfCurveArr, const std::vector& viscosityCurveArr, const FvfDynProps& fvfDynProps, @@ -596,7 +598,7 @@ void RiuPvtPlotPanel::clearPlot() return; } - m_unitSystem = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + m_unitSystem = RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; m_allFvfCurvesArr.clear(); m_allViscosityCurvesArr.clear(); m_fvfDynProps = FvfDynProps(); @@ -754,18 +756,18 @@ void RiuPvtPlotPanel::plotUiSelectedCurves() //-------------------------------------------------------------------------------------------------- /// Static helper to get unit labels //-------------------------------------------------------------------------------------------------- -QString RiuPvtPlotPanel::unitLabelFromCurveIdent( RiaEclipseUnitTools::UnitSystem unitSystem, +QString RiuPvtPlotPanel::unitLabelFromCurveIdent( RiaDefines::EclipseUnitSystem unitSystem, RigFlowDiagSolverInterface::PvtCurve::Ident curveIdent ) { if ( curveIdent == RigFlowDiagSolverInterface::PvtCurve::Bo ) { switch ( unitSystem ) { - case RiaEclipseUnitTools::UnitSystem::UNITS_METRIC: + case RiaDefines::EclipseUnitSystem::UNITS_METRIC: return "rm3/sm3"; - case RiaEclipseUnitTools::UnitSystem::UNITS_FIELD: + case RiaDefines::EclipseUnitSystem::UNITS_FIELD: return "rb/stb"; - case RiaEclipseUnitTools::UnitSystem::UNITS_LAB: + case RiaDefines::EclipseUnitSystem::UNITS_LAB: return "rcc/scc"; default: return ""; @@ -775,11 +777,11 @@ QString RiuPvtPlotPanel::unitLabelFromCurveIdent( RiaEclipseUnitTools::UnitSyste { switch ( unitSystem ) { - case RiaEclipseUnitTools::UnitSystem::UNITS_METRIC: + case RiaDefines::EclipseUnitSystem::UNITS_METRIC: return "rm3/sm3"; - case RiaEclipseUnitTools::UnitSystem::UNITS_FIELD: + case RiaDefines::EclipseUnitSystem::UNITS_FIELD: return "rb/Mscf"; - case RiaEclipseUnitTools::UnitSystem::UNITS_LAB: + case RiaDefines::EclipseUnitSystem::UNITS_LAB: return "rcc/scc"; default: return ""; @@ -790,11 +792,11 @@ QString RiuPvtPlotPanel::unitLabelFromCurveIdent( RiaEclipseUnitTools::UnitSyste { switch ( unitSystem ) { - case RiaEclipseUnitTools::UnitSystem::UNITS_METRIC: + case RiaDefines::EclipseUnitSystem::UNITS_METRIC: return "cP"; - case RiaEclipseUnitTools::UnitSystem::UNITS_FIELD: + case RiaDefines::EclipseUnitSystem::UNITS_FIELD: return "cP"; - case RiaEclipseUnitTools::UnitSystem::UNITS_LAB: + case RiaDefines::EclipseUnitSystem::UNITS_LAB: return "cP"; default: return ""; diff --git a/ApplicationLibCode/UserInterface/RiuPvtPlotPanel.h b/ApplicationLibCode/UserInterface/RiuPvtPlotPanel.h index ae8eaaf754..d6ee920f10 100644 --- a/ApplicationLibCode/UserInterface/RiuPvtPlotPanel.h +++ b/ApplicationLibCode/UserInterface/RiuPvtPlotPanel.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RigFlowDiagSolverInterface.h" #include @@ -59,7 +59,7 @@ class RiuPvtPlotWidget : public QWidget, public RiuPvtTrackerTextProvider public: RiuPvtPlotWidget( RiuPvtPlotPanel* parent ); - void plotCurves( RiaEclipseUnitTools::UnitSystem unitSystem, + void plotCurves( RiaDefines::EclipseUnitSystem unitSystem, const std::vector& curveArr, double pressure, double pointMarkerYValue, @@ -124,7 +124,7 @@ public: RiuPvtPlotPanel( QDockWidget* parent ); ~RiuPvtPlotPanel() override; - void setPlotData( RiaEclipseUnitTools::UnitSystem unitSystem, + void setPlotData( RiaDefines::EclipseUnitSystem unitSystem, const std::vector& fvfCurveArr, const std::vector& viscosityCurveArr, const FvfDynProps& fvfDynProps, @@ -137,14 +137,14 @@ public: private: void plotUiSelectedCurves(); - static QString unitLabelFromCurveIdent( RiaEclipseUnitTools::UnitSystem unitSystem, + static QString unitLabelFromCurveIdent( RiaDefines::EclipseUnitSystem unitSystem, RigFlowDiagSolverInterface::PvtCurve::Ident curveIdent ); private slots: void slotPhaseComboCurrentIndexChanged( int ); private: - RiaEclipseUnitTools::UnitSystem m_unitSystem; + RiaDefines::EclipseUnitSystem m_unitSystem; std::vector m_allFvfCurvesArr; std::vector m_allViscosityCurvesArr; FvfDynProps m_fvfDynProps; diff --git a/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp b/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp index 221a5d91e1..b2bb8e8db4 100644 --- a/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp +++ b/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp @@ -17,6 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RiuRelativePermeabilityPlotPanel.h" + #include "RiuDockedQwtPlot.h" #include "RiuGuiTheme.h" #include "RiuQwtPlotCurve.h" @@ -25,6 +26,8 @@ #include "RiuTextDialog.h" #include "RiaCurveDataTools.h" +#include "RiaEclipseUnitTools.h" + #include "RigFlowDiagSolverInterface.h" #include "cvfAssert.h" @@ -80,7 +83,7 @@ public: //-------------------------------------------------------------------------------------------------- RiuRelativePermeabilityPlotPanel::RiuRelativePermeabilityPlotPanel( QDockWidget* parent ) : QWidget( parent ) - , m_unitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ) + , m_unitSystem( RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ) , m_swat( HUGE_VAL ) , m_sgas( HUGE_VAL ) , m_plotUpdater( new RiuRelativePermeabilityPlotUpdater( this ) ) @@ -187,7 +190,7 @@ void RiuRelativePermeabilityPlotPanel::setPlotDefaults( QwtPlot* plot ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuRelativePermeabilityPlotPanel::setPlotData( RiaEclipseUnitTools::UnitSystem unitSystem, +void RiuRelativePermeabilityPlotPanel::setPlotData( RiaDefines::EclipseUnitSystem unitSystem, const std::vector& relPermCurves, double swat, double sgas, @@ -218,7 +221,7 @@ void RiuRelativePermeabilityPlotPanel::clearPlot() return; } - m_unitSystem = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN; + m_unitSystem = RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN; m_allCurvesArr.clear(); m_swat = HUGE_VAL; m_sgas = HUGE_VAL; @@ -316,7 +319,7 @@ void RiuRelativePermeabilityPlotPanel::addTransparentCurve( QwtPlot* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuRelativePermeabilityPlotPanel::plotCurvesInQwt( RiaEclipseUnitTools::UnitSystem unitSystem, +void RiuRelativePermeabilityPlotPanel::plotCurvesInQwt( RiaDefines::EclipseUnitSystem unitSystem, const std::vector& curveArr, double swat, double sgas, diff --git a/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotPanel.h b/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotPanel.h index 5edf7475c9..548c222cbe 100644 --- a/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotPanel.h +++ b/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotPanel.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaEclipseUnitTools.h" +#include "RiaDefines.h" #include "RigFlowDiagSolverInterface.h" #include @@ -49,7 +49,7 @@ public: RiuRelativePermeabilityPlotPanel( QDockWidget* parent ); ~RiuRelativePermeabilityPlotPanel() override; - void setPlotData( RiaEclipseUnitTools::UnitSystem unitSystem, + void setPlotData( RiaDefines::EclipseUnitSystem unitSystem, const std::vector& relPermCurves, double swat, double sgas, @@ -79,7 +79,7 @@ private: void plotUiSelectedCurves(); static void setPlotDefaults( QwtPlot* plot ); - static void plotCurvesInQwt( RiaEclipseUnitTools::UnitSystem unitSystem, + static void plotCurvesInQwt( RiaDefines::EclipseUnitSystem unitSystem, const std::vector& curveArr, double swat, double sgas, @@ -127,7 +127,7 @@ private slots: void slotShowCurveSelectionWidgets( int state ); private: - RiaEclipseUnitTools::UnitSystem m_unitSystem; + RiaDefines::EclipseUnitSystem m_unitSystem; std::vector m_allCurvesArr; double m_swat; double m_sgas; diff --git a/ApplicationLibCode/UserInterface/RiuResultTextBuilder.cpp b/ApplicationLibCode/UserInterface/RiuResultTextBuilder.cpp index f14124e5a7..68a80e079e 100644 --- a/ApplicationLibCode/UserInterface/RiuResultTextBuilder.cpp +++ b/ApplicationLibCode/UserInterface/RiuResultTextBuilder.cpp @@ -485,7 +485,7 @@ QString RiuResultTextBuilder::nncResultText() QString resultValueText; if ( m_viewWithFaultsSettings->currentFaultResultColors()->resultVariable() == - RiaDefines::formationAllanResultName() ) + RiaResultNames::formationAllanResultName() ) { std::pair fmIndexPair = eclipseCase->allanDiagramData()->formationIndexCombinationFromCategory( @@ -504,7 +504,7 @@ QString RiuResultTextBuilder::nncResultText() // clang-format on } else if ( m_viewWithFaultsSettings->currentFaultResultColors()->resultVariable() == - RiaDefines::formationBinaryAllanResultName() ) + RiaResultNames::formationBinaryAllanResultName() ) { resultValueText = ( *nncValues )[m_nncIndex] == 0 ? "Same formation" : "Different formation"; } @@ -597,7 +597,7 @@ void RiuResultTextBuilder::appendTextFromResultColors( RigEclipseCaseData* { if ( resultColors->hasStaticResult() ) { - if ( resultColors->resultVariable().compare( RiaDefines::combinedTransmissibilityResultName(), + if ( resultColors->resultVariable().compare( RiaResultNames::combinedTransmissibilityResultName(), Qt::CaseInsensitive ) == 0 ) { cvf::ref transResultAccessor = @@ -606,7 +606,7 @@ void RiuResultTextBuilder::appendTextFromResultColors( RigEclipseCaseData* porosityModel, 0, RigEclipseResultAddress( - RiaDefines::combinedTransmissibilityResultName() ) ); + RiaResultNames::combinedTransmissibilityResultName() ) ); { double scalarValue = transResultAccessor->cellFaceScalar( cellIndex, cvf::StructGridInterface::POS_I ); resultInfoText->append( QString( "Tran X : %1\n" ).arg( scalarValue ) ); @@ -620,7 +620,7 @@ void RiuResultTextBuilder::appendTextFromResultColors( RigEclipseCaseData* return; } - else if ( resultColors->resultVariable().compare( RiaDefines::combinedMultResultName(), + else if ( resultColors->resultVariable().compare( RiaResultNames::combinedMultResultName(), Qt::CaseInsensitive ) == 0 ) { cvf::ref multResultAccessor = @@ -629,7 +629,7 @@ void RiuResultTextBuilder::appendTextFromResultColors( RigEclipseCaseData* porosityModel, 0, RigEclipseResultAddress( - RiaDefines::combinedMultResultName() ) ); + RiaResultNames::combinedMultResultName() ) ); { double scalarValue = multResultAccessor->cellFaceScalar( cellIndex, cvf::StructGridInterface::POS_I ); resultInfoText->append( QString( "MULTX : %1\n" ).arg( scalarValue ) ); @@ -649,7 +649,7 @@ void RiuResultTextBuilder::appendTextFromResultColors( RigEclipseCaseData* return; } - else if ( resultColors->resultVariable().compare( RiaDefines::combinedRiTranResultName(), + else if ( resultColors->resultVariable().compare( RiaResultNames::combinedRiTranResultName(), Qt::CaseInsensitive ) == 0 ) { cvf::ref transResultAccessor = @@ -658,7 +658,7 @@ void RiuResultTextBuilder::appendTextFromResultColors( RigEclipseCaseData* porosityModel, 0, RigEclipseResultAddress( - RiaDefines::combinedRiTranResultName() ) ); + RiaResultNames::combinedRiTranResultName() ) ); { double scalarValue = transResultAccessor->cellFaceScalar( cellIndex, cvf::StructGridInterface::POS_I ); resultInfoText->append( QString( "riTran X : %1\n" ).arg( scalarValue ) ); @@ -672,7 +672,7 @@ void RiuResultTextBuilder::appendTextFromResultColors( RigEclipseCaseData* return; } - else if ( resultColors->resultVariable().compare( RiaDefines::combinedRiMultResultName(), + else if ( resultColors->resultVariable().compare( RiaResultNames::combinedRiMultResultName(), Qt::CaseInsensitive ) == 0 ) { cvf::ref resultAccessor = @@ -681,7 +681,7 @@ void RiuResultTextBuilder::appendTextFromResultColors( RigEclipseCaseData* porosityModel, 0, RigEclipseResultAddress( - RiaDefines::combinedRiMultResultName() ) ); + RiaResultNames::combinedRiMultResultName() ) ); { double scalarValue = resultAccessor->cellFaceScalar( cellIndex, cvf::StructGridInterface::POS_I ); resultInfoText->append( QString( "riMult X : %1\n" ).arg( scalarValue ) ); @@ -695,7 +695,7 @@ void RiuResultTextBuilder::appendTextFromResultColors( RigEclipseCaseData* return; } - else if ( resultColors->resultVariable().compare( RiaDefines::combinedRiAreaNormTranResultName(), + else if ( resultColors->resultVariable().compare( RiaResultNames::combinedRiAreaNormTranResultName(), Qt::CaseInsensitive ) == 0 ) { cvf::ref resultAccessor = @@ -704,7 +704,7 @@ void RiuResultTextBuilder::appendTextFromResultColors( RigEclipseCaseData* porosityModel, 0, RigEclipseResultAddress( - RiaDefines::combinedRiAreaNormTranResultName() ) ); + RiaResultNames::combinedRiAreaNormTranResultName() ) ); { double scalarValue = resultAccessor->cellFaceScalar( cellIndex, cvf::StructGridInterface::POS_I ); resultInfoText->append( QString( "riTransByArea X : %1\n" ).arg( scalarValue ) ); diff --git a/ApplicationLibCode/UserInterface/RiuSelectionChangedHandler.cpp b/ApplicationLibCode/UserInterface/RiuSelectionChangedHandler.cpp index 3ef3a38a53..01990bd050 100644 --- a/ApplicationLibCode/UserInterface/RiuSelectionChangedHandler.cpp +++ b/ApplicationLibCode/UserInterface/RiuSelectionChangedHandler.cpp @@ -145,7 +145,7 @@ void RiuSelectionChangedHandler::addCurveFromSelectionItem( const RiuEclipseSele return; } - else if ( eclResDef->hasDynamicResult() && !RiaDefines::isPerCellFaceResult( eclResDef->resultVariable() ) && + else if ( eclResDef->hasDynamicResult() && !RiaResultNames::isPerCellFaceResult( eclResDef->resultVariable() ) && eclResDef->eclipseCase() && eclResDef->eclipseCase()->eclipseCaseData() ) { RiaDefines::PorosityModelType porosityModel = eclResDef->porosityModel();