Fix: indexInInside() and indexInOutside() return signed integers.

This commit is contained in:
Atgeirr Flø Rasmussen 2019-02-05 23:23:48 +01:00
parent d087d7c41b
commit e926f557b8

View File

@ -272,8 +272,8 @@ public:
// local indices of the faces of the inside and // local indices of the faces of the inside and
// outside elements which contain the intersection // outside elements which contain the intersection
unsigned insideFaceIdx = intersection.indexInInside(); int insideFaceIdx = intersection.indexInInside();
unsigned outsideFaceIdx = intersection.indexInOutside(); int outsideFaceIdx = intersection.indexInOutside();
if (insideFaceIdx == -1) { if (insideFaceIdx == -1) {
// NNC. Set zero transmissibility, as it will be // NNC. Set zero transmissibility, as it will be
@ -798,10 +798,11 @@ private:
void computeHalfTrans_(Scalar& halfTrans, void computeHalfTrans_(Scalar& halfTrans,
const DimVector& areaNormal, const DimVector& areaNormal,
unsigned faceIdx, // in the reference element that contains the intersection int faceIdx, // in the reference element that contains the intersection
const DimVector& distance, const DimVector& distance,
const DimMatrix& perm) const const DimMatrix& perm) const
{ {
assert(faceIdx >= 0);
unsigned dimIdx = faceIdx/2; unsigned dimIdx = faceIdx/2;
assert(dimIdx < dimWorld); assert(dimIdx < dimWorld);
halfTrans = perm[dimIdx][dimIdx]; halfTrans = perm[dimIdx][dimIdx];
@ -815,10 +816,11 @@ private:
} }
DimVector distanceVector_(const DimVector& center, DimVector distanceVector_(const DimVector& center,
unsigned faceIdx, // in the reference element that contains the intersection int faceIdx, // in the reference element that contains the intersection
unsigned elemIdx, unsigned elemIdx,
const std::array<std::vector<DimVector>, dimWorld>& axisCentroids) const const std::array<std::vector<DimVector>, dimWorld>& axisCentroids) const
{ {
assert(faceIdx >= 0);
unsigned dimIdx = faceIdx/2; unsigned dimIdx = faceIdx/2;
assert(dimIdx < dimWorld); assert(dimIdx < dimWorld);
DimVector x = center; DimVector x = center;