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

#7986 Ensemble Fracture Statistics: block negative number of cells. (#7991)

Browse Source
This commit is contained in:
Kristian Bendiksen 2021-09-13 08:42:04 +02:00 committed by GitHub
parent 117d201703
commit dab22c4716
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,7 @@
#include "FractureCommands/RicNewStimPlanFractureTemplateFeature.h" #include "FractureCommands/RicNewStimPlanFractureTemplateFeature.h"
#include "cafAppEnum.h" #include "cafAppEnum.h"
#include "cafPdmUiLineEditor.h"
#include "cafPdmUiTextEditor.h" #include "cafPdmUiTextEditor.h"
#include "cafPdmUiToolButtonEditor.h" #include "cafPdmUiToolButtonEditor.h"
#include "cafPdmUiTreeSelectionEditor.h" #include "cafPdmUiTreeSelectionEditor.h"
@ -53,6 +54,7 @@
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
#include <QIntValidator>
namespace caf namespace caf
{ {
@ -244,6 +246,16 @@ void RimEnsembleFractureStatistics::defineEditorAttribute( const caf::PdmFieldHa
myAttr->textMode = caf::PdmUiTextEditorAttribute::HTML; myAttr->textMode = caf::PdmUiTextEditorAttribute::HTML;
} }
} }
else if ( field == &m_adaptiveNumLayers || field == &m_numSamplesX || field == &m_numSamplesY )
{
caf::PdmUiLineEditorAttribute* lineEditorAttr = dynamic_cast<caf::PdmUiLineEditorAttribute*>( attribute );
if ( lineEditorAttr )
{
// Positive integer
QIntValidator* validator = new QIntValidator( 1, std::numeric_limits<int>::max(), nullptr );
lineEditorAttr->validator = validator;
}
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -601,6 +613,9 @@ void RimEnsembleFractureStatistics::generateUniformMesh( double mi
std::vector<double>& gridXs, std::vector<double>& gridXs,
std::vector<double>& gridYs ) const std::vector<double>& gridYs ) const
{ {
CAF_ASSERT( m_numSamplesX > 0 );
CAF_ASSERT( m_numSamplesY > 0 );
int numSamplesX = m_numSamplesX(); int numSamplesX = m_numSamplesX();
double sampleDistanceX = linearSampling( minX, maxX, numSamplesX, gridXs ); double sampleDistanceX = linearSampling( minX, maxX, numSamplesX, gridXs );
@ -862,7 +877,11 @@ 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_adaptiveNumLayersType() == AdaptiveNumLayersType::USER_DEFINED ) return m_adaptiveNumLayers(); if ( m_adaptiveNumLayersType() == AdaptiveNumLayersType::USER_DEFINED )
{
CAF_ASSERT( m_adaptiveNumLayers() > 0 );
return m_adaptiveNumLayers();
}
int maxNy = 0; int maxNy = 0;
int minNy = std::numeric_limits<int>::max(); int minNy = std::numeric_limits<int>::max();
@ -894,6 +913,7 @@ double RimEnsembleFractureStatistics::linearSampling( double minVa
int numSamples, int numSamples,
std::vector<double>& samples ) std::vector<double>& samples )
{ {
CAF_ASSERT( numSamples > 0 );
double sampleDistance = ( maxValue - minValue ) / numSamples; double sampleDistance = ( maxValue - minValue ) / numSamples;
for ( int s = 0; s < numSamples; s++ ) for ( int s = 0; s < numSamples; s++ )