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

EclProblem: some modernization

Browse Source 
- use if constexpr
This commit is contained in:
Arne Morten Kvarving 2022-08-10 12:34:51 +02:00
parent 17dc99f3cd
commit 58b71c94af
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ebos/eclproblem.hh
View File

@ -869,10 +869,10 @@ public:
#ifdef HAVE_DUNE_ALUGRID #ifdef HAVE_DUNE_ALUGRID
using Grid = GetPropType<TypeTag, Properties::Grid>; using Grid = GetPropType<TypeTag, Properties::Grid>;
typename std::is_same<Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>>::type isAlugrid; typename std::is_same<Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>>::type isAlugrid;
if (isAlugrid) { if constexpr (isAlugrid) {
gridToEquilGrid = [&simulator](unsigned int i) { gridToEquilGrid = [&simulator](unsigned int i) {
return simulator.vanguard().gridIdxToEquilGridIdx(i); return simulator.vanguard().gridIdxToEquilGridIdx(i);
}; };
} }
#endif // HAVE_DUNE_ALUGRID #endif // HAVE_DUNE_ALUGRID
transmissibilities_.finishInit(gridToEquilGrid); transmissibilities_.finishInit(gridToEquilGrid);
@ -1046,10 +1046,10 @@ public:
using Grid = GetPropType<TypeTag, Properties::Grid>; using Grid = GetPropType<TypeTag, Properties::Grid>;
typename std::is_same<Grid, Dune::ALUGrid<3, 3, Dune::cube, typename std::is_same<Grid, Dune::ALUGrid<3, 3, Dune::cube,
Dune::nonconforming>>::type isAlugrid; Dune::nonconforming>>::type isAlugrid;
if (isAlugrid) { if constexpr (isAlugrid) {
equilGridToGrid = [&simulator](unsigned int i) { equilGridToGrid = [&simulator](unsigned int i) {
return simulator.vanguard().gridEquilIdxToGridIdx(i); return simulator.vanguard().gridEquilIdxToGridIdx(i);
}; };
} }
#endif // HAVE_DUNE_ALUGRID #endif // HAVE_DUNE_ALUGRID
@ -1197,10 +1197,10 @@ public:
#ifdef HAVE_DUNE_ALUGRID #ifdef HAVE_DUNE_ALUGRID
using Grid = GetPropType<TypeTag, Properties::Grid>; using Grid = GetPropType<TypeTag, Properties::Grid>;
typename std::is_same<Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>>::type isAlugrid; typename std::is_same<Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>>::type isAlugrid;
if (isAlugrid) { if constexpr (isAlugrid) {
gridToEquilGrid = [&simulator](unsigned int i) { gridToEquilGrid = [&simulator](unsigned int i) {
return simulator.vanguard().gridIdxToEquilGridIdx(i); return simulator.vanguard().gridIdxToEquilGridIdx(i);
}; };
} }
#endif // HAVE_DUNE_ALUGRID #endif // HAVE_DUNE_ALUGRID
@ -2700,11 +2700,11 @@ private:
tempiData = fp.get_double("TEMPI"); tempiData = fp.get_double("TEMPI");
// initial salt concentration data // initial salt concentration data
if (enableBrine) if constexpr (enableBrine)
saltData = fp.get_double("SALT"); saltData = fp.get_double("SALT");
// initial precipitated salt saturation data // initial precipitated salt saturation data
if (enableSaltPrecipitation) if constexpr (enableSaltPrecipitation)
saltpData = fp.get_double("SALTP"); saltpData = fp.get_double("SALTP");
// calculate the initial fluid states // calculate the initial fluid states
@ -2724,13 +2724,13 @@ private:
////// //////
// set salt concentration // set salt concentration
////// //////
if (enableBrine) if constexpr (enableBrine)
dofFluidState.setSaltConcentration(saltData[dofIdx]); dofFluidState.setSaltConcentration(saltData[dofIdx]);
////// //////
// set precipitated salt saturation // set precipitated salt saturation
////// //////
if (enableSaltPrecipitation) if constexpr (enableSaltPrecipitation)
dofFluidState.setSaltSaturation(saltpData[dofIdx]); dofFluidState.setSaltSaturation(saltpData[dofIdx]);
////// //////