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

OdbReader: Cleaned up elmtype functions a bit

Browse Source
This commit is contained in:
Jacob Støren
2015-05-12 14:35:11 +02:00
parent 0d0b2f9609
commit d3baa09774
1 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,12 @@
#include <sstream> #include <sstream>
size_t RifOdbReader::sm_instanceCount = 0;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::map<std::string, RigElementType> initFemTypeMap() std::map<std::string, RigElementType> initFemTypeMap()
{ {
std::map<std::string, RigElementType> typeMap; std::map<std::string, RigElementType> typeMap;
@@ -48,35 +54,13 @@ std::map<std::string, RigElementType> initFemTypeMap()
return typeMap; return typeMap;
} }
static std::map<std::string, RigElementType> odbElmTypeToRigElmTypeMap = initFemTypeMap();
size_t RifOdbReader::sm_instanceCount = 0;
const int* localElmNodeToIntegrationPointMapping(RigElementType elmType)
{
static const int HEX8_Mapping[8] ={ 0, 1, 3, 2, 4, 5, 7, 6 };
switch (elmType)
{
case HEX8:
return HEX8_Mapping;
break;
case CAX4:
return HEX8_Mapping;
break;
default:
//assert(false); // Element type not supported
break;
}
return NULL;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigElementType toRigElementType(const odb_String& odbTypeName) RigElementType toRigElementType(const odb_String& odbTypeName)
{ {
static std::map<std::string, RigElementType> odbElmTypeToRigElmTypeMap = initFemTypeMap();
std::map<std::string, RigElementType>::iterator it = odbElmTypeToRigElmTypeMap.find(odbTypeName.cStr()); std::map<std::string, RigElementType>::iterator it = odbElmTypeToRigElmTypeMap.find(odbTypeName.cStr());
if (it == odbElmTypeToRigElmTypeMap.end()) if (it == odbElmTypeToRigElmTypeMap.end())
@@ -90,6 +74,29 @@ RigElementType toRigElementType(const odb_String& odbTypeName)
return it->second; return it->second;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const int* localElmNodeToIntegrationPointMapping(RigElementType elmType)
{
static const int HEX8_Mapping[8] ={ 0, 1, 3, 2, 4, 5, 7, 6 };
switch (elmType)
{
case HEX8:
return HEX8_Mapping;
break;
case CAX4:
return HEX8_Mapping; // First four is identical to HEX8
break;
default:
//assert(false); // Element type not supported
break;
}
return NULL;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -362,18 +369,8 @@ bool RifOdbReader::readFemParts(RigFemPartCollection* femParts)
elementIdToIdxMap[odbElm.label()] = elmIdx; elementIdToIdxMap[odbElm.label()] = elmIdx;
// Get the type RigElementType elmType = toRigElementType(odbElm.type());
it = odbElmTypeToRigElmTypeMap.find(odbElm.type().cStr()); if (elmType == UNKNOWN_ELM_TYPE) continue;
if (it == odbElmTypeToRigElmTypeMap.end())
{
#if 0
std::cout << "Unsupported element type :" << odbElm.type().cStr() << std::endl;
#endif
continue; // Unsupported type
}
RigElementType elmType = it->second;
int nodeCount = 0; int nodeCount = 0;
const int* idBasedConnectivities = odbElm.connectivity(nodeCount); const int* idBasedConnectivities = odbElm.connectivity(nodeCount);