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

#4669 Improve method names.

Browse Source
This commit is contained in:
Kristian Bendiksen
2020-02-03 12:51:40 +01:00
parent 22ccf6003d
commit 192e7fce48
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp
View File

@@ -988,8 +988,8 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateMeanStressSTM( i
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigFemScalarResultFrames* RigFemPartResultsCollection::calculateStressGradient( int partIndex, RigFemScalarResultFrames* RigFemPartResultsCollection::calculateStressGradients( int partIndex,
const RigFemResultAddress& resVarAddr ) const RigFemResultAddress& resVarAddr )
{ {
CVF_ASSERT( resVarAddr.fieldName == "ST_GRADIENTS" || resVarAddr.fieldName == "SE_GRADIENTS" ); CVF_ASSERT( resVarAddr.fieldName == "ST_GRADIENTS" || resVarAddr.fieldName == "SE_GRADIENTS" );
@@ -1082,8 +1082,8 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateStressGradient(
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigFemScalarResultFrames* RigFemPartResultsCollection::calculateNodalGradient( int partIndex, RigFemScalarResultFrames* RigFemPartResultsCollection::calculateNodalGradients( int partIndex,
const RigFemResultAddress& resVarAddr ) const RigFemResultAddress& resVarAddr )
{ {
CVF_ASSERT( resVarAddr.fieldName == "POR_GRADIENTS" ); CVF_ASSERT( resVarAddr.fieldName == "POR_GRADIENTS" );
CVF_ASSERT( resVarAddr.componentName == "X" || resVarAddr.componentName == "Y" || resVarAddr.componentName == "Z" ); CVF_ASSERT( resVarAddr.componentName == "X" || resVarAddr.componentName == "Y" || resVarAddr.componentName == "Z" );
@@ -2388,7 +2388,7 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateDerivedResult( i
{ {
if ( resVarAddr.componentName == allowedComponentName ) if ( resVarAddr.componentName == allowedComponentName )
{ {
return calculateStressGradient( partIndex, resVarAddr ); return calculateStressGradients( partIndex, resVarAddr );
} }
} }
} }
@@ -2414,7 +2414,7 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateDerivedResult( i
if ( resVarAddr.fieldName == "POR_GRADIENTS" && if ( resVarAddr.fieldName == "POR_GRADIENTS" &&
( resVarAddr.componentName == "X" || resVarAddr.componentName == "Y" || resVarAddr.componentName == "Z" ) ) ( resVarAddr.componentName == "X" || resVarAddr.componentName == "Y" || resVarAddr.componentName == "Z" ) )
{ {
return calculateNodalGradient( partIndex, resVarAddr ); return calculateNodalGradients( partIndex, resVarAddr );
} }
if ( ( resVarAddr.fieldName == "NE" ) && ( resVarAddr.componentName == "E11" || resVarAddr.componentName == "E22" || if ( ( resVarAddr.fieldName == "NE" ) && ( resVarAddr.componentName == "E11" || resVarAddr.componentName == "E22" ||

4
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.h
View File

@@ -157,8 +157,8 @@ private:
RigFemScalarResultFrames* calculateST_12_13_23( int partIndex, const RigFemResultAddress& resVarAddr ); RigFemScalarResultFrames* calculateST_12_13_23( int partIndex, const RigFemResultAddress& resVarAddr );
RigFemScalarResultFrames* calculateGamma( int partIndex, const RigFemResultAddress& resVarAddr ); RigFemScalarResultFrames* calculateGamma( int partIndex, const RigFemResultAddress& resVarAddr );
RigFemScalarResultFrames* calculateFormationIndices( int partIndex, const RigFemResultAddress& resVarAddr ); RigFemScalarResultFrames* calculateFormationIndices( int partIndex, const RigFemResultAddress& resVarAddr );
RigFemScalarResultFrames* calculateStressGradient( int partIndex, const RigFemResultAddress& resVarAddr ); RigFemScalarResultFrames* calculateStressGradients( int partIndex, const RigFemResultAddress& resVarAddr );
RigFemScalarResultFrames* calculateNodalGradient( int partIndex, const RigFemResultAddress& resVarAddr ); RigFemScalarResultFrames* calculateNodalGradients( int partIndex, const RigFemResultAddress& resVarAddr );
const RigFormationNames* activeFormationNames() const; const RigFormationNames* activeFormationNames() const;