From 192e7fce488026d0e9c2229256c7ef243bb572ef Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Mon, 3 Feb 2020 12:51:40 +0100 Subject: [PATCH] #4669 Improve method names. --- .../GeoMechDataModel/RigFemPartResultsCollection.cpp | 12 ++++++------ .../GeoMechDataModel/RigFemPartResultsCollection.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp index e3947ef3b9..fe53f72124 100644 --- a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp +++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp @@ -988,8 +988,8 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateMeanStressSTM( i //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigFemScalarResultFrames* RigFemPartResultsCollection::calculateStressGradient( int partIndex, - const RigFemResultAddress& resVarAddr ) +RigFemScalarResultFrames* RigFemPartResultsCollection::calculateStressGradients( int partIndex, + const RigFemResultAddress& resVarAddr ) { CVF_ASSERT( resVarAddr.fieldName == "ST_GRADIENTS" || resVarAddr.fieldName == "SE_GRADIENTS" ); @@ -1082,8 +1082,8 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateStressGradient( //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigFemScalarResultFrames* RigFemPartResultsCollection::calculateNodalGradient( int partIndex, - const RigFemResultAddress& resVarAddr ) +RigFemScalarResultFrames* RigFemPartResultsCollection::calculateNodalGradients( int partIndex, + const RigFemResultAddress& resVarAddr ) { CVF_ASSERT( resVarAddr.fieldName == "POR_GRADIENTS" ); CVF_ASSERT( resVarAddr.componentName == "X" || resVarAddr.componentName == "Y" || resVarAddr.componentName == "Z" ); @@ -2388,7 +2388,7 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateDerivedResult( i { 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" && ( 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" || diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.h b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.h index 50ea9fa6c4..7f56ba80aa 100644 --- a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.h +++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.h @@ -157,8 +157,8 @@ private: RigFemScalarResultFrames* calculateST_12_13_23( int partIndex, const RigFemResultAddress& resVarAddr ); RigFemScalarResultFrames* calculateGamma( int partIndex, const RigFemResultAddress& resVarAddr ); RigFemScalarResultFrames* calculateFormationIndices( int partIndex, const RigFemResultAddress& resVarAddr ); - RigFemScalarResultFrames* calculateStressGradient( int partIndex, const RigFemResultAddress& resVarAddr ); - RigFemScalarResultFrames* calculateNodalGradient( int partIndex, const RigFemResultAddress& resVarAddr ); + RigFemScalarResultFrames* calculateStressGradients( int partIndex, const RigFemResultAddress& resVarAddr ); + RigFemScalarResultFrames* calculateNodalGradients( int partIndex, const RigFemResultAddress& resVarAddr ); const RigFormationNames* activeFormationNames() const;