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

BlackoilModelEbos: prefer using

Browse Source
This commit is contained in:
Arne Morten Kvarving 2023-03-03 13:25:46 +01:00
parent b29f24c9be
commit 5874377937
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
opm/simulators/flow/BlackoilModelEbos.hpp
View File

@ -160,7 +160,7 @@ namespace Opm {
{ {
public: public:
// --------- Types and enums --------- // --------- Types and enums ---------
typedef BlackoilModelParametersEbos<TypeTag> ModelParameters; using ModelParameters = BlackoilModelParametersEbos<TypeTag>;
using Simulator = GetPropType<TypeTag, Properties::Simulator>; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
using Grid = GetPropType<TypeTag, Properties::Grid>; using Grid = GetPropType<TypeTag, Properties::Grid>;
@ -172,8 +172,8 @@ namespace Opm {
using Indices = GetPropType<TypeTag, Properties::Indices>; using Indices = GetPropType<TypeTag, Properties::Indices>;
using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>; using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>; using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef double Scalar;
static const int numEq = Indices::numEq; static const int numEq = Indices::numEq;
static const int contiSolventEqIdx = Indices::contiSolventEqIdx; static const int contiSolventEqIdx = Indices::contiSolventEqIdx;
static const int contiZfracEqIdx = Indices::contiZfracEqIdx; static const int contiZfracEqIdx = Indices::contiZfracEqIdx;
@ -200,14 +200,14 @@ namespace Opm {
static const int biofilmConcentrationIdx = Indices::biofilmConcentrationIdx; static const int biofilmConcentrationIdx = Indices::biofilmConcentrationIdx;
static const int calciteConcentrationIdx = Indices::calciteConcentrationIdx; static const int calciteConcentrationIdx = Indices::calciteConcentrationIdx;
typedef Dune::FieldVector<Scalar, numEq > VectorBlockType; using VectorBlockType = Dune::FieldVector<Scalar, numEq>;
typedef typename SparseMatrixAdapter::MatrixBlock MatrixBlockType; using MatrixBlockType = typename SparseMatrixAdapter::MatrixBlock;
typedef typename SparseMatrixAdapter::IstlMatrix Mat; using Mat = typename SparseMatrixAdapter::IstlMatrix;
typedef Dune::BlockVector<VectorBlockType> BVector; using BVector = Dune::BlockVector<VectorBlockType>;
using Domain = SubDomain<Grid>; using Domain = SubDomain<Grid>;
typedef ISTLSolverEbos<TypeTag> ISTLSolverType; using ISTLSolverType = ISTLSolverEbos<TypeTag>;
class ComponentName class ComponentName
{ {
@ -272,8 +272,6 @@ namespace Opm {
std::vector<std::string> names_{}; std::vector<std::string> names_{};
}; };
//typedef typename SolutionVector :: value_type PrimaryVariables ;
// --------- Public methods --------- // --------- Public methods ---------
/// Construct the model. It will retain references to the /// Construct the model. It will retain references to the
@ -1709,7 +1707,7 @@ namespace Opm {
std::vector<Scalar>& residual_norms) std::vector<Scalar>& residual_norms)
{ {
OPM_TIMEBLOCK(getReservoirConvergence); OPM_TIMEBLOCK(getReservoirConvergence);
typedef std::vector< Scalar > Vector; using Vector = std::vector<Scalar>;
const int numComp = numEq; const int numComp = numEq;
Vector R_sum(numComp, 0.0 ); Vector R_sum(numComp, 0.0 );