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

#2372 Elm props: Map modulus and ratio ui names

Browse Source
This commit is contained in:
Rebecca Cox 2018-01-15 17:40:39 +01:00
parent 58123f4a49
commit 96bff27519
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/FileInterface/RifElementPropertyReader.cpp
View File

@ -68,14 +68,14 @@ void RifElementPropertyReader::removeFile(const std::string& fileName)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::map<std::string, std::vector<std::string>> RifElementPropertyReader::scalarElementFields() const std::vector<std::string> RifElementPropertyReader::scalarElementFields() const
{ {
std::map<std::string, std::vector<std::string>> fields; std::vector<std::string> fields;
for (std::map<std::string, RifElementPropertyMetadata>::const_iterator field = m_fieldsMetaData.begin(); for (std::map<std::string, RifElementPropertyMetadata>::const_iterator field = m_fieldsMetaData.begin();
field != m_fieldsMetaData.end(); field++) field != m_fieldsMetaData.end(); field++)
{ {
fields[field->first]; fields.push_back(field->first);
} }
return fields; return fields;

2
ApplicationCode/FileInterface/RifElementPropertyReader.h
View File

@ -42,7 +42,7 @@ public:
void addFile(const std::string& fileName); void addFile(const std::string& fileName);
void removeFile(const std::string& fileName); void removeFile(const std::string& fileName);
std::map<std::string, std::vector<std::string>> scalarElementFields() const; std::vector<std::string> scalarElementFields() const;
std::map<std::string, std::vector<float>> readAllElementPropertiesInFileContainingField(const std::string& fieldName); std::map<std::string, std::vector<float>> readAllElementPropertiesInFileContainingField(const std::string& fieldName);

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

@ -451,7 +451,10 @@ std::map<std::string, std::vector<std::string> > RigFemPartResultsCollection::sc
} }
else if (resPos == RIG_ELEMENT) else if (resPos == RIG_ELEMENT)
{ {
fieldCompNames = m_elementPropertyReader->scalarElementFields(); for (const std::string& field : m_elementPropertyReader->scalarElementFields())
{
fieldCompNames[field];
}
} }
} }

3
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@ -139,6 +139,7 @@ QList<caf::PdmOptionItemInfo> RimGeoMechResultDefinition::calculateValueOptions(
if (&m_resultVariableUiField == fieldNeedingOptions) if (&m_resultVariableUiField == fieldNeedingOptions)
{ {
std::map<std::string, std::vector<std::string> > fieldCompNames = getResultMetaDataForUIFieldSetting(); std::map<std::string, std::vector<std::string> > fieldCompNames = getResultMetaDataForUIFieldSetting();
QStringList uiVarNames; QStringList uiVarNames;
QStringList varNames; QStringList varNames;
bool isNeedingTimeLapseStrings = m_isTimeLapseResultUiField() && (m_resultPositionTypeUiField() != RIG_FORMATION_NAMES); bool isNeedingTimeLapseStrings = m_isTimeLapseResultUiField() && (m_resultPositionTypeUiField() != RIG_FORMATION_NAMES);
@ -435,6 +436,8 @@ QString RimGeoMechResultDefinition::convertToUiResultFieldName(QString resultFie
if (resultFieldName == "S") newName = "NativeAbaqus Stress"; if (resultFieldName == "S") newName = "NativeAbaqus Stress";
if (resultFieldName == "NE") newName = "E"; // Make NE and NS appear as E and SE if (resultFieldName == "NE") newName = "E"; // Make NE and NS appear as E and SE
if (resultFieldName == "POR-Bar") newName = "POR"; // POR-Bar appear as POR if (resultFieldName == "POR-Bar") newName = "POR"; // POR-Bar appear as POR
if (resultFieldName == "MODULUS") newName = "Young's Modulus";
if (resultFieldName == "RATIO") newName = "Poisson's Ratio";
if (isTimeLapseResultList) newName += "_D" + QString::number(baseFrameIdx); if (isTimeLapseResultList) newName += "_D" + QString::number(baseFrameIdx);