From 00cd16ed4fd453d159f15bf0f28df44ae10d7160 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 12 May 2020 08:26:22 +0200 Subject: [PATCH] Fix misspelled Allan diagram (#5906) Closes #5816 --- ApplicationCode/Application/RiaDefines.cpp | 10 +-- ApplicationCode/Application/RiaDefines.h | 6 +- .../Python/rips/tests/test_nnc_properties.py | 12 +-- .../ModelVisualization/RivFaultPartMgr.cpp | 38 ++++----- .../ModelVisualization/RivFaultPartMgr.h | 6 +- .../RivNNCGeometryGenerator.cpp | 8 +- .../RivNNCGeometryGenerator.h | 4 +- .../RivReservoirFaultsPartMgr.cpp | 2 +- .../RimEclipseResultDefinition.cpp | 27 ++++-- .../ProjectDataModel/RimEclipseView.cpp | 2 +- .../RimRegularLegendConfig.cpp | 19 +++-- .../ReservoirDataModel/CMakeLists_files.cmake | 8 +- ...iagramData.cpp => RigAllanDiagramData.cpp} | 6 +- ...lenDiagramData.h => RigAllanDiagramData.h} | 6 +- .../RigCaseCellResultsData.cpp | 84 +++++++++---------- .../RigCaseCellResultsData.h | 8 +- ....cpp => RigEclipseAllanFaultsStatCalc.cpp} | 18 ++-- ...Calc.h => RigEclipseAllanFaultsStatCalc.h} | 4 +- .../ReservoirDataModel/RigEclipseCaseData.cpp | 4 +- .../ReservoirDataModel/RigEclipseCaseData.h | 4 +- .../UserInterface/RiuResultTextBuilder.cpp | 12 +-- 21 files changed, 154 insertions(+), 134 deletions(-) rename ApplicationCode/ReservoirDataModel/{RigAllenDiagramData.cpp => RigAllanDiagramData.cpp} (91%) rename ApplicationCode/ReservoirDataModel/{RigAllenDiagramData.h => RigAllanDiagramData.h} (93%) rename ApplicationCode/ReservoirDataModel/{RigEclipseAllenFaultsStatCalc.cpp => RigEclipseAllanFaultsStatCalc.cpp} (87%) rename ApplicationCode/ReservoirDataModel/{RigEclipseAllenFaultsStatCalc.h => RigEclipseAllanFaultsStatCalc.h} (94%) diff --git a/ApplicationCode/Application/RiaDefines.cpp b/ApplicationCode/Application/RiaDefines.cpp index 037162e062..f459d77fc0 100644 --- a/ApplicationCode/Application/RiaDefines.cpp +++ b/ApplicationCode/Application/RiaDefines.cpp @@ -33,7 +33,7 @@ void caf::AppEnum::setUp() addItem( RiaDefines::GENERATED, "GENERATED", "Generated" ); addItem( RiaDefines::INPUT_PROPERTY, "INPUT_PROPERTY", "Input Property" ); addItem( RiaDefines::FORMATION_NAMES, "FORMATION_NAMES", "Formation Names" ); - addItem( RiaDefines::ALLEN_DIAGRAMS, "ALLEN_DIAGRAMS", "Allen Diagrams" ); + addItem( RiaDefines::ALLAN_DIAGRAMS, "ALLAN_DIAGRAMS", "Allan Diagrams" ); addItem( RiaDefines::FLOW_DIAGNOSTICS, "FLOW_DIAGNOSTICS", "Flow Diagnostics" ); addItem( RiaDefines::INJECTION_FLOODING, "INJECTION_FLOODING", "Injection Flooding" ); setDefault( RiaDefines::DYNAMIC_NATIVE ); @@ -373,17 +373,17 @@ QString RiaDefines::completionTypeResultName() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RiaDefines::formationBinaryAllenResultName() +QString RiaDefines::formationBinaryAllanResultName() { - return "Binary Formation Allen"; + return "Binary Formation Allan"; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RiaDefines::formationAllenResultName() +QString RiaDefines::formationAllanResultName() { - return "Formation Allen"; + return "Formation Allan"; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Application/RiaDefines.h b/ApplicationCode/Application/RiaDefines.h index 3f79b25b31..04385e6e40 100644 --- a/ApplicationCode/Application/RiaDefines.h +++ b/ApplicationCode/Application/RiaDefines.h @@ -33,7 +33,7 @@ enum ResultCatType GENERATED, INPUT_PROPERTY, FORMATION_NAMES, - ALLEN_DIAGRAMS, + ALLAN_DIAGRAMS, FLOW_DIAGNOSTICS, INJECTION_FLOODING, REMOVED, @@ -106,8 +106,8 @@ QString mobilePoreVolumeName(); QString completionTypeResultName(); // Fault results -QString formationBinaryAllenResultName(); -QString formationAllenResultName(); +QString formationBinaryAllanResultName(); +QString formationAllanResultName(); // Mock model text identifiers QString mockModelBasic(); diff --git a/ApplicationCode/GrpcInterface/Python/rips/tests/test_nnc_properties.py b/ApplicationCode/GrpcInterface/Python/rips/tests/test_nnc_properties.py index cf9c6caa97..fa666fa1c1 100644 --- a/ApplicationCode/GrpcInterface/Python/rips/tests/test_nnc_properties.py +++ b/ApplicationCode/GrpcInterface/Python/rips/tests/test_nnc_properties.py @@ -20,9 +20,9 @@ def test_10kSync(rips_instance, initialize_test): assert("TRAN" == properties[0].name) assert(NNCProperties_pb2.NNCPropertyType.Value('NNC_STATIC') == properties[0].property_type) - assert("Binary Formation Allen" == properties[1].name) + assert("Binary Formation Allan" == properties[1].name) assert(NNCProperties_pb2.NNCPropertyType.Value('NNC_GENERATED') == properties[1].property_type) - assert("Formation Allen" == properties[2].name) + assert("Formation Allan" == properties[2].name) assert(NNCProperties_pb2.NNCPropertyType.Value('NNC_GENERATED') == properties[2].property_type) nnc_connections = case.nnc_connections() @@ -40,10 +40,10 @@ def test_10kSync(rips_instance, initialize_test): for t in tran_vals: assert(isinstance(t, float)) - allen_vals = case.nnc_connections_generated_values("Formation Allen", 0) - assert(len(allen_vals) == len(nnc_connections)) + allan_vals = case.nnc_connections_generated_values("Formation Allan", 0) + assert(len(allan_vals) == len(nnc_connections)) - for a in allen_vals: + for a in allan_vals: assert(isinstance(a, float)) # Generate some data @@ -81,4 +81,4 @@ def test_invalid_time_steps(rips_instance, initialize_test): casePath = dataroot.PATH + "/TEST10K_FLT_LGR_NNC/TEST10K_FLT_LGR_NNC.EGRID" case = rips_instance.project.load_case(path=casePath) with pytest.raises(grpc.RpcError): - case.nnc_connections_generated_values("Formation Allen", 9999) + case.nnc_connections_generated_values("Formation Allan", 9999) diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp index 4099e96b4c..8b99a4da7d 100644 --- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp @@ -87,12 +87,12 @@ RivFaultPartMgr::RivFaultPartMgr( const RigGridBase* grid, m_NNCTextureCoords = new cvf::Vec2fArray; - m_allenNNCGenerator = new RivNNCGeometryGenerator( true, + m_allanNNCGenerator = new RivNNCGeometryGenerator( true, grid->mainGrid()->nncData(), grid->mainGrid()->displayModelOffset(), connIdxes.p() ); - m_allenNNCTextureCoords = new cvf::Vec2fArray; + m_allanNNCTextureCoords = new cvf::Vec2fArray; } //-------------------------------------------------------------------------------------------------- @@ -103,7 +103,7 @@ void RivFaultPartMgr::setCellVisibility( cvf::UByteArray* cellVisibilities ) m_nativeFaultGenerator->setCellVisibility( cellVisibilities ); m_oppositeFaultGenerator->setCellVisibility( cellVisibilities ); m_NNCGenerator->setCellVisibility( cellVisibilities, m_grid.p() ); - m_allenNNCGenerator->setCellVisibility( cellVisibilities, m_grid.p() ); + m_allanNNCGenerator->setCellVisibility( cellVisibilities, m_grid.p() ); clearFlags(); } @@ -432,7 +432,7 @@ void RivFaultPartMgr::generateNativeNncPartGeometry() //-------------------------------------------------------------------------------------------------- void RivFaultPartMgr::generateAllNncPartGeometry() { - cvf::ref geo = m_allenNNCGenerator->generateSurface(); + cvf::ref geo = m_allanNNCGenerator->generateSurface(); if ( geo.notNull() ) { geo->computeNormals(); @@ -440,12 +440,12 @@ void RivFaultPartMgr::generateAllNncPartGeometry() geo->setRenderMode( cvf::DrawableGeo::BUFFER_OBJECT ); cvf::ref part = new cvf::Part; - part->setName( "Allen NNC in Fault. Grid " + cvf::String( static_cast( m_grid->gridIndex() ) ) ); + part->setName( "Allan NNC in Fault. Grid " + cvf::String( static_cast( m_grid->gridIndex() ) ) ); part->setDrawable( geo.p() ); // Set mapping from triangle face index to cell index cvf::ref si = new RivSourceInfo( m_rimFault, m_grid->gridIndex() ); - si->m_NNCIndices = m_allenNNCGenerator->triangleToNNCIndex().p(); + si->m_NNCIndices = m_allanNNCGenerator->triangleToNNCIndex().p(); part->setSourceInfo( si.p() ); part->updateBoundingBox(); @@ -455,7 +455,7 @@ void RivFaultPartMgr::generateAllNncPartGeometry() cvf::ref eff = new cvf::Effect; part->setEffect( eff.p() ); - m_allenNNCFaces = part; + m_allanNNCFaces = part; updatePartEffect(); } @@ -523,7 +523,7 @@ void RivFaultPartMgr::updatePartEffect() m_oppositeFaultFaces->setPriority( RivPartPriority::PartType::TransparentFault ); if ( m_NNCFaces.notNull() ) m_NNCFaces->setPriority( RivPartPriority::PartType::TransparentNnc ); - if ( m_allenNNCFaces.notNull() ) m_allenNNCFaces->setPriority( RivPartPriority::PartType::TransparentNnc ); + if ( m_allanNNCFaces.notNull() ) m_allanNNCFaces->setPriority( RivPartPriority::PartType::TransparentNnc ); if ( m_nativeFaultGridLines.notNull() ) { @@ -734,7 +734,7 @@ void RivFaultPartMgr::appendCompleteNNCFacesToModel( cvf::ModelBasicList* model generateAllNncPartGeometry(); } - if ( m_allenNNCFaces.notNull() ) model->addPart( m_allenNNCFaces.p() ); + if ( m_allanNNCFaces.notNull() ) model->addPart( m_allanNNCFaces.p() ); } //-------------------------------------------------------------------------------------------------- @@ -798,9 +798,9 @@ caf::FaceCulling RivFaultPartMgr::faceCullingMode() const void RivFaultPartMgr::updateNNCColors( size_t timeStepIndex, RimEclipseCellColors* cellResultColors ) { bool updateNnc = m_NNCFaces.notNull(); - bool updateAllen = m_allenNNCFaces.notNull(); + bool updateAllan = m_allanNNCFaces.notNull(); - if ( !updateNnc && !updateAllen ) + if ( !updateNnc && !updateAllan ) { return; } @@ -843,9 +843,9 @@ void RivFaultPartMgr::updateNNCColors( size_t timeStepIndex, RimEclipseCellColor nativeTimeStepIndex ); } - if ( updateAllen ) + if ( updateAllan ) { - m_allenNNCGenerator->textureCoordinates( m_allenNNCTextureCoords.p(), + m_allanNNCGenerator->textureCoordinates( m_allanNNCTextureCoords.p(), mapper, resultType, eclResAddr, @@ -879,12 +879,12 @@ void RivFaultPartMgr::updateNNCColors( size_t timeStepIndex, RimEclipseCellColor m_NNCFaces->setEffect( nncEffect.p() ); } - if ( updateAllen ) + if ( updateAllan ) { - cvf::DrawableGeo* dg = dynamic_cast( m_allenNNCFaces->drawable() ); - if ( dg ) dg->setTextureCoordArray( m_allenNNCTextureCoords.p() ); + cvf::DrawableGeo* dg = dynamic_cast( m_allanNNCFaces->drawable() ); + if ( dg ) dg->setTextureCoordArray( m_allanNNCTextureCoords.p() ); - m_allenNNCFaces->setEffect( nncEffect.p() ); + m_allanNNCFaces->setEffect( nncEffect.p() ); } } else @@ -916,9 +916,9 @@ void RivFaultPartMgr::updateNNCColors( size_t timeStepIndex, RimEclipseCellColor m_NNCFaces->setEffect( nncEffect.p() ); } - if ( updateAllen ) + if ( updateAllan ) { - m_allenNNCFaces->setEffect( nncEffect.p() ); + m_allanNNCFaces->setEffect( nncEffect.p() ); } } } diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.h b/ApplicationCode/ModelVisualization/RivFaultPartMgr.h index bb755a053d..cc0519b0d9 100644 --- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.h @@ -115,9 +115,9 @@ private: cvf::ref m_NNCTextureCoords; bool m_isAllNncsGenerated; - cvf::ref m_allenNNCGenerator; - cvf::ref m_allenNNCFaces; - cvf::ref m_allenNNCTextureCoords; + cvf::ref m_allanNNCGenerator; + cvf::ref m_allanNNCFaces; + cvf::ref m_allanNNCTextureCoords; cvf::ref m_faultLabelPart; cvf::ref m_faultLabelLinePart; diff --git a/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.cpp b/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.cpp index 5d56de94ca..c19912ba91 100644 --- a/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.cpp +++ b/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.cpp @@ -31,11 +31,11 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RivNNCGeometryGenerator::RivNNCGeometryGenerator( bool includeAllen, +RivNNCGeometryGenerator::RivNNCGeometryGenerator( bool includeAllan, const RigNNCData* nncData, const cvf::Vec3d& offset, const cvf::Array* nncIndexes ) - : m_includeAllenDiagramGeometry( includeAllen ) + : m_includeAllanDiagramGeometry( includeAllan ) , m_nncData( nncData ) , m_nncIndexes( nncIndexes ) , m_offset( offset ) @@ -90,7 +90,7 @@ void RivNNCGeometryGenerator::computeArrays() { size_t conIdx = m_nncIndexes.isNull() ? nIdx : ( *m_nncIndexes )[nIdx]; - if ( !m_includeAllenDiagramGeometry && conIdx >= m_nncData->nativeConnectionCount() ) + if ( !m_includeAllanDiagramGeometry && conIdx >= m_nncData->nativeConnectionCount() ) { continue; } @@ -164,7 +164,7 @@ void RivNNCGeometryGenerator::textureCoordinates( cvf::Vec2fArray* cvf::Vec2f* rawPtr = textureCoords->ptr(); const std::vector* nncResultVals = nullptr; if ( resultType == RiaDefines::STATIC_NATIVE || resultType == RiaDefines::FORMATION_NAMES || - resultType == RiaDefines::ALLEN_DIAGRAMS ) + resultType == RiaDefines::ALLAN_DIAGRAMS ) { nncResultVals = m_nncData->staticConnectionScalarResult( resVarAddr ); } diff --git a/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h b/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h index d0c254b67a..548911d61a 100644 --- a/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h +++ b/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h @@ -42,7 +42,7 @@ class RigEclipseResultAddress; class RivNNCGeometryGenerator : public cvf::Object { public: - RivNNCGeometryGenerator( bool includeAllen, + RivNNCGeometryGenerator( bool includeAllan, const RigNNCData* nncData, const cvf::Vec3d& offset, const cvf::Array* nncIndexes ); @@ -67,7 +67,7 @@ private: void computeArrays(); private: - bool m_includeAllenDiagramGeometry; + bool m_includeAllanDiagramGeometry; // Input cvf::cref m_nncData; diff --git a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp index c6e8dc2e3b..878df82b25 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp @@ -169,7 +169,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel( cvf::ModelBasicList* model ) eclipseResultAddress = cellResultColors->eclipseResultAddress(); } - if ( eclipseResultAddress.m_resultCatType == RiaDefines::ALLEN_DIAGRAMS ) + if ( eclipseResultAddress.m_resultCatType == RiaDefines::ALLAN_DIAGRAMS ) { showCompleteNncGeo = true; } diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 1863f13c4d..b054d4b966 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -28,7 +28,7 @@ #include "RicfCommandObject.h" #include "RigActiveCellInfo.h" -#include "RigAllenDiagramData.h" +#include "RigAllanDiagramData.h" #include "RigCaseCellResultsData.h" #include "RigEclipseCaseData.h" #include "RigEclipseResultInfo.h" @@ -693,7 +693,7 @@ QList continue; } - if ( resType == RiaDefines::ALLEN_DIAGRAMS && !isSeparateFaultResult ) + if ( resType == RiaDefines::ALLAN_DIAGRAMS && !isSeparateFaultResult ) { continue; } @@ -1234,6 +1234,17 @@ void RimEclipseResultDefinition::initAfterRead() assignFlowSolutionFromCase(); } + if ( m_resultVariable == "Formation Allen" ) + { + m_resultVariable = RiaDefines::formationAllanResultName(); + m_resultType = RiaDefines::ResultCatType::ALLAN_DIAGRAMS; + } + else if ( m_resultVariable == "Binary Formation Allen" ) + { + m_resultVariable = RiaDefines::formationBinaryAllanResultName(); + m_resultType = RiaDefines::ResultCatType::ALLAN_DIAGRAMS; + } + m_porosityModelUiField = m_porosityModel; m_resultTypeUiField = m_resultType; m_resultVariableUiField = m_resultVariable; @@ -1406,8 +1417,8 @@ bool RimEclipseResultDefinition::hasCategoryResult() const if ( this->m_resultType() == RiaDefines::FLOW_DIAGNOSTICS && m_resultVariable() == RIG_FLD_MAX_FRACTION_TRACER_RESNAME ) return true; - if ( this->resultVariable() == RiaDefines::formationAllenResultName() || - this->resultVariable() == RiaDefines::formationBinaryAllenResultName() ) + if ( this->resultVariable() == RiaDefines::formationAllanResultName() || + this->resultVariable() == RiaDefines::formationBinaryAllanResultName() ) { return true; } @@ -1891,9 +1902,9 @@ void RimEclipseResultDefinition::updateRangesForExplicitLegends( RimRegularLegen std::vector fnVector = eclipseCaseData->formationNames(); legendConfigToUpdate->setNamedCategoriesInverse( fnVector ); } - else if ( this->resultType() == RiaDefines::ALLEN_DIAGRAMS ) + else if ( this->resultType() == RiaDefines::ALLAN_DIAGRAMS ) { - if ( this->resultVariable() == RiaDefines::formationAllenResultName() ) + if ( this->resultVariable() == RiaDefines::formationAllanResultName() ) { const std::vector fnVector = eclipseCaseData->formationNames(); std::vector fnameIdxes; @@ -1907,7 +1918,7 @@ void RimEclipseResultDefinition::updateRangesForExplicitLegends( RimRegularLegen formationColorMapper->setInterpolateColors( legendBaseColors ); const std::map, int>& formationCombToCathegory = - eclipseCaseData->allenDiagramData()->formationCombinationToCategory(); + eclipseCaseData->allanDiagramData()->formationCombinationToCategory(); std::vector> categories; for ( int frmNameIdx : fnameIdxes ) @@ -1937,7 +1948,7 @@ void RimEclipseResultDefinition::updateRangesForExplicitLegends( RimRegularLegen legendConfigToUpdate->setCategoryItems( categories ); } - else if ( this->resultVariable() == RiaDefines::formationBinaryAllenResultName() ) + else if ( this->resultVariable() == RiaDefines::formationBinaryAllanResultName() ) { std::vector> categories; categories.emplace_back( std::make_tuple( "Same formation", 0, cvf::Color3ub::BROWN ) ); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index 25032a69b1..fee857e5c2 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -2192,7 +2192,7 @@ bool RimEclipseView::isUsingFormationNames() const { if ( cellResult()->resultType() == RiaDefines::FORMATION_NAMES ) return true; - if ( faultResultSettings()->customFaultResult()->resultType() == RiaDefines::ALLEN_DIAGRAMS ) return true; + if ( faultResultSettings()->customFaultResult()->resultType() == RiaDefines::ALLAN_DIAGRAMS ) return true; return eclipsePropertyFilterCollection()->isUsingFormationNames(); } diff --git a/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp b/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp index 3e43881375..85df791f40 100644 --- a/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp +++ b/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp @@ -541,6 +541,15 @@ void RimRegularLegendConfig::setAutomaticRanges( double globalMin, double global //-------------------------------------------------------------------------------------------------- void RimRegularLegendConfig::initAfterRead() { + if ( resultVariableName == "Binary Formation Allen" ) + { + resultVariableName = RiaDefines::formationBinaryAllanResultName(); + } + else if ( resultVariableName == "Formation Allen" ) + { + resultVariableName = RiaDefines::formationAllanResultName(); + } + updateFieldVisibility(); this->updateUiIconFromToggleField(); @@ -961,7 +970,7 @@ QList if ( rftCurveSet ) hasRftPlotParent = true; bool isCategoryResult = false; - bool isAllenDiagram = false; + bool isAllanDiagram = false; { RimEclipseCellColors* eclCellColors = nullptr; this->firstAncestorOrThisOfType( eclCellColors ); @@ -983,9 +992,9 @@ QList isCategoryResult = true; } - if ( eclCellColors && eclCellColors->resultType() == RiaDefines::ALLEN_DIAGRAMS ) + if ( eclCellColors && eclCellColors->resultType() == RiaDefines::ALLAN_DIAGRAMS ) { - isAllenDiagram = true; + isAllanDiagram = true; } } @@ -996,7 +1005,7 @@ QList // This is an app enum field, see cafInternalPdmFieldTypeSpecializations.h for the default specialization of // this type std::vector mappingTypes; - if ( !isAllenDiagram ) + if ( !isAllanDiagram ) { mappingTypes.push_back( LINEAR_DISCRETE ); @@ -1023,7 +1032,7 @@ QList // This is an app enum field, see cafInternalPdmFieldTypeSpecializations.h for the default specialization of // this type std::vector rangeTypes; - if ( !isAllenDiagram ) + if ( !isAllanDiagram ) { if ( !hasEnsembleCurveSetParent && !hasRftPlotParent ) { diff --git a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake index 4f310adfe0..bdf59f710e 100644 --- a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake @@ -16,7 +16,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RigCombMultResultAccessor.h ${CMAKE_CURRENT_LIST_DIR}/RigResultModifier.h ${CMAKE_CURRENT_LIST_DIR}/RigResultModifierFactory.h ${CMAKE_CURRENT_LIST_DIR}/RigFormationNames.h -${CMAKE_CURRENT_LIST_DIR}/RigAllenDiagramData.h +${CMAKE_CURRENT_LIST_DIR}/RigAllanDiagramData.h ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResultAddress.h ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResults.h ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResultFrames.h @@ -74,7 +74,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RigGridCrossPlotCurveGrouping.h ${CMAKE_CURRENT_LIST_DIR}/RigEclipseCrossPlotDataExtractor.h ${CMAKE_CURRENT_LIST_DIR}/RigEquil.h ${CMAKE_CURRENT_LIST_DIR}/RigWbsParameter.h -${CMAKE_CURRENT_LIST_DIR}/RigEclipseAllenFaultsStatCalc.h +${CMAKE_CURRENT_LIST_DIR}/RigEclipseAllanFaultsStatCalc.h ${CMAKE_CURRENT_LIST_DIR}/RigCellFaceGeometryTools.h ${CMAKE_CURRENT_LIST_DIR}/RigNncConnection.h ${CMAKE_CURRENT_LIST_DIR}/RigWellDiskData.h @@ -97,7 +97,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RigCombTransResultAccessor.cpp ${CMAKE_CURRENT_LIST_DIR}/RigCombMultResultAccessor.cpp ${CMAKE_CURRENT_LIST_DIR}/RigResultModifierFactory.cpp ${CMAKE_CURRENT_LIST_DIR}/RigFormationNames.cpp -${CMAKE_CURRENT_LIST_DIR}/RigAllenDiagramData.cpp +${CMAKE_CURRENT_LIST_DIR}/RigAllanDiagramData.cpp ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResultAddress.cpp ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResults.cpp ${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResultFrames.cpp @@ -149,7 +149,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RigCaseCellResultCalculator.cpp ${CMAKE_CURRENT_LIST_DIR}/RigEclipseCrossPlotDataExtractor.cpp ${CMAKE_CURRENT_LIST_DIR}/RigEquil.cpp ${CMAKE_CURRENT_LIST_DIR}/RigWbsParameter.cpp -${CMAKE_CURRENT_LIST_DIR}/RigEclipseAllenFaultsStatCalc.cpp +${CMAKE_CURRENT_LIST_DIR}/RigEclipseAllanFaultsStatCalc.cpp ${CMAKE_CURRENT_LIST_DIR}/RigCellFaceGeometryTools.cpp ${CMAKE_CURRENT_LIST_DIR}/RigNncConnection.cpp ${CMAKE_CURRENT_LIST_DIR}/RigWellDiskData.cpp diff --git a/ApplicationCode/ReservoirDataModel/RigAllenDiagramData.cpp b/ApplicationCode/ReservoirDataModel/RigAllanDiagramData.cpp similarity index 91% rename from ApplicationCode/ReservoirDataModel/RigAllenDiagramData.cpp rename to ApplicationCode/ReservoirDataModel/RigAllanDiagramData.cpp index 75592dd1eb..fd5ad06e75 100644 --- a/ApplicationCode/ReservoirDataModel/RigAllenDiagramData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigAllanDiagramData.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RigAllenDiagramData.h" +#include "RigAllanDiagramData.h" #include "RigCaseCellResultsData.h" #include "RigFormationNames.h" @@ -25,13 +25,13 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigAllenDiagramData::RigAllenDiagramData() +RigAllanDiagramData::RigAllanDiagramData() { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigAllenDiagramData::~RigAllenDiagramData() +RigAllanDiagramData::~RigAllanDiagramData() { } diff --git a/ApplicationCode/ReservoirDataModel/RigAllenDiagramData.h b/ApplicationCode/ReservoirDataModel/RigAllanDiagramData.h similarity index 93% rename from ApplicationCode/ReservoirDataModel/RigAllenDiagramData.h rename to ApplicationCode/ReservoirDataModel/RigAllanDiagramData.h index d5c4b458b4..7403674d14 100644 --- a/ApplicationCode/ReservoirDataModel/RigAllenDiagramData.h +++ b/ApplicationCode/ReservoirDataModel/RigAllanDiagramData.h @@ -23,11 +23,11 @@ #include -class RigAllenDiagramData : public cvf::Object +class RigAllanDiagramData : public cvf::Object { public: - RigAllenDiagramData(); - ~RigAllenDiagramData() override; + RigAllanDiagramData(); + ~RigAllanDiagramData() override; const std::map, int>& formationCombinationToCategory() { diff --git a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp index 441ba46b66..0fdaea6cf3 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp @@ -23,7 +23,7 @@ #include "RiaApplication.h" #include "RiaLogging.h" -#include "RigAllenDiagramData.h" +#include "RigAllanDiagramData.h" #include "RigCaseCellResultCalculator.h" #include "RigEclipseCaseData.h" #include "RigEclipseMultiPropertyStatCalc.h" @@ -45,7 +45,7 @@ #include -#include "RigEclipseAllenFaultsStatCalc.h" +#include "RigEclipseAllanFaultsStatCalc.h" #include #include @@ -63,7 +63,7 @@ RigCaseCellResultsData::RigCaseCellResultsData( RigEclipseCaseData* ow m_ownerCaseData = ownerCaseData; m_ownerMainGrid = ownerCaseData->mainGrid(); - m_allenDiagramData = new RigAllenDiagramData; + m_allanDiagramData = new RigAllanDiagramData; } //-------------------------------------------------------------------------------------------------- @@ -426,11 +426,11 @@ size_t RigCaseCellResultsData::findOrCreateScalarResultIndex( const RigEclipseRe QString( "%1K" ).arg( baseName ) ) ); statisticsCalculator = calc; } - else if ( resultName == RiaDefines::formationAllenResultName() || - resultName == RiaDefines::formationBinaryAllenResultName() ) + else if ( resultName == RiaDefines::formationAllanResultName() || + resultName == RiaDefines::formationBinaryAllanResultName() ) { - cvf::ref calc = - new RigEclipseAllenFaultsStatCalc( m_ownerMainGrid->nncData(), resVarAddr ); + cvf::ref calc = + new RigEclipseAllanFaultsStatCalc( m_ownerMainGrid->nncData(), resVarAddr ); statisticsCalculator = calc; } else @@ -912,12 +912,12 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() // Fault results { - findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ALLEN_DIAGRAMS, - RiaDefines::formationBinaryAllenResultName() ), + findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ALLAN_DIAGRAMS, + RiaDefines::formationBinaryAllanResultName() ), false ); - findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ALLEN_DIAGRAMS, - RiaDefines::formationAllenResultName() ), + findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ALLAN_DIAGRAMS, + RiaDefines::formationAllanResultName() ), false ); } @@ -1227,10 +1227,10 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu { computeRiTRANSbyAreaComponent( resultName ); } - else if ( resultName == RiaDefines::formationAllenResultName() || - resultName == RiaDefines::formationBinaryAllenResultName() ) + else if ( resultName == RiaDefines::formationAllanResultName() || + resultName == RiaDefines::formationBinaryAllanResultName() ) { - computeAllenResults( this, m_ownerMainGrid ); + computeAllanResults( this, m_ownerMainGrid ); } } else if ( type == RiaDefines::DYNAMIC_NATIVE ) @@ -2894,7 +2894,7 @@ void RigCaseCellResultsData::setActiveFormationNames( RigFormationNames* activeF } } - computeAllenResults( this, m_ownerMainGrid ); + computeAllanResults( this, m_ownerMainGrid ); } //-------------------------------------------------------------------------------------------------- @@ -2908,9 +2908,9 @@ const RigFormationNames* RigCaseCellResultsData::activeFormationNames() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigAllenDiagramData* RigCaseCellResultsData::allenDiagramData() +RigAllanDiagramData* RigCaseCellResultsData::allanDiagramData() { - return m_allenDiagramData.p(); + return m_allanDiagramData.p(); } //-------------------------------------------------------------------------------------------------- @@ -3006,7 +3006,7 @@ RigStatisticsDataCache* RigCaseCellResultsData::statistics( const RigEclipseResu //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseCellResultsData::computeAllenResults( RigCaseCellResultsData* cellResultsData, RigMainGrid* mainGrid ) +void RigCaseCellResultsData::computeAllanResults( RigCaseCellResultsData* cellResultsData, RigMainGrid* mainGrid ) { CVF_ASSERT( mainGrid ); CVF_ASSERT( cellResultsData ); @@ -3017,38 +3017,38 @@ void RigCaseCellResultsData::computeAllenResults( RigCaseCellResultsData* cellRe if ( hasFormationData ) { - auto fnAllenResultResAddr = - RigEclipseResultAddress( RiaDefines::ALLEN_DIAGRAMS, RiaDefines::formationAllenResultName() ); - auto fnBinAllenResAddr = - RigEclipseResultAddress( RiaDefines::ALLEN_DIAGRAMS, RiaDefines::formationBinaryAllenResultName() ); + auto fnAllanResultResAddr = + RigEclipseResultAddress( RiaDefines::ALLAN_DIAGRAMS, RiaDefines::formationAllanResultName() ); + auto fnBinAllanResAddr = + RigEclipseResultAddress( RiaDefines::ALLAN_DIAGRAMS, RiaDefines::formationBinaryAllanResultName() ); // Create and retreive nnc result arrays - std::vector& fnAllenNncResults = - mainGrid->nncData()->makeStaticConnectionScalarResult( RiaDefines::formationAllenResultName() ); - std::vector& fnBinAllenNncResults = - mainGrid->nncData()->makeStaticConnectionScalarResult( RiaDefines::formationBinaryAllenResultName() ); + std::vector& fnAllanNncResults = + mainGrid->nncData()->makeStaticConnectionScalarResult( RiaDefines::formationAllanResultName() ); + std::vector& fnBinAllanNncResults = + mainGrid->nncData()->makeStaticConnectionScalarResult( RiaDefines::formationBinaryAllanResultName() ); // Associate them with eclipse result address - mainGrid->nncData()->setEclResultAddress( RiaDefines::formationAllenResultName(), fnAllenResultResAddr ); - mainGrid->nncData()->setEclResultAddress( RiaDefines::formationBinaryAllenResultName(), fnBinAllenResAddr ); + mainGrid->nncData()->setEclResultAddress( RiaDefines::formationAllanResultName(), fnAllanResultResAddr ); + mainGrid->nncData()->setEclResultAddress( RiaDefines::formationBinaryAllanResultName(), fnBinAllanResAddr ); const std::vector& fnData = cellResultsData->cellScalarResults( fnNamesResAddr, 0 ); - // Add a result entry for the special allen grid data (used only for the grid cells without nnc coverage) + // Add a result entry for the special Allan grid data (used only for the grid cells without nnc coverage) - cellResultsData->addStaticScalarResult( RiaDefines::ALLEN_DIAGRAMS, - RiaDefines::formationAllenResultName(), + cellResultsData->addStaticScalarResult( RiaDefines::ALLAN_DIAGRAMS, + RiaDefines::formationAllanResultName(), false, fnData.size() ); - cellResultsData->addStaticScalarResult( RiaDefines::ALLEN_DIAGRAMS, - RiaDefines::formationBinaryAllenResultName(), + cellResultsData->addStaticScalarResult( RiaDefines::ALLAN_DIAGRAMS, + RiaDefines::formationBinaryAllanResultName(), false, fnData.size() ); - std::vector* alData = cellResultsData->modifiableCellScalarResult( fnAllenResultResAddr, 0 ); - std::vector* binAlData = cellResultsData->modifiableCellScalarResult( fnBinAllenResAddr, 0 ); + std::vector* alData = cellResultsData->modifiableCellScalarResult( fnAllanResultResAddr, 0 ); + std::vector* binAlData = cellResultsData->modifiableCellScalarResult( fnBinAllanResAddr, 0 ); ( *alData ) = fnData; @@ -3097,18 +3097,18 @@ void RigCaseCellResultsData::computeAllenResults( RigCaseCellResultsData* cellRe formationCombinationToCategory[formationCombination] = category; } - fnBinAllenNncResults[i] = 1.0; + fnBinAllanNncResults[i] = 1.0; } else { category = formation1; - fnBinAllenNncResults[i] = 0.0; + fnBinAllanNncResults[i] = 0.0; } - fnAllenNncResults[i] = category; + fnAllanNncResults[i] = category; } - cellResultsData->allenDiagramData()->setFormationCombinationToCategorymap( formationCombinationToCategory ); + cellResultsData->allanDiagramData()->setFormationCombinationToCategorymap( formationCombinationToCategory ); } else { @@ -3132,9 +3132,9 @@ void RigCaseCellResultsData::computeAllenResults( RigCaseCellResultsData* cellRe binaryValue = 1.0; } - fnAllenNncResults[i] = k1; - allAllenFormationResults[i] = k1; - fnBinAllenNncResults[i] = binaryValue; + fnAllanNncResults[i] = k1; + allAllanFormationResults[i] = k1; + fnBinAllanNncResults[i] = binaryValue; } #endif } diff --git a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h index d1dc69b6fa..a8f2e023b3 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h +++ b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h @@ -40,7 +40,7 @@ class RigStatisticsDataCache; class RigEclipseTimeStepInfo; class RigEclipseCaseData; class RigFormationNames; -class RigAllenDiagramData; +class RigAllanDiagramData; class RimEclipseCase; @@ -59,7 +59,7 @@ public: void setHdf5Filename( const QString& hdf5SourSimFilename ); void setActiveFormationNames( RigFormationNames* activeFormationNames ); const RigFormationNames* activeFormationNames() const; - RigAllenDiagramData* allenDiagramData(); + RigAllanDiagramData* allanDiagramData(); void setMainGrid( RigMainGrid* ownerGrid ); void setActiveCellInfo( RigActiveCellInfo* activeCellInfo ); @@ -190,12 +190,12 @@ private: RigStatisticsDataCache* statistics( const RigEclipseResultAddress& resVarAddr ); - static void computeAllenResults( RigCaseCellResultsData* cellResultsData, RigMainGrid* mainGrid ); + static void computeAllanResults( RigCaseCellResultsData* cellResultsData, RigMainGrid* mainGrid ); private: cvf::ref m_readerInterface; cvf::cref m_activeFormationNamesData; - cvf::ref m_allenDiagramData; + cvf::ref m_allanDiagramData; std::vector>> m_cellScalarResults; ///< Scalar results on the complete reservoir for ///< each Result index (ResultVariable) and timestep diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseAllenFaultsStatCalc.cpp b/ApplicationCode/ReservoirDataModel/RigEclipseAllanFaultsStatCalc.cpp similarity index 87% rename from ApplicationCode/ReservoirDataModel/RigEclipseAllenFaultsStatCalc.cpp rename to ApplicationCode/ReservoirDataModel/RigEclipseAllanFaultsStatCalc.cpp index daea254a19..8bf619e8b4 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseAllenFaultsStatCalc.cpp +++ b/ApplicationCode/ReservoirDataModel/RigEclipseAllanFaultsStatCalc.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RigEclipseAllenFaultsStatCalc.h" +#include "RigEclipseAllanFaultsStatCalc.h" #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" @@ -30,7 +30,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigEclipseAllenFaultsStatCalc::RigEclipseAllenFaultsStatCalc( RigNNCData* cellResultsData, +RigEclipseAllanFaultsStatCalc::RigEclipseAllanFaultsStatCalc( RigNNCData* cellResultsData, const RigEclipseResultAddress& scalarResultIndex ) : m_caseData( cellResultsData ) , m_resultAddress( scalarResultIndex ) @@ -40,7 +40,7 @@ RigEclipseAllenFaultsStatCalc::RigEclipseAllenFaultsStatCalc( RigNNCData* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigEclipseAllenFaultsStatCalc::minMaxCellScalarValues( size_t timeStepIndex, double& min, double& max ) +void RigEclipseAllanFaultsStatCalc::minMaxCellScalarValues( size_t timeStepIndex, double& min, double& max ) { MinMaxAccumulator acc( min, max ); traverseCells( acc, timeStepIndex ); @@ -51,7 +51,7 @@ void RigEclipseAllenFaultsStatCalc::minMaxCellScalarValues( size_t timeStepIndex //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigEclipseAllenFaultsStatCalc::posNegClosestToZero( size_t timeStepIndex, double& pos, double& neg ) +void RigEclipseAllanFaultsStatCalc::posNegClosestToZero( size_t timeStepIndex, double& pos, double& neg ) { PosNegAccumulator acc( pos, neg ); traverseCells( acc, timeStepIndex ); @@ -62,7 +62,7 @@ void RigEclipseAllenFaultsStatCalc::posNegClosestToZero( size_t timeStepIndex, d //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigEclipseAllenFaultsStatCalc::valueSumAndSampleCount( size_t timeStepIndex, double& valueSum, size_t& sampleCount ) +void RigEclipseAllanFaultsStatCalc::valueSumAndSampleCount( size_t timeStepIndex, double& valueSum, size_t& sampleCount ) { SumCountAccumulator acc( valueSum, sampleCount ); traverseCells( acc, timeStepIndex ); @@ -73,7 +73,7 @@ void RigEclipseAllenFaultsStatCalc::valueSumAndSampleCount( size_t timeStepIndex //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigEclipseAllenFaultsStatCalc::addDataToHistogramCalculator( size_t timeStepIndex, +void RigEclipseAllanFaultsStatCalc::addDataToHistogramCalculator( size_t timeStepIndex, RigHistogramCalculator& histogramCalculator ) { traverseCells( histogramCalculator, timeStepIndex ); @@ -82,7 +82,7 @@ void RigEclipseAllenFaultsStatCalc::addDataToHistogramCalculator( size_t //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigEclipseAllenFaultsStatCalc::uniqueValues( size_t timeStepIndex, std::set& values ) +void RigEclipseAllanFaultsStatCalc::uniqueValues( size_t timeStepIndex, std::set& values ) { UniqueValueAccumulator acc; traverseCells( acc, timeStepIndex ); @@ -92,7 +92,7 @@ void RigEclipseAllenFaultsStatCalc::uniqueValues( size_t timeStepIndex, std::set //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RigEclipseAllenFaultsStatCalc::timeStepCount() +size_t RigEclipseAllanFaultsStatCalc::timeStepCount() { return (size_t)1; } @@ -100,6 +100,6 @@ size_t RigEclipseAllenFaultsStatCalc::timeStepCount() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigEclipseAllenFaultsStatCalc::mobileVolumeWeightedMean( size_t timeStepIndex, double& result ) +void RigEclipseAllanFaultsStatCalc::mobileVolumeWeightedMean( size_t timeStepIndex, double& result ) { } diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseAllenFaultsStatCalc.h b/ApplicationCode/ReservoirDataModel/RigEclipseAllanFaultsStatCalc.h similarity index 94% rename from ApplicationCode/ReservoirDataModel/RigEclipseAllenFaultsStatCalc.h rename to ApplicationCode/ReservoirDataModel/RigEclipseAllanFaultsStatCalc.h index 8f5f394c22..8796dcc781 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseAllenFaultsStatCalc.h +++ b/ApplicationCode/ReservoirDataModel/RigEclipseAllanFaultsStatCalc.h @@ -30,10 +30,10 @@ #include "cvfArray.h" -class RigEclipseAllenFaultsStatCalc : public RigStatisticsCalculator +class RigEclipseAllanFaultsStatCalc : public RigStatisticsCalculator { public: - RigEclipseAllenFaultsStatCalc( RigNNCData* cellResultsData, const RigEclipseResultAddress& scalarResultIndex ); + RigEclipseAllanFaultsStatCalc( RigNNCData* cellResultsData, const RigEclipseResultAddress& scalarResultIndex ); void minMaxCellScalarValues( size_t timeStepIndex, double& min, double& max ) override; void posNegClosestToZero( size_t timeStepIndex, double& pos, double& neg ) override; diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp b/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp index c2dcae36ed..f4de0e09c2 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp @@ -728,9 +728,9 @@ const std::vector RigEclipseCaseData::formationNames() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigAllenDiagramData* RigEclipseCaseData::allenDiagramData() +RigAllanDiagramData* RigEclipseCaseData::allanDiagramData() { - return m_matrixModelResults->allenDiagramData(); + return m_matrixModelResults->allanDiagramData(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h b/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h index 77e5a9d479..ebd928a82b 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h +++ b/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h @@ -47,7 +47,7 @@ class RigWellPath; class RimEclipseCase; class RigVirtualPerforationTransmissibilities; class RigEquil; -class RigAllenDiagramData; +class RigAllanDiagramData; struct RigWellResultPoint; @@ -89,7 +89,7 @@ public: void setActiveFormationNames( RigFormationNames* activeFormationNames ); const RigFormationNames* activeFormationNames() const; const std::vector formationNames() const; - RigAllenDiagramData* allenDiagramData(); + RigAllanDiagramData* allanDiagramData(); void setSimWellData( const cvf::Collection& data ); const cvf::Collection& wellResults() const { return m_simWellData; } diff --git a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp index 44e5bfe624..0f345f1a35 100644 --- a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp +++ b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp @@ -40,7 +40,7 @@ #include "RivExtrudedCurveIntersectionPartMgr.h" -#include "RigAllenDiagramData.h" +#include "RigAllanDiagramData.h" #include "RimIntersectionResultDefinition.h" #include "cafDisplayCoordTransform.h" @@ -323,7 +323,7 @@ QString RiuResultTextBuilder::faultResultDetails() if ( m_viewWithFaultsSettings && m_viewWithFaultsSettings->faultResultSettings()->hasValidCustomResult() ) { if ( m_viewWithFaultsSettings->faultResultSettings()->customFaultResult()->resultType() != - RiaDefines::ALLEN_DIAGRAMS ) + RiaDefines::ALLAN_DIAGRAMS ) { text += "Fault result data:\n"; this->appendTextFromResultColors( eclipseCaseData, @@ -478,16 +478,16 @@ QString RiuResultTextBuilder::nncResultText() text = QString( "%1 : %2" ).arg( resultVar ).arg( scalarValue ); } - if ( resultType == RiaDefines::ALLEN_DIAGRAMS ) + if ( resultType == RiaDefines::ALLAN_DIAGRAMS ) { nncValues = nncData->staticConnectionScalarResult( eclipseResultAddress ); QString resultValueText; if ( m_viewWithFaultsSettings->currentFaultResultColors()->resultVariable() == - RiaDefines::formationAllenResultName() ) + RiaDefines::formationAllanResultName() ) { std::pair fmIndexPair = - eclipseCase->allenDiagramData()->formationIndexCombinationFromCategory( + eclipseCase->allanDiagramData()->formationIndexCombinationFromCategory( ( *nncValues )[m_nncIndex] ); std::vector fmNames = eclipseCase->formationNames(); @@ -503,7 +503,7 @@ QString RiuResultTextBuilder::nncResultText() // clang-format on } else if ( m_viewWithFaultsSettings->currentFaultResultColors()->resultVariable() == - RiaDefines::formationBinaryAllenResultName() ) + RiaDefines::formationBinaryAllanResultName() ) { resultValueText = ( *nncValues )[m_nncIndex] == 0 ? "Same formation" : "Different formation"; }