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

Fixed missing conversion to node indices from node ids

Browse Source
This commit is contained in:
Jacob Støren 2015-04-27 13:47:41 +02:00
parent f9ca3d5e54
commit ea3d2dc40d
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,8 +72,11 @@ void readOdbFile(const std::string& fileName, RigFemPartCollection* femParts)
RigFemPart* femPart = new RigFemPart;
// Extract nodes
const odb_SequenceNode& odbNodes = inst.nodes();
std::map<int, int> nodeIdToIdxMap;
int nodeCount = odbNodes.size();
femPart->nodes().nodeIds.resize(nodeCount);
femPart->nodes().coordinates.resize(nodeCount);
@ -84,23 +87,39 @@ void readOdbFile(const std::string& fileName, RigFemPartCollection* femParts)
femPart->nodes().nodeIds[nIdx] = odbNode.label();
const float * pos = odbNode.coordinates();
femPart->nodes().coordinates[nIdx].set(pos[0], pos[1], pos[2]);
nodeIdToIdxMap[odbNode.label()] = nIdx;
}
// Extract elements
const odb_SequenceElement& elements = inst.elements();
int elmCount = elements.size();
femPart->preAllocateElementStorage(elmCount);
std::map<std::string, RigElementType>::const_iterator it;
std::vector<int> indexBasedConnectivities;
for (int elmIdx = 0; elmIdx < elmCount; ++elmIdx)
{
const odb_Element odbElm = elements.element(elmIdx);
// Get the type
it = odbElmTypeToRigElmTypeMap.find(odbElm.type().cStr());
if (it == odbElmTypeToRigElmTypeMap.end()) continue;
if (it == odbElmTypeToRigElmTypeMap.end()) continue; // Unsupported type
RigElementType elmType = it->second;
int nodeCount = 0;
femPart->appendElement(elmType, odbElm.label(), odbElm.connectivity(nodeCount));
const int* idBasedConnectivities = odbElm.connectivity(nodeCount);
CVF_TIGHT_ASSERT(nodeCount == elmentNodeCount(elmType));
indexBasedConnectivities.resize(nodeCount);
for (int lnIdx = 0; lnIdx < nodeCount; ++lnIdx)
{
indexBasedConnectivities[lnIdx] = nodeIdToIdxMap[idBasedConnectivities[lnIdx]];
}
femPart->appendElement(elmType, odbElm.label(), indexBasedConnectivities.data());
}
femPart->setElementPartId(femParts->partCount());

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

@ -21,6 +21,7 @@
#include "RifGeoMechReaderInterface.h"
#include <string>
#include <map>
class RigFemPartCollection;