OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

changed: consistently use std::array

Browse Source
This commit is contained in:
Arne Morten Kvarving 2022-08-26 08:27:26 +02:00
parent 758473ffd8
commit 1058b371da
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/models/blackoil/blackoilintensivequantities.hh
View File

@ -596,7 +596,7 @@ private:
Scalar referencePorosity_; Scalar referencePorosity_;
Evaluation porosity_; Evaluation porosity_;
Evaluation rockCompTransMultiplier_; Evaluation rockCompTransMultiplier_;
Evaluation mobility_[numPhases]; std::array<Evaluation,numPhases> mobility_;
}; };
} // namespace Opm } // namespace Opm

2
opm/models/common/transfluxmodule.hh
View File

@ -400,7 +400,7 @@ protected:
elemCtx.problem().materialLawParams(elemCtx, elemCtx.problem().materialLawParams(elemCtx,
interiorDofIdx_, interiorDofIdx_,
/*timeIdx=*/0); /*timeIdx=*/0);
typename FluidState::Scalar kr[numPhases]; std::array<typename FluidState::Scalar,numPhases> kr;
MaterialLaw::relativePermeabilities(kr, matParams, exFluidState); MaterialLaw::relativePermeabilities(kr, matParams, exFluidState);
const auto& mob = kr[phaseIdx]/exFluidState.viscosity(phaseIdx); const auto& mob = kr[phaseIdx]/exFluidState.viscosity(phaseIdx);

4
opm/models/flash/flashintensivequantities.hh
View File

@ -208,8 +208,8 @@ private:
DimMatrix intrinsicPerm_; DimMatrix intrinsicPerm_;
FluidState fluidState_; FluidState fluidState_;
Evaluation porosity_; Evaluation porosity_;
Evaluation relativePermeability_[numPhases]; std::array<Evaluation,numPhases> relativePermeability_;
Evaluation mobility_[numPhases]; std::array<Evaluation,numPhases> mobility_;
}; };
} // namespace Opm } // namespace Opm

4
opm/models/richards/richardsintensivequantities.hh
View File

@ -189,8 +189,8 @@ public:
private: private:
FluidState fluidState_; FluidState fluidState_;
DimMatrix intrinsicPerm_; DimMatrix intrinsicPerm_;
Evaluation relativePermeability_[numPhases]; std::array<Evaluation,numPhases> relativePermeability_;
Evaluation mobility_[numPhases]; std::array<Evaluation,numPhases> mobility_;
Evaluation porosity_; Evaluation porosity_;
}; };