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

#5101 clang-format: Adjusted penalties

Browse Source 
Use lower absolute values to improve control of behavior
This commit is contained in:
Magne Sjaastad
2020-02-12 11:43:15 +01:00
parent 10f0abc9b5
commit c82df63e10
710 changed files with 3167 additions and 4721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp
View File

@@ -220,8 +220,8 @@ void Rim3dWellLogCurveCollection::defineEditorAttribute( const caf::PdmFieldHand
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute )
{
caf::PdmUiDoubleSliderEditorAttribute* widthAttribute = dynamic_cast<caf::PdmUiDoubleSliderEditorAttribute*>(
attribute );
caf::PdmUiDoubleSliderEditorAttribute* widthAttribute =
dynamic_cast<caf::PdmUiDoubleSliderEditorAttribute*>( attribute );
if ( widthAttribute )
{
widthAttribute->m_minimum = 0.25;

4
ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.h
View File

@@ -57,9 +57,7 @@ public:
double* valueAtPoint );
private:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
caf::PdmFieldHandle* objectToggleField() override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field,

3
ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.cpp
View File

@@ -81,8 +81,7 @@ void RimCompletionCellIntersectionCalc::calculateCompletionTypeResult( RimEclips
{
auto intersectedCells =
RigWellPathIntersectionTools::findIntersectedGlobalCellIndices( eclipseCaseData,
wellPath->wellPathGeometry()
->m_wellPathPoints );
wellPath->wellPathGeometry()->m_wellPathPoints );
for ( auto& intersection : intersectedCells )
{

6
ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp
View File

@@ -244,8 +244,7 @@ WellFractureIntersectionData
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo>
RimEllipseFractureTemplate::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly )
RimEllipseFractureTemplate::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly )
{
QList<caf::PdmOptionItemInfo> options;
@@ -386,8 +385,7 @@ void RimEllipseFractureTemplate::onLoadDataAndUpdateGeometryHasChanged()
this->firstAncestorOrThisOfType( eclipseCase );
if ( eclipseCase )
{
RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews(
eclipseCase );
RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews( eclipseCase );
}
else
{

4
ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h
View File

@@ -69,9 +69,7 @@ public:
private:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;

4
ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.h
View File

@@ -49,9 +49,7 @@ public:
~RimFishboneWellPath() override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void setCoordinates( std::vector<cvf::Vec3d> coordinates );
void setMeasuredDepths( std::vector<double> measuredDepths );

4
ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.h
View File

@@ -44,9 +44,7 @@ public:
void importCompletionsFromFile( const QStringList& filePaths );
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
std::vector<const RimFishboneWellPath*> wellPaths() const;
double holeDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const

3
ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp
View File

@@ -291,8 +291,7 @@ double RimFishbonesCollection::mainBoreDiameter( RiaEclipseUnitTools::UnitSystem
{
return RiaEclipseUnitTools::feetToMeter( m_mainBoreDiameter() );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC &&
unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC && unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
{
return RiaEclipseUnitTools::meterToFeet( m_mainBoreDiameter() );
}

4
ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.h
View File

@@ -58,9 +58,7 @@ public:
void setUnitSystemSpecificDefaults();
protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void initAfterRead() override;

15
ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp
View File

@@ -299,8 +299,7 @@ double RimFishbonesMultipleSubs::openHoleRoughnessFactor( RiaEclipseUnitTools::U
{
return RiaEclipseUnitTools::feetToMeter( m_lateralOpenHoleRoghnessFactor() );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC &&
unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC && unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
{
return RiaEclipseUnitTools::meterToFeet( m_lateralOpenHoleRoghnessFactor() );
}
@@ -382,8 +381,8 @@ void RimFishbonesMultipleSubs::geometryUpdated()
//--------------------------------------------------------------------------------------------------
std::vector<cvf::Vec3d> RimFishbonesMultipleSubs::coordsForLateral( size_t subIndex, size_t lateralIndex ) const
{
std::vector<std::pair<cvf::Vec3d, double>> coordsAndMD = m_rigFishbonesGeometry->coordsForLateral( subIndex,
lateralIndex );
std::vector<std::pair<cvf::Vec3d, double>> coordsAndMD =
m_rigFishbonesGeometry->coordsForLateral( subIndex, lateralIndex );
std::vector<cvf::Vec3d> domainCoords;
for ( const auto& coordMD : coordsAndMD )
@@ -756,13 +755,7 @@ void RimFishbonesMultipleSubs::initialiseObsoleteFields()
"" );
m_subsLocationMode_OBSOLETE.xmlCapability()->setIOWritable( false );
CAF_PDM_InitField( &m_rangeStart_OBSOLETE,
"RangeStart",
std::numeric_limits<double>::infinity(),
"Start MD [m]",
"",
"",
"" );
CAF_PDM_InitField( &m_rangeStart_OBSOLETE, "RangeStart", std::numeric_limits<double>::infinity(), "Start MD [m]", "", "", "" );
m_rangeStart_OBSOLETE.xmlCapability()->setIOWritable( false );
CAF_PDM_InitField( &m_rangeEnd_OBSOLETE, "RangeEnd", std::numeric_limits<double>::infinity(), "End MD [m]", "", "", "" );

4
ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.h
View File

@@ -125,9 +125,7 @@ public:
caf::PdmField<cvf::Color3f> fishbonesColor;
protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;

11
ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp
View File

@@ -206,9 +206,7 @@ std::vector<size_t> RimFracture::getPotentiallyFracturedCells( const RigMainGrid
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFracture::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
void RimFracture::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
{
if ( changedField == &m_fractureTemplate )
{
@@ -584,8 +582,8 @@ QList<caf::PdmOptionItemInfo> RimFracture::calculateValueOptions( const caf::Pdm
RimFractureTemplate* fracTemplate = fractureTemplate();
if ( dynamic_cast<RimStimPlanFractureTemplate*>( fracTemplate ) )
{
RimStimPlanFractureTemplate* fracTemplateStimPlan = dynamic_cast<RimStimPlanFractureTemplate*>(
fracTemplate );
RimStimPlanFractureTemplate* fracTemplateStimPlan =
dynamic_cast<RimStimPlanFractureTemplate*>( fracTemplate );
std::vector<double> timeValues = fracTemplateStimPlan->timeSteps();
int index = 0;
for ( double value : timeValues )
@@ -630,8 +628,7 @@ void RimFracture::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& ui
{
m_uiWellPathAzimuth.uiCapability()->setUiHidden( false );
m_uiWellFractureAzimuthDiff.uiCapability()->setUiHidden( false );
if ( wellFractureAzimuthDiff() < 10 ||
( wellFractureAzimuthDiff() > 170 && wellFractureAzimuthDiff() < 190 ) ||
if ( wellFractureAzimuthDiff() < 10 || ( wellFractureAzimuthDiff() > 170 && wellFractureAzimuthDiff() < 190 ) ||
wellFractureAzimuthDiff() > 350 )
{
m_wellFractureAzimuthAngleWarning.uiCapability()->setUiHidden( false );

4
ApplicationCode/ProjectDataModel/Completions/RimFracture.h
View File

@@ -105,9 +105,7 @@ public:
std::vector<size_t> getPotentiallyFracturedCells( const RigMainGrid* mainGrid ) const;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
cvf::Vec3d fracturePosition() const;
virtual void updateAzimuthBasedOnWellAzimuthAngle() = 0;

8
ApplicationCode/ProjectDataModel/Completions/RimFractureContainment.cpp
View File

@@ -34,13 +34,7 @@ RimFractureContainment::RimFractureContainment()
CAF_PDM_InitField( &m_useContainment, "IsUsingFractureContainment", false, "Use Containment", "", "", "" );
CAF_PDM_InitField( &m_topKLayer, "TopKLayer", 0, " Top Layer", "", "Do not allow fracture to grow into this layer", "" );
CAF_PDM_InitField( &m_baseKLayer,
"BaseKLayer",
0,
" Base Layer",
"",
"Do not allow fracture to grow into this layer",
"" );
CAF_PDM_InitField( &m_baseKLayer, "BaseKLayer", 0, " Base Layer", "", "Do not allow fracture to grow into this layer", "" );
CAF_PDM_InitField( &m_truncateAtFaults,
"TruncateAtFaults",

4
ApplicationCode/ProjectDataModel/Completions/RimFractureContainment.h
View File

@@ -48,9 +48,7 @@ public:
private:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
private:
caf::PdmField<bool> m_useContainment;

9
ApplicationCode/ProjectDataModel/Completions/RimFractureContainmentTools.cpp
View File

@@ -46,8 +46,8 @@ size_t findNeighborReservoirCellIndex( const RigMainGrid* mainGr
if ( mainGrid )
{
size_t gridLocalCellIndex = cvf::UNDEFINED_SIZE_T;
const RigGridBase* hostGrid = mainGrid->gridAndGridLocalIdxFromGlobalCellIdx( globalReservoirCellIndex,
&gridLocalCellIndex );
const RigGridBase* hostGrid =
mainGrid->gridAndGridLocalIdxFromGlobalCellIdx( globalReservoirCellIndex, &gridLocalCellIndex );
if ( hostGrid && gridLocalCellIndex != cvf::UNDEFINED_SIZE_T )
{
@@ -136,9 +136,8 @@ void RimFractureContainmentTools::checkFaultAndAppendNeighborCell( const std::se
// Eclipse 300 supports faults in LGR
// https://github.com/OPM/ResInsight/issues/3019
size_t neighborGlobalReservoirCellIndex = findNeighborReservoirCellIndex( mainGrid,
face,
globalReservoirCellIndex );
size_t neighborGlobalReservoirCellIndex =
findNeighborReservoirCellIndex( mainGrid, face, globalReservoirCellIndex );
if ( neighborGlobalReservoirCellIndex == cvf::UNDEFINED_SIZE_T )
{
// This is probably an assert condition, but we return directly to ensure we are robust

3
ApplicationCode/ProjectDataModel/Completions/RimFractureExportSettings.cpp
View File

@@ -42,8 +42,7 @@ RimFractureExportSettings::RimFractureExportSettings()
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo>
RimFractureExportSettings::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly )
RimFractureExportSettings::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly )
{
QList<caf::PdmOptionItemInfo> options;

8
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
View File

@@ -280,8 +280,7 @@ void RimFractureTemplate::fieldChangedByUi( const caf::PdmFieldHandle* changedFi
}
}
if ( changedField == &m_perforationLength || changedField == &m_perforationEfficiency ||
changedField == &m_wellDiameter )
if ( changedField == &m_perforationLength || changedField == &m_perforationEfficiency || changedField == &m_wellDiameter )
{
for ( RimFracture* fracture : fracturesUsingThisTemplate() )
{
@@ -762,10 +761,7 @@ void RimFractureTemplate::setId( int id )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFractureTemplate::setScaleFactors( double halfLengthScale,
double heightScale,
double dFactorScale,
double conductivityScale )
void RimFractureTemplate::setScaleFactors( double halfLengthScale, double heightScale, double dFactorScale, double conductivityScale )
{
m_halfLengthScaleFactor = halfLengthScale;
m_heightScaleFactor = heightScale;

4
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h
View File

@@ -177,9 +177,7 @@ public:
protected:
caf::PdmFieldHandle* userDescriptionField() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,

12
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp
View File

@@ -237,8 +237,8 @@ void RimFractureTemplateCollection::createAndAssignTemplateCopyForNonMatchingUni
{
if ( !templateWithMatchingUnit )
{
templateWithMatchingUnit = dynamic_cast<RimFractureTemplate*>(
fractureTemplate->xmlCapability()->copyByXmlSerialization(
templateWithMatchingUnit =
dynamic_cast<RimFractureTemplate*>( fractureTemplate->xmlCapability()->copyByXmlSerialization(
caf::PdmDefaultObjectFactory::instance() ) );
auto currentUnit = fractureTemplate->fractureTemplateUnit();
@@ -338,8 +338,8 @@ void RimFractureTemplateCollection::initAfterRead()
for ( RimWellPathFracture* fracture : wellPathFractures )
{
RimStimPlanFractureTemplate* stimPlanFractureTemplate = dynamic_cast<RimStimPlanFractureTemplate*>(
fracture->fractureTemplate() );
RimStimPlanFractureTemplate* stimPlanFractureTemplate =
dynamic_cast<RimStimPlanFractureTemplate*>( fracture->fractureTemplate() );
if ( stimPlanFractureTemplate )
{
if ( stimPlanFractureTemplate->showStimPlanMesh() == false )
@@ -387,8 +387,8 @@ void RimFractureTemplateCollection::initAfterRead()
for ( RimFracture* fracture : fractures )
{
RimStimPlanFractureTemplate* stimPlanFractureTemplate = dynamic_cast<RimStimPlanFractureTemplate*>(
fracture->fractureTemplate() );
RimStimPlanFractureTemplate* stimPlanFractureTemplate =
dynamic_cast<RimStimPlanFractureTemplate*>( fracture->fractureTemplate() );
if ( stimPlanFractureTemplate )
{
stimPlanFractureTemplatesInView[stimPlanFractureTemplate];

4
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h
View File

@@ -70,6 +70,6 @@ private:
caf::PdmChildArrayField<RimFractureTemplate*> m_fractureDefinitions;
caf::PdmField<RiaEclipseUnitTools::UnitSystemType> m_defaultUnitsForFracTemplates;
caf::PdmField<int>
m_nextValidFractureTemplateId; // Unique fracture template ID within a project, used to identify a fracture template
caf::PdmField<int> m_nextValidFractureTemplateId; // Unique fracture template ID within a project, used to identify
// a fracture template
};

10
ApplicationCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp
View File

@@ -38,9 +38,7 @@ void RimMswCompletionParameters::PressureDropEnum::setUp()
{
addItem( RimMswCompletionParameters::HYDROSTATIC, "H--", "Hydrostatic" );
addItem( RimMswCompletionParameters::HYDROSTATIC_FRICTION, "HF-", "Hydrostatic + Friction" );
addItem( RimMswCompletionParameters::HYDROSTATIC_FRICTION_ACCELERATION,
"HFA",
"Hydrostatic + Friction + Acceleration" );
addItem( RimMswCompletionParameters::HYDROSTATIC_FRICTION_ACCELERATION, "HFA", "Hydrostatic + Friction + Acceleration" );
setDefault( RimMswCompletionParameters::HYDROSTATIC_FRICTION );
}
@@ -133,8 +131,7 @@ double RimMswCompletionParameters::linerDiameter( RiaEclipseUnitTools::UnitSyste
{
return RiaEclipseUnitTools::feetToMeter( m_linerDiameter() );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC &&
unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC && unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
{
return RiaEclipseUnitTools::meterToFeet( m_linerDiameter() );
}
@@ -167,8 +164,7 @@ double RimMswCompletionParameters::roughnessFactor( RiaEclipseUnitTools::UnitSys
{
return RiaEclipseUnitTools::feetToMeter( m_roughnessFactor() );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC &&
unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC && unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
{
return RiaEclipseUnitTools::meterToFeet( m_roughnessFactor() );
}

4
ApplicationCode/ProjectDataModel/Completions/RimMswCompletionParameters.h
View File

@@ -74,9 +74,7 @@ public:
void setUnitSystemSpecificDefaults();
protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void initAfterRead() override;

3
ApplicationCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp
View File

@@ -445,8 +445,7 @@ double RimMultipleValveLocations::perforationEndMD() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<double>
RimMultipleValveLocations::locationsFromStartSpacingAndCount( double start, double spacing, size_t count )
std::vector<double> RimMultipleValveLocations::locationsFromStartSpacingAndCount( double start, double spacing, size_t count )
{
std::vector<double> measuredDepths;

4
ApplicationCode/ProjectDataModel/Completions/RimMultipleValveLocations.h
View File

@@ -56,9 +56,7 @@ public:
const std::vector<double>& locationOfValves );
protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
private:

4
ApplicationCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.h
View File

@@ -49,9 +49,7 @@ public:
double porosityScalingFactor() const;
protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
private:

4
ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.h
View File

@@ -59,9 +59,7 @@ public:
private:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
friend class RiuEditPerforationCollectionWidget;

6
ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp
View File

@@ -139,8 +139,7 @@ double RimPerforationInterval::diameter( RiaEclipseUnitTools::UnitSystem unitSys
{
return RiaEclipseUnitTools::feetToMeter( m_diameter() );
}
else if ( unitSystem == RiaEclipseUnitTools::UNITS_FIELD &&
wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
else if ( unitSystem == RiaEclipseUnitTools::UNITS_FIELD && wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
{
return RiaEclipseUnitTools::meterToFeet( m_diameter() );
}
@@ -327,8 +326,7 @@ void RimPerforationInterval::fieldChangedByUi( const caf::PdmFieldHandle* change
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPerforationInterval::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering,
QString uiConfigName /*= ""*/ )
void RimPerforationInterval::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ )
{
this->setName( QString( "%1 - %2" ).arg( m_startMD ).arg( m_endMD ) );
}

4
ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.h
View File

@@ -79,9 +79,7 @@ public:
protected:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,

4
ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.h
View File

@@ -53,9 +53,7 @@ public:
bool isEnabled() const override; // RimWellPathCompletionsInterface override
protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,

21
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
View File

@@ -184,7 +184,8 @@ QString RimStimPlanFractureTemplate::fileName()
void RimStimPlanFractureTemplate::updateFilePathsFromProjectPath( const QString& newProjectPath,
const QString& oldProjectPath )
{
// m_stimPlanFileName = RimTools::relocateFile( m_stimPlanFileName(), newProjectPath, oldProjectPath, nullptr, nullptr );
// m_stimPlanFileName = RimTools::relocateFile( m_stimPlanFileName(), newProjectPath, oldProjectPath, nullptr,
// nullptr );
}
//--------------------------------------------------------------------------------------------------
@@ -305,8 +306,7 @@ void RimStimPlanFractureTemplate::loadDataAndUpdate()
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo>
RimStimPlanFractureTemplate::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly )
RimStimPlanFractureTemplate::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly )
{
QList<caf::PdmOptionItemInfo> options;
@@ -425,9 +425,8 @@ std::vector<double>
size_t timeStepIndex,
RiaEclipseUnitTools::UnitSystem requiredUnitSystem ) const
{
auto resultValues = m_stimPlanFractureDefinitionData->fractureGridResults( resultName,
unitName,
m_activeTimeStepIndex );
auto resultValues =
m_stimPlanFractureDefinitionData->fractureGridResults( resultName, unitName, m_activeTimeStepIndex );
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_METRIC )
{
@@ -590,9 +589,9 @@ WellFractureIntersectionData
if ( widthInRequiredUnit != HUGE_VAL && fabs( widthInRequiredUnit ) > 1e-20 )
{
values.m_width = widthInRequiredUnit;
values.m_permeability = RigTransmissibilityEquations::permeability( conductivity,
widthInRequiredUnit );
values.m_width = widthInRequiredUnit;
values.m_permeability =
RigTransmissibilityEquations::permeability( conductivity, widthInRequiredUnit );
}
}
}
@@ -1091,8 +1090,8 @@ void RimStimPlanFractureTemplate::defineEditorAttribute( const caf::PdmFieldHand
{
if ( !m_stimPlanFractureDefinitionData.isNull() && ( m_stimPlanFractureDefinitionData->yCount() > 0 ) )
{
caf::PdmUiDoubleSliderEditorAttribute* myAttr = dynamic_cast<caf::PdmUiDoubleSliderEditorAttribute*>(
attribute );
caf::PdmUiDoubleSliderEditorAttribute* myAttr =
dynamic_cast<caf::PdmUiDoubleSliderEditorAttribute*>( attribute );
if ( myAttr )
{
myAttr->m_minimum = m_stimPlanFractureDefinitionData->minDepth();

11
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
View File

@@ -73,10 +73,9 @@ public:
std::vector<double> timeSteps();
std::vector<std::pair<QString, QString>> uiResultNamesWithUnit() const override;
std::vector<std::vector<double>>
resultValues( const QString& uiResultName, const QString& unitName, size_t timeStepIndex ) const;
std::vector<double>
fractureGridResults( const QString& resultName, const QString& unitName, size_t timeStepIndex ) const;
bool hasConductivity() const;
resultValues( const QString& uiResultName, const QString& unitName, size_t timeStepIndex ) const;
std::vector<double> 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 );
std::vector<double> widthResultValues() const;
@@ -93,9 +92,7 @@ public:
void convertToUnitSystem( RiaEclipseUnitTools::UnitSystem neededUnit ) override;
private:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;

4
ApplicationCode/ProjectDataModel/Completions/RimValveTemplate.h
View File

@@ -53,9 +53,7 @@ protected:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
private:

5
ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp
View File

@@ -450,9 +450,8 @@ void RimWellPathCompletions::defineEditorAttribute( const caf::PdmFieldHandle* f
else if ( field == &m_fluidInPlaceRegion && lineEditorAttr )
{
// Any integer
QIntValidator* validator = new QIntValidator( -std::numeric_limits<int>::max(),
std::numeric_limits<int>::max(),
nullptr );
QIntValidator* validator =
new QIntValidator( -std::numeric_limits<int>::max(), std::numeric_limits<int>::max(), nullptr );
lineEditorAttr->validator = validator;
}
}

4
ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.h
View File

@@ -100,9 +100,7 @@ public:
protected:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;

4
ApplicationCode/ProjectDataModel/Completions/RimWellPathFracture.h
View File

@@ -42,9 +42,7 @@ public:
double fractureMD() const override;
void setMeasuredDepth( double mdValue );
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void updateAzimuthBasedOnWellAzimuthAngle() override;
double wellAzimuthAtFracturePosition() const override;

4
ApplicationCode/ProjectDataModel/Completions/RimWellPathFractureCollection.h
View File

@@ -52,9 +52,7 @@ public:
private:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void initAfterRead() override;
private:

4
ApplicationCode/ProjectDataModel/Completions/RimWellPathValve.h
View File

@@ -76,9 +76,7 @@ public:
private:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,