From 8c63f4963b751acdaa25fa46c179c9c6ad973e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Fri, 25 Sep 2015 09:16:14 +0200 Subject: [PATCH] (#513) Minor rename --- .../GeoMechDataModel/RigFemPartResultsCollection.cpp | 6 +++--- .../ProjectDataModel/RimGeoMechResultDefinition.cpp | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp index 6d2748b5e9..b3dbd5edf1 100644 --- a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp +++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp @@ -425,15 +425,15 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateDerivedResult(in int frameCount = srcSDataFrames->frameCount(); for (int fIdx = 0; fIdx < frameCount; ++fIdx) { - const std::vector& srcNSFrameData = srcSDataFrames->frameData(fIdx); + const std::vector& srcSFrameData = srcSDataFrames->frameData(fIdx); std::vector& dstFrameData = dstDataFrames->frameData(fIdx); - size_t valCount = srcNSFrameData.size(); + size_t valCount = srcSFrameData.size(); dstFrameData.resize(valCount); int nodeIdx = 0; for (size_t vIdx = 0; vIdx < valCount; ++vIdx) { - dstFrameData[vIdx] = -srcNSFrameData[vIdx]; + dstFrameData[vIdx] = -srcSFrameData[vIdx]; } } return dstDataFrames; diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp index 2ec9f3848a..7f149b8973 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp @@ -98,9 +98,6 @@ QList RimGeoMechResultDefinition::calculateValueOptions( if (m_geomCase) { - - - if (&m_resultVariableUiField == fieldNeedingOptions) { std::map > fieldCompNames = getResultMetaDataForUIFieldSetting();