Fixes of linux compile errors and warnings

This commit is contained in:
Jacob Storen
2015-05-27 05:50:12 -07:00
parent 0d56ee060e
commit f6e8bb4a1a
18 changed files with 29 additions and 28 deletions

View File

@@ -254,8 +254,9 @@ void RivFemPartPartMgr::updateCellResultColor(size_t timeStepIndex, RimGeoMechRe
m_surfaceFacesTextureCoords->resize(vxToResultMapping->size());
cvf::Vec2f* rawPtr = m_surfaceFacesTextureCoords->ptr();
int vxCount = static_cast<int>(vxToResultMapping->size());
#pragma omp parallel for schedule(dynamic)
for (int vxIdx = 0; vxIdx < vxToResultMapping->size(); ++vxIdx)
for (int vxIdx = 0; vxIdx < vxCount; ++vxIdx)
{
float resultValue = resultValues[(*vxToResultMapping)[vxIdx]];
if (resultValue == HUGE_VAL || resultValue != resultValue) // a != a is true for NAN's

View File

@@ -54,7 +54,7 @@ void RivGeoMechPartMgr::clearAndSetReservoir(const RigGeoMechCaseData* geoMechCa
{
const RigFemPartCollection* femParts = geoMechCase->femParts();
for (size_t i = 0; i < femParts->partCount(); ++i)
for (int i = 0; i < femParts->partCount(); ++i)
{
m_femPartPartMgrs.push_back(new RivFemPartPartMgr(femParts->part(i)));
}