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

Merge pull request #3240 from akva2/janitoring

Browse Source 
Some janitoring
This commit is contained in:
Arne Morten Kvarving 2022-12-09 14:50:38 +01:00 committed by GitHub
commit 4eadaae69c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/material/eos/PengRobinson.hpp
View File

@ -460,12 +460,12 @@ protected:
Evaluation b4 = a4 + V*b3;
// invert resulting cubic polynomial analytically
Evaluation allV[4];
std::array<Evaluation,4> allV;
allV[0] = V;
int numSol = 1 + invertCubicPolynomial<Evaluation>(allV + 1, b1, b2, b3, b4);
int numSol = 1 + invertCubicPolynomial<Evaluation>(allV.data() + 1, b1, b2, b3, b4);
// sort all roots of the derivative
std::sort(allV + 0, allV + numSol);
std::sort(allV.begin(), allV.begin() + numSol);
// check whether the result is physical
if (numSol != 4 || allV[numSol - 2] < b) {

6
tests/test_blackoilfluidstate.cpp
View File

@ -44,7 +44,7 @@ int main()
typedef typename Opm::BlackOilFluidSystem<Scalar> FluidSystem;
typedef Opm::BlackOilFluidState<Scalar, FluidSystem> FluidState;
FluidState fs;
FluidState fs{};
checkFluidState<Evaluation>(fs);
}
@ -54,7 +54,7 @@ int main()
typedef typename Opm::BlackOilFluidSystem<Scalar> FluidSystem;
typedef Opm::BlackOilFluidState<Scalar, FluidSystem> FluidState;
FluidState fs;
FluidState fs{};
checkFluidState<Evaluation>(fs);
}
@ -64,7 +64,7 @@ int main()
typedef typename Opm::BlackOilFluidSystem<Scalar> FluidSystem;
typedef Opm::BlackOilFluidState<Evaluation, FluidSystem> FluidState;
FluidState fs;
FluidState fs{};
checkFluidState<Evaluation>(fs);
}