OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#7559 Improve name of "Number of Layers" choice.

Browse Source
This commit is contained in:
Kristian Bendiksen
2021-04-23 11:47:13 +02:00
parent e7867d643b
commit 540b74e899
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatistics.cpp
View File

@@ -81,13 +81,13 @@ void caf::AppEnum<RimEnsembleFractureStatistics::MeanType>::setUp()
} }
template <> template <>
void caf::AppEnum<RimEnsembleFractureStatistics::AdaptiveSamplingSizeType>::setUp() void caf::AppEnum<RimEnsembleFractureStatistics::AdaptiveNumLayersType>::setUp()
{ {
addItem( RimEnsembleFractureStatistics::AdaptiveSamplingSizeType::AVERAGE, "AVERAGE", "Average" ); addItem( RimEnsembleFractureStatistics::AdaptiveNumLayersType::AVERAGE, "AVERAGE", "Average" );
addItem( RimEnsembleFractureStatistics::AdaptiveSamplingSizeType::MINIMUM, "MINIMUM", "Minimum" ); addItem( RimEnsembleFractureStatistics::AdaptiveNumLayersType::MINIMUM, "MINIMUM", "Minimum" );
addItem( RimEnsembleFractureStatistics::AdaptiveSamplingSizeType::MAXIMUM, "MAXIMUM", "Maximum" ); addItem( RimEnsembleFractureStatistics::AdaptiveNumLayersType::MAXIMUM, "MAXIMUM", "Maximum" );
addItem( RimEnsembleFractureStatistics::AdaptiveSamplingSizeType::USER_DEFINED, "USER_DEFINED", "User-Defined" ); addItem( RimEnsembleFractureStatistics::AdaptiveNumLayersType::USER_DEFINED, "USER_DEFINED", "User-Defined" );
setDefault( RimEnsembleFractureStatistics::AdaptiveSamplingSizeType::AVERAGE ); setDefault( RimEnsembleFractureStatistics::AdaptiveNumLayersType::AVERAGE );
} }
} // namespace caf } // namespace caf
@@ -117,8 +117,8 @@ RimEnsembleFractureStatistics::RimEnsembleFractureStatistics()
// Adaptive sampling // Adaptive sampling
CAF_PDM_InitFieldNoDefault( &m_adaptiveMeanType, "AdaptiveMeanType", "Mean Type", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_adaptiveMeanType, "AdaptiveMeanType", "Mean Type", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_adaptiveSamplingSizeType, "AdaptiveSamplingSizeType", "Sampling Type", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_adaptiveNumLayersType, "AdaptiveNumLayersType", "Number of Layers", "", "", "" );
CAF_PDM_InitField( &m_adaptiveNumSamplesY, "AdaptiveNumSamplesY", 30, "Number of Samples Y", "", "", "" ); CAF_PDM_InitField( &m_adaptiveNumLayers, "AdaptiveNumLayers", 30, "Number of Layers Y", "", "", "" );
std::vector<caf::AppEnum<RimEnsembleFractureStatistics::StatisticsType>> defaultStatisticsTypes = { std::vector<caf::AppEnum<RimEnsembleFractureStatistics::StatisticsType>> defaultStatisticsTypes = {
caf::AppEnum<RimEnsembleFractureStatistics::StatisticsType>( RimEnsembleFractureStatistics::StatisticsType::MEAN ) }; caf::AppEnum<RimEnsembleFractureStatistics::StatisticsType>( RimEnsembleFractureStatistics::StatisticsType::MEAN ) };
@@ -245,15 +245,15 @@ void RimEnsembleFractureStatistics::defineUiOrdering( QString uiConfigName, caf:
m_numSamplesY.uiCapability()->setUiHidden( !isUniformMesh ); m_numSamplesY.uiCapability()->setUiHidden( !isUniformMesh );
uiOrdering.add( &m_adaptiveMeanType ); uiOrdering.add( &m_adaptiveMeanType );
uiOrdering.add( &m_adaptiveSamplingSizeType ); uiOrdering.add( &m_adaptiveNumLayersType );
uiOrdering.add( &m_adaptiveNumSamplesY ); uiOrdering.add( &m_adaptiveNumLayers );
bool isAdaptiveMesh = m_meshType() == MeshType::ADAPTIVE; bool isAdaptiveMesh = m_meshType() == MeshType::ADAPTIVE;
m_adaptiveMeanType.uiCapability()->setUiHidden( !isAdaptiveMesh ); m_adaptiveMeanType.uiCapability()->setUiHidden( !isAdaptiveMesh );
m_adaptiveSamplingSizeType.uiCapability()->setUiHidden( !isAdaptiveMesh ); m_adaptiveNumLayersType.uiCapability()->setUiHidden( !isAdaptiveMesh );
bool adaptiveSamplesUserDefined = m_adaptiveSamplingSizeType() == AdaptiveSamplingSizeType::USER_DEFINED; bool adaptiveSamplesUserDefined = m_adaptiveNumLayersType() == AdaptiveNumLayersType::USER_DEFINED;
m_adaptiveNumSamplesY.uiCapability()->setUiHidden( !isAdaptiveMesh || !adaptiveSamplesUserDefined ); m_adaptiveNumLayers.uiCapability()->setUiHidden( !isAdaptiveMesh || !adaptiveSamplesUserDefined );
uiOrdering.add( &m_selectedStatisticsType ); uiOrdering.add( &m_selectedStatisticsType );
uiOrdering.add( &m_computeStatistics ); uiOrdering.add( &m_computeStatistics );
@@ -775,7 +775,7 @@ void RimEnsembleFractureStatistics::generateAllLayers(
int RimEnsembleFractureStatistics::getTargetNumberOfLayers( int RimEnsembleFractureStatistics::getTargetNumberOfLayers(
const std::vector<cvf::ref<RigStimPlanFractureDefinition>>& stimPlanFractureDefinitions ) const const std::vector<cvf::ref<RigStimPlanFractureDefinition>>& stimPlanFractureDefinitions ) const
{ {
if ( m_adaptiveSamplingSizeType() == AdaptiveSamplingSizeType::USER_DEFINED ) return m_adaptiveNumSamplesY(); if ( m_adaptiveNumLayersType() == AdaptiveNumLayersType::USER_DEFINED ) return m_adaptiveNumLayers();
int maxNy = 0; int maxNy = 0;
int minNy = std::numeric_limits<int>::max(); int minNy = std::numeric_limits<int>::max();
@@ -788,13 +788,13 @@ int RimEnsembleFractureStatistics::getTargetNumberOfLayers(
sum += ny; sum += ny;
} }
if ( m_adaptiveSamplingSizeType() == AdaptiveSamplingSizeType::MAXIMUM ) if ( m_adaptiveNumLayersType() == AdaptiveNumLayersType::MAXIMUM )
return maxNy; return maxNy;
else if ( m_adaptiveSamplingSizeType() == AdaptiveSamplingSizeType::MINIMUM ) else if ( m_adaptiveNumLayersType() == AdaptiveNumLayersType::MINIMUM )
return minNy; return minNy;
else else
{ {
CAF_ASSERT( m_adaptiveSamplingSizeType() == AdaptiveSamplingSizeType::AVERAGE ); CAF_ASSERT( m_adaptiveNumLayersType() == AdaptiveNumLayersType::AVERAGE );
return static_cast<int>( std::ceil( static_cast<double>( sum ) / stimPlanFractureDefinitions.size() ) ); return static_cast<int>( std::ceil( static_cast<double>( sum ) / stimPlanFractureDefinitions.size() ) );
} }
} }

6
ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatistics.h
View File

@@ -77,7 +77,7 @@ public:
MINIMUM MINIMUM
}; };
enum class AdaptiveSamplingSizeType enum class AdaptiveNumLayersType
{ {
MINIMUM, MINIMUM,
MAXIMUM, MAXIMUM,
@@ -185,8 +185,8 @@ protected:
caf::PdmField<caf::AppEnum<MeshType>> m_meshType; caf::PdmField<caf::AppEnum<MeshType>> m_meshType;
caf::PdmField<caf::AppEnum<MeanType>> m_adaptiveMeanType; caf::PdmField<caf::AppEnum<MeanType>> m_adaptiveMeanType;
caf::PdmField<caf::AppEnum<AdaptiveSamplingSizeType>> m_adaptiveSamplingSizeType; caf::PdmField<caf::AppEnum<AdaptiveNumLayersType>> m_adaptiveNumLayersType;
caf::PdmField<int> m_adaptiveNumSamplesY; caf::PdmField<int> m_adaptiveNumLayers;
caf::PdmField<std::vector<caf::AppEnum<RimEnsembleFractureStatistics::StatisticsType>>> m_selectedStatisticsType; caf::PdmField<std::vector<caf::AppEnum<RimEnsembleFractureStatistics::StatisticsType>>> m_selectedStatisticsType;
}; };