OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-26 19:46:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4031 from akva2/use_std_array

Browse Source 
changed: consistently use std::array
This commit is contained in:
Bård Skaflestad 2022-08-26 10:14:17 +02:00 committed by GitHub
commit 949bb6ecb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebos/eclfluxmodule.hh
View File

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

4
opm/simulators/wells/MultisegmentWell_impl.hpp
View File

@ -1148,7 +1148,7 @@ namespace Opm
} else {
const auto& paramsCell = materialLawManager->connectionMaterialLawParams(satid, cell_idx);
Eval relativePerms[3] = { 0.0, 0.0, 0.0 };
std::array<Eval,3> relativePerms = { 0.0, 0.0, 0.0 };
MaterialLaw::relativePermeabilities(relativePerms, paramsCell, intQuants.fluidState());
// reset the satnumvalue back to original
@ -1200,7 +1200,7 @@ namespace Opm
} else {
const auto& paramsCell = materialLawManager->connectionMaterialLawParams(satid, cell_idx);
Scalar relativePerms[3] = { 0.0, 0.0, 0.0 };
std::array<Scalar,3> relativePerms = { 0.0, 0.0, 0.0 };
MaterialLaw::relativePermeabilities(relativePerms, paramsCell, intQuants.fluidState());
// reset the satnumvalue back to original

4
opm/simulators/wells/StandardWell_impl.hpp
View File

@ -812,7 +812,7 @@ namespace Opm
} else {
const auto& paramsCell = materialLawManager->connectionMaterialLawParams(satid, cell_idx);
Eval relativePerms[3] = { 0.0, 0.0, 0.0 };
std::array<Eval,3> relativePerms = { 0.0, 0.0, 0.0 };
MaterialLaw::relativePermeabilities(relativePerms, paramsCell, intQuants.fluidState());
// reset the satnumvalue back to original
@ -881,7 +881,7 @@ namespace Opm
} else {
const auto& paramsCell = materialLawManager->connectionMaterialLawParams(satid, cell_idx);
Eval relativePerms[3] = { 0.0, 0.0, 0.0 };
std::array<Eval,3> relativePerms = { 0.0, 0.0, 0.0 };
MaterialLaw::relativePermeabilities(relativePerms, paramsCell, intQuants.fluidState());
// reset the satnumvalue back to original