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

Merge branch 'dev' of https://github.com/OPM/ResInsight.git

Browse Source
This commit is contained in:
Jacob Støren
2016-12-20 14:43:28 +01:00
parent 4b64de258e b934ae3f26
commit 39ff269e5f
31 changed files with 910 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPart.cpp
View File

@@ -287,16 +287,13 @@ float RigFemPart::characteristicElementSize()
{
if (m_characteristicElementSize != std::numeric_limits<float>::infinity()) return m_characteristicElementSize;
// take 100 elements
float elmIdxJump = elementCount() / 100.0f;
int elmIdxIncrement = elmIdxJump < 1 ? 1: (int) elmIdxJump;
int elmsToAverageCount = 0;
float sumMaxEdgeLength = 0;
for (int elmIdx = 0; elmIdx < elementCount(); elmIdx += elmIdxIncrement)
for (int elmIdx = 0; elmIdx < elementCount(); elmIdx++)
{
RigElementType eType = this->elementType(elmIdx);
if (eType == HEX8 || eType == HEX8P)
if (eType == HEX8P)
{
const int* elmentConn = this->connectivities(elmIdx);
cvf::Vec3f nodePos0 = this->nodes().coordinates[elmentConn[0]];