OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed: do not assert conditions guaranteed by unsigned

Browse Source
This commit is contained in:
Arne Morten Kvarving 2021-06-18 13:24:02 +02:00
parent 4ac1eab2cd
commit 50c8cbea78
16 changed files with 101 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/material/common/TridiagonalMatrix.hpp
View File

@ -175,7 +175,7 @@ public:
size_t diagIdx = 1 + colIdx - rowIdx;
// make sure that the requested column is in range
assert(0 <= diagIdx && diagIdx < 3);
assert(diagIdx < 3);
return diag_[diagIdx][colIdx];
}
@ -194,7 +194,7 @@ public:
size_t diagIdx = 1 + colIdx - rowIdx;
// make sure that the requested column is in range
assert(0 <= diagIdx && diagIdx < 3);
assert(diagIdx < 3);
return diag_[diagIdx][colIdx];
}

12
opm/material/common/UniformTabulated2DFunction.hpp
View File

@ -132,7 +132,7 @@ public:
*/
Scalar iToX(unsigned i) const
{
assert(0 <= i && i < numX());
assert(i < numX());
return xMin() + i*(xMax() - xMin())/(numX() - 1);
}
@ -142,7 +142,7 @@ public:
*/
Scalar jToY(unsigned j) const
{
assert(0 <= j && j < numY());
assert(j < numY());
return yMin() + j*(yMax() - yMin())/(numY() - 1);
}
@ -230,8 +230,8 @@ public:
*/
Scalar getSamplePoint(unsigned i, unsigned j) const
{
assert(0 <= i && i < m_);
assert(0 <= j && j < n_);
assert(i < m_);
assert(j < n_);
return samples_[j*m_ + i];
}
@ -243,8 +243,8 @@ public:
*/
void setSamplePoint(unsigned i, unsigned j, Scalar value)
{
assert(0 <= i && i < m_);
assert(0 <= j && j < n_);
assert(i < m_);
assert(j < n_);
samples_[j*m_ + i] = value;
}

14
opm/material/common/UniformXTabulated2DFunction.hpp
View File

@ -145,7 +145,7 @@ public:
*/
Scalar iToX(unsigned i) const
{
assert(0 <= i && i < numX());
assert(i < numX());
return xPos_.at(i);
}
@ -175,8 +175,8 @@ public:
*/
Scalar jToY(unsigned i, unsigned j) const
{
assert(0 <= i && i < numX());
assert(0 <= j && size_t(j) < samples_[i].size());
assert(i < numX());
assert(size_t(j) < samples_[i].size());
return std::get<1>(samples_.at(i).at(j));
}
@ -234,7 +234,7 @@ public:
template <class Evaluation>
unsigned ySegmentIndex(const Evaluation& y, unsigned xSampleIdx, bool extrapolate OPM_OPTIM_UNUSED = false) const
{
assert(0 <= xSampleIdx && xSampleIdx < numX());
assert(xSampleIdx < numX());
const auto& colSamplePoints = samples_.at(xSampleIdx);
assert(colSamplePoints.size() >= 2);
@ -271,8 +271,8 @@ public:
template <class Evaluation>
Evaluation yToBeta(const Evaluation& y, unsigned xSampleIdx, unsigned ySegmentIdx) const
{
assert(0 <= xSampleIdx && xSampleIdx < numX());
assert(0 <= ySegmentIdx && ySegmentIdx < numY(xSampleIdx) - 1);
assert(xSampleIdx < numX());
assert(ySegmentIdx < numY(xSampleIdx) - 1);
const auto& colSamplePoints = samples_.at(xSampleIdx);
@ -411,7 +411,7 @@ public:
*/
size_t appendSamplePoint(size_t i, Scalar y, Scalar value)
{
assert(0 <= i && i < numX());
assert(i < numX());
Scalar x = iToX(i);
if (samples_[i].empty() || std::get<1>(samples_[i].back()) < y) {
samples_[i].push_back(SamplePoint(x, y, value));

4
opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp
View File

@ -517,13 +517,13 @@ public:
MaterialLawParams& materialLawParams(unsigned elemIdx)
{
assert(0 <= elemIdx && elemIdx < materialLawParams_.size());
assert(elemIdx < materialLawParams_.size());
return *materialLawParams_[elemIdx];
}
const MaterialLawParams& materialLawParams(unsigned elemIdx) const
{
assert(0 <= elemIdx && elemIdx < materialLawParams_.size());
assert(elemIdx < materialLawParams_.size());
return *materialLawParams_[elemIdx];
}

44
opm/material/fluidsystems/BlackOilFluidSystem.hpp
View File

@ -458,7 +458,7 @@ public:
//! \copydoc BaseFluidSystem::isLiquid
static bool isLiquid(unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
return phaseIdx != gasPhaseIdx;
}
@ -653,8 +653,8 @@ public:
unsigned phaseIdx,
unsigned regionIdx)
{
assert(0 <= phaseIdx && phaseIdx <= numPhases);
assert(0 <= regionIdx && regionIdx <= numRegions());
assert(phaseIdx <= numPhases);
assert(regionIdx <= numRegions());
const LhsEval& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
const LhsEval& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
@ -717,8 +717,8 @@ public:
unsigned phaseIdx,
unsigned regionIdx)
{
assert(0 <= phaseIdx && phaseIdx <= numPhases);
assert(0 <= regionIdx && regionIdx <= numRegions());
assert(phaseIdx <= numPhases);
assert(regionIdx <= numRegions());
const auto& p = fluidState.pressure(phaseIdx);
const auto& T = fluidState.temperature(phaseIdx);
@ -782,8 +782,8 @@ public:
unsigned phaseIdx,
unsigned regionIdx)
{
assert(0 <= phaseIdx && phaseIdx <= numPhases);
assert(0 <= regionIdx && regionIdx <= numRegions());
assert(phaseIdx <= numPhases);
assert(regionIdx <= numRegions());
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
@ -838,8 +838,8 @@ public:
unsigned phaseIdx,
unsigned regionIdx)
{
assert(0 <= phaseIdx && phaseIdx <= numPhases);
assert(0 <= regionIdx && regionIdx <= numRegions());
assert(phaseIdx <= numPhases);
assert(regionIdx <= numRegions());
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
@ -860,9 +860,9 @@ public:
unsigned compIdx,
unsigned regionIdx)
{
assert(0 <= phaseIdx && phaseIdx <= numPhases);
assert(0 <= compIdx && compIdx <= numComponents);
assert(0 <= regionIdx && regionIdx <= numRegions());
assert(phaseIdx <= numPhases);
assert(compIdx <= numComponents);
assert(regionIdx <= numRegions());
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
@ -981,8 +981,8 @@ public:
unsigned phaseIdx,
unsigned regionIdx)
{
assert(0 <= phaseIdx && phaseIdx <= numPhases);
assert(0 <= regionIdx && regionIdx <= numRegions());
assert(phaseIdx <= numPhases);
assert(regionIdx <= numRegions());
const LhsEval& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
const LhsEval& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
@ -1036,8 +1036,8 @@ public:
unsigned phaseIdx,
unsigned regionIdx)
{
assert(0 <= phaseIdx && phaseIdx <= numPhases);
assert(0 <= regionIdx && regionIdx <= numRegions());
assert(phaseIdx <= numPhases);
assert(regionIdx <= numRegions());
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
@ -1076,8 +1076,8 @@ public:
unsigned regionIdx,
const LhsEval& maxOilSaturation)
{
assert(0 <= phaseIdx && phaseIdx <= numPhases);
assert(0 <= regionIdx && regionIdx <= numRegions());
assert(phaseIdx <= numPhases);
assert(regionIdx <= numRegions());
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
@ -1104,8 +1104,8 @@ public:
unsigned phaseIdx,
unsigned regionIdx)
{
assert(0 <= phaseIdx && phaseIdx <= numPhases);
assert(0 <= regionIdx && regionIdx <= numRegions());
assert(phaseIdx <= numPhases);
assert(regionIdx <= numRegions());
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
@ -1154,8 +1154,8 @@ public:
unsigned phaseIdx,
unsigned regionIdx)
{
assert(0 <= phaseIdx && phaseIdx <= numPhases);
assert(0 <= regionIdx && regionIdx <= numRegions());
assert(phaseIdx <= numPhases);
assert(regionIdx <= numRegions());
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));

26
opm/material/fluidsystems/BrineCO2FluidSystem.hpp
View File

@ -102,7 +102,7 @@ public:
"gas"
};
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
return name[phaseIdx];
}
@ -111,7 +111,7 @@ public:
*/
static bool isLiquid(unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
return phaseIdx != gasPhaseIdx;
}
@ -121,7 +121,7 @@ public:
*/
static bool isIdealGas(unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
if (phaseIdx == gasPhaseIdx)
return CO2::gasIsIdeal();
@ -133,7 +133,7 @@ public:
*/
static bool isIdealMixture(unsigned phaseIdx OPM_OPTIM_UNUSED)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
return true;
}
@ -143,7 +143,7 @@ public:
*/
static bool isCompressible(unsigned phaseIdx OPM_OPTIM_UNUSED)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
return true;
}
@ -169,7 +169,7 @@ public:
CO2::name(),
};
assert(0 <= compIdx && compIdx < numComponents);
assert(compIdx < numComponents);
return name[compIdx];
}
@ -178,7 +178,7 @@ public:
*/
static Scalar molarMass(unsigned compIdx)
{
assert(0 <= compIdx && compIdx < numComponents);
assert(compIdx < numComponents);
return (compIdx==BrineIdx)
? Brine::molarMass()
: CO2::molarMass();
@ -233,7 +233,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const LhsEval& temperature = decay<LhsEval>(fluidState.temperature(phaseIdx));
const LhsEval& pressure = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -284,7 +284,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const LhsEval& temperature = decay<LhsEval>(fluidState.temperature(phaseIdx));
const LhsEval& pressure = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -312,8 +312,8 @@ public:
unsigned phaseIdx,
unsigned compIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(0 <= compIdx && compIdx < numComponents);
assert(phaseIdx < numPhases);
assert(compIdx < numComponents);
if (phaseIdx == gasPhaseIdx)
// use the fugacity coefficients of an ideal gas. the
@ -383,7 +383,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const LhsEval& temperature = decay<LhsEval>(fluidState.temperature(phaseIdx));
const LhsEval& pressure = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -442,7 +442,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const LhsEval& temperature = decay<LhsEval>(fluidState.temperature(phaseIdx));
const LhsEval& pressure = decay<LhsEval>(fluidState.pressure(phaseIdx));

10
opm/material/fluidsystems/H2OAirFluidSystem.hpp
View File

@ -255,7 +255,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
LhsEval p;
@ -305,7 +305,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -358,8 +358,8 @@ public:
unsigned phaseIdx,
unsigned compIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(0 <= compIdx && compIdx < numComponents);
assert(phaseIdx < numPhases);
assert(compIdx < numComponents);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -430,7 +430,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const LhsEval& temperature =
decay<LhsEval>(fluidState.temperature(phaseIdx));

6
opm/material/fluidsystems/H2OAirMesityleneFluidSystem.hpp
View File

@ -368,8 +368,8 @@ public:
unsigned phaseIdx,
unsigned compIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(0 <= compIdx && compIdx < numComponents);
assert(phaseIdx < numPhases);
assert(compIdx < numComponents);
const LhsEval& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const LhsEval& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -441,7 +441,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
if (phaseIdx == waterPhaseIdx){ // water phase
const LhsEval& T = decay<LhsEval>(fluidState.temperature(phaseIdx));

4
opm/material/fluidsystems/H2OAirXyleneFluidSystem.hpp
View File

@ -322,8 +322,8 @@ public:
unsigned phaseIdx,
unsigned compIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(0 <= compIdx && compIdx < numComponents);
assert(phaseIdx < numPhases);
assert(compIdx < numComponents);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));

14
opm/material/fluidsystems/H2ON2FluidSystem.hpp
View File

@ -86,7 +86,7 @@ public:
"gas"
};
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
return name[phaseIdx];
}
@ -157,7 +157,7 @@ public:
N2::name()
};
assert(0 <= compIdx && compIdx < numComponents);
assert(compIdx < numComponents);
return name[compIdx];
}
@ -262,7 +262,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -300,7 +300,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -354,8 +354,8 @@ public:
unsigned phaseIdx,
unsigned compIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(0 <= compIdx && compIdx < numComponents);
assert(phaseIdx < numPhases);
assert(compIdx < numComponents);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -430,7 +430,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));

6
opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp
View File

@ -145,7 +145,7 @@ public:
N2::name()
};
assert(0 <= compIdx && compIdx < numComponents);
assert(compIdx < numComponents);
return name[compIdx];
}
@ -251,7 +251,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -295,7 +295,7 @@ public:
unsigned compIdx)
{
assert(phaseIdx == liquidPhaseIdx);
assert(0 <= compIdx && compIdx < numComponents);
assert(compIdx < numComponents);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));

18
opm/material/fluidsystems/SinglePhaseFluidSystem.hpp
View File

@ -76,7 +76,7 @@ public:
//! \copydoc BaseFluidSystem::phaseName
static const char* phaseName(unsigned phaseIdx OPM_OPTIM_UNUSED)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
return Fluid::name();
}
@ -126,7 +126,7 @@ public:
//! \copydoc BaseFluidSystem::componentName
static const char* componentName(unsigned compIdx OPM_OPTIM_UNUSED)
{
assert(0 <= compIdx && compIdx < numComponents);
assert(compIdx < numComponents);
return Fluid::name();
}
@ -189,7 +189,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -202,7 +202,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -216,8 +216,8 @@ public:
unsigned phaseIdx,
unsigned compIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(0 <= compIdx && compIdx < numComponents);
assert(phaseIdx < numPhases);
assert(compIdx < numComponents);
if (phaseIdx == compIdx)
// TODO (?): calculate the real fugacity coefficient of
@ -234,7 +234,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -247,7 +247,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -260,7 +260,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& T = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& p = decay<LhsEval>(fluidState.pressure(phaseIdx));

10
opm/material/fluidsystems/Spe5FluidSystem.hpp
View File

@ -94,7 +94,7 @@ public:
"oil",
};
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
return name[phaseIdx];
}
@ -363,7 +363,7 @@ public:
const ParameterCache<ParamCacheEval>& paramCache,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
return fluidState.averageMolarMass(phaseIdx)/paramCache.molarVolume(phaseIdx);
}
@ -374,7 +374,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx <= numPhases);
assert(phaseIdx <= numPhases);
if (phaseIdx == gasPhaseIdx) {
// given by SPE-5 in table on page 64. we use a constant
@ -399,8 +399,8 @@ public:
unsigned phaseIdx,
unsigned compIdx)
{
assert(0 <= phaseIdx && phaseIdx <= numPhases);
assert(0 <= compIdx && compIdx <= numComponents);
assert(phaseIdx <= numPhases);
assert(compIdx <= numComponents);
if (phaseIdx == oilPhaseIdx || phaseIdx == gasPhaseIdx)
return PengRobinsonMixture::computeFugacityCoefficient(fluidState,

18
opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp
View File

@ -83,7 +83,7 @@ public:
//! \copydoc BaseFluidSystem::phaseName
static const char* phaseName(unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
static const char* name[] = {
"wetting",
@ -149,7 +149,7 @@ public:
//! \copydoc BaseFluidSystem::componentName
static const char* componentName(unsigned compIdx)
{
assert(0 <= compIdx && compIdx < numComponents);
assert(compIdx < numComponents);
if (compIdx == wettingCompIdx)
return WettingPhase::name();
@ -225,7 +225,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& temperature = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& pressure = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -240,7 +240,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& temperature = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& pressure = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -256,8 +256,8 @@ public:
unsigned phaseIdx,
unsigned compIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(0 <= compIdx && compIdx < numComponents);
assert(phaseIdx < numPhases);
assert(compIdx < numComponents);
if (phaseIdx == compIdx)
// TODO (?): calculate the real fugacity coefficient of
@ -274,7 +274,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& temperature = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& pressure = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -289,7 +289,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& temperature = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& pressure = decay<LhsEval>(fluidState.pressure(phaseIdx));
@ -304,7 +304,7 @@ public:
const ParameterCache<ParamCacheEval>& /*paramCache*/,
unsigned phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
const auto& temperature = decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& pressure = decay<LhsEval>(fluidState.pressure(phaseIdx));

8
opm/material/thermal/EclThermalLawManager.hpp
View File

@ -94,14 +94,14 @@ public:
{
switch (solidEnergyApproach_) {
case SolidEnergyLawParams::heatcrApproach:
assert(0 <= elemIdx && elemIdx < solidEnergyLawParams_.size());
assert(elemIdx < solidEnergyLawParams_.size());
return solidEnergyLawParams_[elemIdx];
case SolidEnergyLawParams::specrockApproach:
{
assert(0 <= elemIdx && elemIdx < elemToSatnumIdx_.size());
assert(elemIdx < elemToSatnumIdx_.size());
unsigned satnumIdx = elemToSatnumIdx_[elemIdx];
assert(0 <= satnumIdx && satnumIdx < solidEnergyLawParams_.size());
assert(satnumIdx < solidEnergyLawParams_.size());
return solidEnergyLawParams_[satnumIdx];
}
@ -119,7 +119,7 @@ public:
switch (thermalConductivityApproach_) {
case ThermalConductionLawParams::thconrApproach:
case ThermalConductionLawParams::thcApproach:
assert(0 <= elemIdx && elemIdx < thermalConductionLawParams_.size());
assert(elemIdx < thermalConductionLawParams_.size());
return thermalConductionLawParams_[elemIdx];
case ThermalConductionLawParams::nullApproach:

4
opm/material/thermal/SomertonThermalConductionLawParams.hpp
View File

@ -57,7 +57,7 @@ public:
*/
Scalar fullySaturatedLambda(unsigned phaseIdx) const
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
return fullySaturatedLambda_[phaseIdx];
}
@ -71,7 +71,7 @@ public:
*/
void setFullySaturatedLambda(unsigned phaseIdx, Scalar value)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(phaseIdx < numPhases);
assert(value > 0);
fullySaturatedLambda_[phaseIdx] = value;