From 44267fd206c729c1fe208d22d8a68f4693fd0151 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 18 Jun 2021 13:26:57 +0200 Subject: [PATCH] fixed: do not assert conditions guaranteed by unsigned --- opm/models/common/multiphasebasemodel.hh | 2 +- .../discretization/common/baseauxiliarymodule.hh | 1 - .../discretization/common/fvbaseelementcontext.hh | 12 ++++++------ opm/models/discretization/ecfv/ecfvstencil.hh | 4 ++-- opm/models/discretization/vcfv/vcfvstencil.hh | 4 ++-- opm/models/immiscible/immisciblemodel.hh | 2 +- opm/models/ncp/ncpmodel.hh | 6 +++--- opm/models/parallel/mpibuffer.hh | 4 ++-- opm/models/pvs/pvsmodel.hh | 2 +- opm/models/richards/richardsmodel.hh | 2 +- 10 files changed, 19 insertions(+), 20 deletions(-) diff --git a/opm/models/common/multiphasebasemodel.hh b/opm/models/common/multiphasebasemodel.hh index 4be284b8f..0b00d3847 100644 --- a/opm/models/common/multiphasebasemodel.hh +++ b/opm/models/common/multiphasebasemodel.hh @@ -203,7 +203,7 @@ public: */ void globalPhaseStorage(EqVector& storage, unsigned phaseIdx) { - assert(0 <= phaseIdx && phaseIdx < numPhases); + assert(phaseIdx < numPhases); storage = 0; diff --git a/opm/models/discretization/common/baseauxiliarymodule.hh b/opm/models/discretization/common/baseauxiliarymodule.hh index e9292a7c4..74e7ef0ec 100644 --- a/opm/models/discretization/common/baseauxiliarymodule.hh +++ b/opm/models/discretization/common/baseauxiliarymodule.hh @@ -91,7 +91,6 @@ public: */ int localToGlobalDof(unsigned localDofIdx) const { - assert(0 <= localDofIdx); assert(localDofIdx < numDofs()); return dofOffset_ + localDofIdx; } diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index 63dfb3b00..d205868b1 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -409,7 +409,7 @@ public: const IntensiveQuantities& intensiveQuantities(unsigned dofIdx, unsigned timeIdx) const { #ifndef NDEBUG - assert(0 <= dofIdx && dofIdx < numDof(timeIdx)); + assert(dofIdx < numDof(timeIdx)); if (enableStorageCache_ && timeIdx != 0 && problem().recycleFirstIterationStorage()) throw std::logic_error("If caching of the storage term is enabled, only the intensive quantities " @@ -429,7 +429,7 @@ public: */ const IntensiveQuantities *thermodynamicHint(unsigned dofIdx, unsigned timeIdx) const { - assert(0 <= dofIdx && dofIdx < numDof(timeIdx)); + assert(dofIdx < numDof(timeIdx)); return dofVars_[dofIdx].thermodynamicHint[timeIdx]; } /*! @@ -437,7 +437,7 @@ public: */ IntensiveQuantities& intensiveQuantities(unsigned dofIdx, unsigned timeIdx) { - assert(0 <= dofIdx && dofIdx < numDof(timeIdx)); + assert(dofIdx < numDof(timeIdx)); return dofVars_[dofIdx].intensiveQuantities[timeIdx]; } @@ -451,7 +451,7 @@ public: */ PrimaryVariables& primaryVars(unsigned dofIdx, unsigned timeIdx) { - assert(0 <= dofIdx && dofIdx < numDof(timeIdx)); + assert(dofIdx < numDof(timeIdx)); return dofVars_[dofIdx].priVars[timeIdx]; } /*! @@ -459,7 +459,7 @@ public: */ const PrimaryVariables& primaryVars(unsigned dofIdx, unsigned timeIdx) const { - assert(0 <= dofIdx && dofIdx < numDof(timeIdx)); + assert(dofIdx < numDof(timeIdx)); return dofVars_[dofIdx].priVars[timeIdx]; } @@ -488,7 +488,7 @@ public: */ void stashIntensiveQuantities(unsigned dofIdx) { - assert(0 <= dofIdx && dofIdx < numDof(/*timeIdx=*/0)); + assert(dofIdx < numDof(/*timeIdx=*/0)); intensiveQuantitiesStashed_ = dofVars_[dofIdx].intensiveQuantities[/*timeIdx=*/0]; priVarsStashed_ = dofVars_[dofIdx].priVars[/*timeIdx=*/0]; diff --git a/opm/models/discretization/ecfv/ecfvstencil.hh b/opm/models/discretization/ecfv/ecfvstencil.hh index 1032f0ba6..8e233a7ad 100644 --- a/opm/models/discretization/ecfv/ecfvstencil.hh +++ b/opm/models/discretization/ecfv/ecfvstencil.hh @@ -311,7 +311,7 @@ public: */ unsigned globalSpaceIndex(unsigned dofIdx) const { - assert(0 <= dofIdx && dofIdx < numDof()); + assert(dofIdx < numDof()); return static_cast(elementMapper_.index(element(dofIdx))); } @@ -331,7 +331,7 @@ public: */ const Element& element(unsigned dofIdx) const { - assert(0 <= dofIdx && dofIdx < numDof()); + assert(dofIdx < numDof()); return elements_[dofIdx]; } diff --git a/opm/models/discretization/vcfv/vcfvstencil.hh b/opm/models/discretization/vcfv/vcfvstencil.hh index 610a0fdee..0da03c809 100644 --- a/opm/models/discretization/vcfv/vcfvstencil.hh +++ b/opm/models/discretization/vcfv/vcfvstencil.hh @@ -1070,7 +1070,7 @@ public: const SubControlVolume& subControlVolume(unsigned scvIdx) const { - assert(0 <= scvIdx && scvIdx < numDof()); + assert(scvIdx < numDof()); return subContVol[scvIdx]; } @@ -1092,7 +1092,7 @@ public: */ unsigned globalSpaceIndex(unsigned dofIdx) const { - assert(0 <= dofIdx && dofIdx < numDof()); + assert(dofIdx < numDof()); return static_cast(vertexMapper_.subIndex(element_, static_cast(dofIdx), /*codim=*/dim)); } diff --git a/opm/models/immiscible/immisciblemodel.hh b/opm/models/immiscible/immisciblemodel.hh index be0bb850e..ab414342b 100644 --- a/opm/models/immiscible/immisciblemodel.hh +++ b/opm/models/immiscible/immisciblemodel.hh @@ -350,7 +350,7 @@ public: #ifndef NDEBUG unsigned compIdx = eqIdx - Indices::conti0EqIdx; - assert(0 <= compIdx && compIdx <= numPhases); + assert(compIdx <= numPhases); #endif // make all kg equal diff --git a/opm/models/ncp/ncpmodel.hh b/opm/models/ncp/ncpmodel.hh index 9c66899f9..5e980c47d 100644 --- a/opm/models/ncp/ncpmodel.hh +++ b/opm/models/ncp/ncpmodel.hh @@ -400,7 +400,7 @@ public: else if (fugacity0Idx <= pvIdx && pvIdx < fugacity0Idx + numComponents) { // component fugacity unsigned compIdx = pvIdx - fugacity0Idx; - assert(0 <= compIdx && compIdx <= numComponents); + assert(compIdx <= numComponents); Opm::Valgrind::CheckDefined(minActivityCoeff_[globalDofIdx][compIdx]); static const Scalar fugacityBaseWeight = @@ -414,7 +414,7 @@ public: else { #ifndef NDEBUG unsigned phaseIdx = pvIdx - saturation0Idx; - assert(0 <= phaseIdx && phaseIdx < numPhases - 1); + assert(phaseIdx < numPhases - 1); #endif // saturation @@ -444,7 +444,7 @@ public: // a mass conservation equation unsigned compIdx = eqIdx - Indices::conti0EqIdx; - assert(0 <= compIdx && compIdx <= numComponents); + assert(compIdx <= numComponents); // make all kg equal return FluidSystem::molarMass(compIdx); diff --git a/opm/models/parallel/mpibuffer.hh b/opm/models/parallel/mpibuffer.hh index 191b3d01c..7b2202146 100644 --- a/opm/models/parallel/mpibuffer.hh +++ b/opm/models/parallel/mpibuffer.hh @@ -165,7 +165,7 @@ public: */ DataType& operator[](size_t i) { - assert(0 <= i && i < dataSize_); + assert(i < dataSize_); return data_[i]; } @@ -174,7 +174,7 @@ public: */ const DataType& operator[](size_t i) const { - assert(0 <= i && i < dataSize_); + assert(i < dataSize_); return data_[i]; } diff --git a/opm/models/pvs/pvsmodel.hh b/opm/models/pvs/pvsmodel.hh index 9af6990ae..080c3df3a 100644 --- a/opm/models/pvs/pvsmodel.hh +++ b/opm/models/pvs/pvsmodel.hh @@ -424,7 +424,7 @@ public: return tmp; unsigned compIdx = eqIdx - Indices::conti0EqIdx; - assert(0 <= compIdx && compIdx <= numComponents); + assert(compIdx <= numComponents); // make all kg equal return FluidSystem::molarMass(compIdx); diff --git a/opm/models/richards/richardsmodel.hh b/opm/models/richards/richardsmodel.hh index 8539915ac..9723a991e 100644 --- a/opm/models/richards/richardsmodel.hh +++ b/opm/models/richards/richardsmodel.hh @@ -347,7 +347,7 @@ public: Scalar eqWeight(unsigned globalDofIdx OPM_UNUSED, unsigned OPM_OPTIM_UNUSED eqIdx) const { unsigned OPM_OPTIM_UNUSED compIdx = eqIdx - Indices::contiEqIdx; - assert(0 <= compIdx && compIdx <= FluidSystem::numPhases); + assert(compIdx <= FluidSystem::numPhases); // make all kg equal return 1.0;