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

eclproblem: replace typedef with using

Browse Source
This commit is contained in:
Arne Morten Kvarving 2021-05-26 14:24:16 +02:00
parent df4fdc9794
commit b51f57a5c3
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ebos/eclproblem.hh
View File

@ -246,15 +246,15 @@ private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef ThreePhaseMaterialTraits<Scalar, using Traits = ThreePhaseMaterialTraits<Scalar,
/*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx, /*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
/*nonWettingPhaseIdx=*/FluidSystem::oilPhaseIdx, /*nonWettingPhaseIdx=*/FluidSystem::oilPhaseIdx,
/*gasPhaseIdx=*/FluidSystem::gasPhaseIdx> Traits; /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
public: public:
typedef ::Opm::EclMaterialLawManager<Traits> EclMaterialLawManager; using EclMaterialLawManager = ::Opm::EclMaterialLawManager<Traits>;
typedef typename EclMaterialLawManager::MaterialLaw type; using type = typename EclMaterialLawManager::MaterialLaw;
}; };
// Set the material law for energy storage in rock // Set the material law for energy storage in rock
@ -266,9 +266,9 @@ private:
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
public: public:
typedef ::Opm::EclThermalLawManager<Scalar, FluidSystem> EclThermalLawManager; using EclThermalLawManager = ::Opm::EclThermalLawManager<Scalar, FluidSystem>;
typedef typename EclThermalLawManager::SolidEnergyLaw type; using type = typename EclThermalLawManager::SolidEnergyLaw;
}; };
// Set the material law for thermal conduction // Set the material law for thermal conduction
@ -280,9 +280,9 @@ private:
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
public: public:
typedef ::Opm::EclThermalLawManager<Scalar, FluidSystem> EclThermalLawManager; using EclThermalLawManager = ::Opm::EclThermalLawManager<Scalar, FluidSystem>;
typedef typename EclThermalLawManager::ThermalConductionLaw type; using type = typename EclThermalLawManager::ThermalConductionLaw;
}; };
// ebos can use a slightly faster stencil class because it does not need the normals and // ebos can use a slightly faster stencil class because it does not need the normals and
@ -295,10 +295,10 @@ private:
using GridView = GetPropType<TypeTag, Properties::GridView>; using GridView = GetPropType<TypeTag, Properties::GridView>;
public: public:
typedef EcfvStencil<Scalar, using type = EcfvStencil<Scalar,
GridView, GridView,
/*needIntegrationPos=*/false, /*needIntegrationPos=*/false,
/*needNormal=*/false> type; /*needNormal=*/false>;
}; };
// by default use the dummy aquifer "model" // by default use the dummy aquifer "model"
@ -660,25 +660,25 @@ class EclProblem : public GetPropType<TypeTag, Properties::BaseProblem>
using EclWellModel = GetPropType<TypeTag, Properties::EclWellModel>; using EclWellModel = GetPropType<TypeTag, Properties::EclWellModel>;
using EclAquiferModel = GetPropType<TypeTag, Properties::EclAquiferModel>; using EclAquiferModel = GetPropType<TypeTag, Properties::EclAquiferModel>;
typedef BlackOilSolventModule<TypeTag> SolventModule; using SolventModule = BlackOilSolventModule<TypeTag>;
typedef BlackOilPolymerModule<TypeTag> PolymerModule; using PolymerModule = BlackOilPolymerModule<TypeTag>;
typedef BlackOilFoamModule<TypeTag> FoamModule; using FoamModule = BlackOilFoamModule<TypeTag>;
typedef BlackOilBrineModule<TypeTag> BrineModule; using BrineModule = BlackOilBrineModule<TypeTag>;
typedef BlackOilExtboModule<TypeTag> ExtboModule; using ExtboModule = BlackOilExtboModule<TypeTag>;
typedef typename EclEquilInitializer<TypeTag>::ScalarFluidState InitialFluidState; using InitialFluidState = typename EclEquilInitializer<TypeTag>::ScalarFluidState;
typedef MathToolbox<Evaluation> Toolbox; using Toolbox = MathToolbox<Evaluation>;
typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix; using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
typedef EclWriter<TypeTag> EclWriterType; using EclWriterType = EclWriter<TypeTag>;
typedef EclTracerModel<TypeTag> TracerModel; using TracerModel = EclTracerModel<TypeTag>;
typedef typename GridView::template Codim<0>::Iterator ElementIterator; using ElementIterator = typename GridView::template Codim<0>::Iterator;
typedef UniformXTabulated2DFunction<Scalar> TabulatedTwoDFunction; using TabulatedTwoDFunction = UniformXTabulated2DFunction<Scalar>;
typedef Tabulated1DFunction<Scalar> TabulatedFunction; using TabulatedFunction = Tabulated1DFunction<Scalar>;
struct RockParams { struct RockParams {
Scalar referencePressure; Scalar referencePressure;
@ -2436,7 +2436,7 @@ private:
const auto& iq = elemCtx.intensiveQuantities(/*spaceIdx=*/0, /*timeIdx=*/0); const auto& iq = elemCtx.intensiveQuantities(/*spaceIdx=*/0, /*timeIdx=*/0);
const auto& fs = iq.fluidState(); const auto& fs = iq.fluidState();
typedef typename std::decay<decltype(fs)>::type FluidState; using FluidState = typename std::decay<decltype(fs)>::type;
int pvtRegionIdx = pvtRegionIndex(compressedDofIdx); int pvtRegionIdx = pvtRegionIndex(compressedDofIdx);
int episodeIdx = std::max(simulator.episodeIndex(), 0); int episodeIdx = std::max(simulator.episodeIndex(), 0);
@ -2468,7 +2468,7 @@ private:
const auto& iq = elemCtx.intensiveQuantities(/*spaceIdx=*/0, /*timeIdx=*/0); const auto& iq = elemCtx.intensiveQuantities(/*spaceIdx=*/0, /*timeIdx=*/0);
const auto& fs = iq.fluidState(); const auto& fs = iq.fluidState();
typedef typename std::decay<decltype(fs)>::type FluidState; using FluidState = typename std::decay<decltype(fs)>::type;
lastRv_[compressedDofIdx] = lastRv_[compressedDofIdx] =
BlackOil::template getRv_<FluidSystem, BlackOil::template getRv_<FluidSystem,
@ -2823,7 +2823,7 @@ private:
const auto& simulator = this->simulator(); const auto& simulator = this->simulator();
// initial condition corresponds to hydrostatic conditions. // initial condition corresponds to hydrostatic conditions.
typedef EclEquilInitializer<TypeTag> EquilInitializer; using EquilInitializer = EclEquilInitializer<TypeTag>;
EquilInitializer equilInitializer(simulator, *materialLawManager_); EquilInitializer equilInitializer(simulator, *materialLawManager_);
size_t numElems = this->model().numGridDof(); size_t numElems = this->model().numGridDof();