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

Merge pull request #402 from akva2/use_array

Browse Source 
changed: use std::array instead of C arrays
This commit is contained in:
Bård Skaflestad 2020-02-24 08:16:24 -06:00 committed by GitHub
commit 14286eca07
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/material/fluidstates/FluidStateCompositionModules.hpp
View File

@ -34,6 +34,7 @@
#include <opm/material/common/Exceptions.hpp> #include <opm/material/common/Exceptions.hpp>
#include <algorithm> #include <algorithm>
#include <array>
#include <cmath> #include <cmath>
namespace Opm { namespace Opm {
@ -165,9 +166,9 @@ protected:
const Implementation& asImp_() const const Implementation& asImp_() const
{ return *static_cast<const Implementation*>(this); } { return *static_cast<const Implementation*>(this); }
Scalar moleFraction_[numPhases][numComponents]; std::array<std::array<Scalar,numComponents>,numPhases> moleFraction_;
Scalar averageMolarMass_[numPhases]; std::array<Scalar,numPhases> averageMolarMass_;
Scalar sumMoleFractions_[numPhases]; std::array<Scalar,numPhases> sumMoleFractions_;
}; };
/*! /*!