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

Made result position enum private

Browse Source 
Made enum RifOdbResultPosition private. Renamed it to PesPos.
This commit is contained in:
Stein Dale
2015-05-06 11:09:37 +02:00
parent 4f9f322f2e
commit 520823c267
2 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/GeoMech/OdbReader/RifOdbReader.cpp
View File

@@ -136,7 +136,6 @@ bool RifOdbReader::openFile(const std::string& fileName)
return true; return true;
} }
std::map< RifOdbResultPosition, std::map<std::string, std::vector<std::string> > > resultsMetaData(odb_Odb* odb);
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@@ -208,11 +207,11 @@ std::map<std::string, std::vector<std::string> > scalarFieldAndComponentNames(od
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::map< RifOdbResultPosition, std::map<std::string, std::vector<std::string> > > resultsMetaData(odb_Odb* odb) std::map< RifOdbReader::ResPos, std::map<std::string, std::vector<std::string> > > RifOdbReader::resultsMetaData(odb_Odb* odb)
{ {
CVF_ASSERT(odb != NULL); CVF_ASSERT(odb != NULL);
std::map< RifOdbResultPosition, std::map<std::string, std::vector<std::string> > > resultsMap; std::map< ResPos, std::map<std::string, std::vector<std::string> > > resultsMap;
odb_StepRepository stepRepository = odb->steps(); odb_StepRepository stepRepository = odb->steps();
odb_StepRepositoryIT sIter(stepRepository); odb_StepRepositoryIT sIter(stepRepository);
@@ -250,15 +249,15 @@ std::map< RifOdbResultPosition, std::map<std::string, std::vector<std::string> >
switch (fieldLocation.position()) switch (fieldLocation.position())
{ {
case odb_Enum::odb_ResultPositionEnum::NODAL: case odb_Enum::odb_ResultPositionEnum::NODAL:
resultsMap[RifOdbResultPosition::NODAL][fieldName] = compVec; resultsMap[ResPos::NODAL][fieldName] = compVec;
break; break;
case odb_Enum::odb_ResultPositionEnum::ELEMENT_NODAL: case odb_Enum::odb_ResultPositionEnum::ELEMENT_NODAL:
resultsMap[RifOdbResultPosition::ELEMENT_NODAL][fieldName] = compVec; resultsMap[ResPos::ELEMENT_NODAL][fieldName] = compVec;
break; break;
case odb_Enum::odb_ResultPositionEnum::INTEGRATION_POINT: case odb_Enum::odb_ResultPositionEnum::INTEGRATION_POINT:
resultsMap[RifOdbResultPosition::INTEGRATION_POINT][fieldName] = compVec; resultsMap[ResPos::INTEGRATION_POINT][fieldName] = compVec;
break; break;
default: default:
@@ -417,7 +416,7 @@ std::vector<double> RifOdbReader::frameTimes(int stepIndex)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::map<std::string, std::vector<std::string> > RifOdbReader::scalarNodeFieldAndComponentNames() std::map<std::string, std::vector<std::string> > RifOdbReader::scalarNodeFieldAndComponentNames()
{ {
return fieldAndComponentNames(RifOdbResultPosition::NODAL); return fieldAndComponentNames(ResPos::NODAL);
} }
@@ -426,7 +425,7 @@ std::map<std::string, std::vector<std::string> > RifOdbReader::scalarNodeFieldAn
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::map<std::string, std::vector<std::string> > RifOdbReader::scalarElementNodeFieldAndComponentNames() std::map<std::string, std::vector<std::string> > RifOdbReader::scalarElementNodeFieldAndComponentNames()
{ {
return fieldAndComponentNames(RifOdbResultPosition::ELEMENT_NODAL); return fieldAndComponentNames(ResPos::ELEMENT_NODAL);
} }
@@ -435,7 +434,7 @@ std::map<std::string, std::vector<std::string> > RifOdbReader::scalarElementNode
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::map<std::string, std::vector<std::string> > RifOdbReader::scalarIntegrationPointFieldAndComponentNames() std::map<std::string, std::vector<std::string> > RifOdbReader::scalarIntegrationPointFieldAndComponentNames()
{ {
return fieldAndComponentNames(RifOdbResultPosition::INTEGRATION_POINT); return fieldAndComponentNames(ResPos::INTEGRATION_POINT);
} }
@@ -511,7 +510,7 @@ size_t RifOdbReader::resultItemCount(const std::string& fieldName, int stepIndex
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
int RifOdbReader::componentIndex(RifOdbResultPosition position, const std::string& fieldName, const std::string& componentName) const int RifOdbReader::componentIndex(ResPos position, const std::string& fieldName, const std::string& componentName) const
{ {
std::vector<std::string> compNames = componentNames(position, fieldName); std::vector<std::string> compNames = componentNames(position, fieldName);
@@ -530,7 +529,7 @@ int RifOdbReader::componentIndex(RifOdbResultPosition position, const std::strin
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<std::string> RifOdbReader::componentNames(RifOdbResultPosition position, const std::string& fieldName) const std::vector<std::string> RifOdbReader::componentNames(ResPos position, const std::string& fieldName) const
{ {
std::vector<std::string> compNames; std::vector<std::string> compNames;
@@ -551,7 +550,7 @@ std::vector<std::string> RifOdbReader::componentNames(RifOdbResultPosition posit
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::map<std::string, std::vector<std::string> > RifOdbReader::fieldAndComponentNames(RifOdbResultPosition position) std::map<std::string, std::vector<std::string> > RifOdbReader::fieldAndComponentNames(ResPos position)
{ {
if (m_resultsMetaData.empty()) if (m_resultsMetaData.empty())
{ {
@@ -582,7 +581,7 @@ void RifOdbReader::readScalarNodeField(const std::string& fieldName, const std::
resultValues->resize(dataSize); resultValues->resize(dataSize);
resultValues->assign(dataSize, std::numeric_limits<float>::infinity()); resultValues->assign(dataSize, std::numeric_limits<float>::infinity());
int compIndex = componentIndex(RifOdbResultPosition::NODAL, fieldName, componentName); int compIndex = componentIndex(ResPos::NODAL, fieldName, componentName);
CVF_ASSERT(compIndex >= 0); CVF_ASSERT(compIndex >= 0);
const odb_Frame& frame = stepFrame(stepIndex, frameIndex); const odb_Frame& frame = stepFrame(stepIndex, frameIndex);
@@ -632,7 +631,7 @@ void RifOdbReader::readScalarElementNodeField(const std::string& fieldName, cons
resultValues->assign(dataSize, std::numeric_limits<float>::infinity()); resultValues->assign(dataSize, std::numeric_limits<float>::infinity());
} }
int compIndex = componentIndex(RifOdbResultPosition::ELEMENT_NODAL, fieldName, componentName); int compIndex = componentIndex(ResPos::ELEMENT_NODAL, fieldName, componentName);
CVF_ASSERT(compIndex >= 0); CVF_ASSERT(compIndex >= 0);
const odb_Frame& frame = stepFrame(stepIndex, frameIndex); const odb_Frame& frame = stepFrame(stepIndex, frameIndex);
@@ -691,7 +690,7 @@ void RifOdbReader::readScalarIntegrationPointField(const std::string& fieldName,
resultValues->assign(dataSize, std::numeric_limits<float>::infinity()); resultValues->assign(dataSize, std::numeric_limits<float>::infinity());
} }
int compIndex = componentIndex(RifOdbResultPosition::INTEGRATION_POINT, fieldName, componentName); int compIndex = componentIndex(ResPos::INTEGRATION_POINT, fieldName, componentName);
CVF_ASSERT(compIndex >= 0); CVF_ASSERT(compIndex >= 0);
const odb_Frame& frame = stepFrame(stepIndex, frameIndex); const odb_Frame& frame = stepFrame(stepIndex, frameIndex);

19
ApplicationCode/GeoMech/OdbReader/RifOdbReader.h
View File

@@ -29,7 +29,7 @@ class odb_Odb;
class odb_Frame; class odb_Frame;
class odb_Instance; class odb_Instance;
enum RifOdbResultPosition enum ResPos
{ {
NODAL, NODAL,
ELEMENT_NODAL, ELEMENT_NODAL,
@@ -64,21 +64,30 @@ public:
virtual void readDisplacements(int partIndex, int stepIndex, int frameIndex, std::vector<cvf::Vec3f>* displacements); virtual void readDisplacements(int partIndex, int stepIndex, int frameIndex, std::vector<cvf::Vec3f>* displacements);
private: private:
enum ResPos
{
NODAL,
ELEMENT_NODAL,
INTEGRATION_POINT
};
bool buildMetaData(); bool buildMetaData();
void close(); void close();
size_t resultItemCount(const std::string& fieldName, int stepIndex, int frameIndex) const; size_t resultItemCount(const std::string& fieldName, int stepIndex, int frameIndex) const;
odb_Frame stepFrame(int stepIndex, int frameIndex) const; odb_Frame stepFrame(int stepIndex, int frameIndex) const;
odb_Instance* instance(int instanceIndex); odb_Instance* instance(int instanceIndex);
int componentIndex(RifOdbResultPosition position, const std::string& fieldName, const std::string& componentName) const; int componentIndex(ResPos position, const std::string& fieldName, const std::string& componentName) const;
std::vector<std::string> componentNames(RifOdbResultPosition position, const std::string& fieldName) const; std::vector<std::string> componentNames(ResPos position, const std::string& fieldName) const;
std::map<std::string, std::vector<std::string> > fieldAndComponentNames(RifOdbResultPosition position); std::map<std::string, std::vector<std::string> > fieldAndComponentNames(ResPos position);
std::map< RifOdbReader::ResPos, std::map<std::string, std::vector<std::string> > > resultsMetaData(odb_Odb* odb);
static void initializeOdbAPI(); static void initializeOdbAPI();
static void finalizeOdbAPI(); static void finalizeOdbAPI();
private: private:
odb_Odb* m_odb; odb_Odb* m_odb;
std::map< RifOdbResultPosition, std::map<std::string, std::vector<std::string> > > m_resultsMetaData; std::map< ResPos, std::map<std::string, std::vector<std::string> > > m_resultsMetaData;
std::map< int, std::map<int, int> > m_instanceToNodeIdToIdxMap; std::map< int, std::map<int, int> > m_instanceToNodeIdToIdxMap;
std::map< int, std::map<int, int> > m_instanceToElementIdToIdxMap; std::map< int, std::map<int, int> > m_instanceToElementIdToIdxMap;