OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linux compile error/warning fixes

Browse Source
This commit is contained in:
Jacob Storen 2015-05-29 02:27:23 -07:00
parent cdcfd62163
commit 0bdc8916d7
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,7 +148,7 @@ void RigFemPart::calculateElmNeighbors()
m_elmNeighbors.resize(this->elementCount());
for (cvf::uint eIdx = 0; eIdx < this->elementCount(); ++eIdx)
for (int eIdx = 0; eIdx < this->elementCount(); ++eIdx)
{
RigElementType elmType = this->elementType(eIdx);
const int* elmNodes = this->connectivities(eIdx);

2
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPart.h
View File

@ -51,7 +51,7 @@ public:
void preAllocateElementStorage(int elementCount);
void appendElement(RigElementType elmType, int elementId, const int* connectivities);
size_t elementCount() const { return m_elementId.size(); }
int elementCount() const { return static_cast<int>(m_elementId.size()); }
int elmId(size_t elementIdx) const { return m_elementId[elementIdx]; }
RigElementType elementType(size_t elementIdx) const { return m_elementTypes[elementIdx]; }

12
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartGrid.cpp
View File

@ -21,7 +21,7 @@
#include "RigFemPart.h"
#include <cmath>
//--------------------------------------------------------------------------------------------------
///
@ -122,7 +122,7 @@ void RigFemPartGrid::generateStructGridData()
// Scoped to show that nothing bleeds further to K-loop
{
if (iCoord > m_elmentIJKCounts[0]) m_elmentIJKCounts[0] = iCoord;
if (iCoord > static_cast<int>(m_elmentIJKCounts[0])) m_elmentIJKCounts[0] = iCoord;
++jCoord;
@ -146,7 +146,7 @@ void RigFemPartGrid::generateStructGridData()
}
{
if (jCoord > m_elmentIJKCounts[1]) m_elmentIJKCounts[1] = jCoord;
if (jCoord > static_cast<int>(m_elmentIJKCounts[1])) m_elmentIJKCounts[1] = jCoord;
++kCoord;
@ -170,7 +170,7 @@ void RigFemPartGrid::generateStructGridData()
}
}
if (kCoord > m_elmentIJKCounts[2]) m_elmentIJKCounts[2] = kCoord;
if (kCoord > static_cast<int>(m_elmentIJKCounts[2])) m_elmentIJKCounts[2] = kCoord;
}
}
@ -228,6 +228,10 @@ cvf::Vec3i RigFemPartGrid::findMainIJKFaces(int elementIndex)
}
else
{
mainElmDirections[0] = cvf::Vec3f::ZERO;
mainElmDirections[1] = cvf::Vec3f::ZERO;
mainElmDirections[2] = cvf::Vec3f::ZERO;
CVF_ASSERT(false);
}