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: remove GET_PROP_VALUE macro usage

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-08-27 09:13:30 +02:00
parent 70805ca1d4
commit 914053ac3c
30 changed files with 111 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/simulators/aquifers/AquiferInterface.hpp
View File

@@ -51,9 +51,9 @@ public:
using RateVector = GetPropType<TypeTag, Properties::RateVector>;
using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
enum { enableTemperature = GET_PROP_VALUE(TypeTag, EnableTemperature) };
enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) };
enum { enableBrine = GET_PROP_VALUE(TypeTag, EnableBrine) };
enum { enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>() };
enum { enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>() };
enum { enableBrine = getPropValue<TypeTag, Properties::EnableBrine>() };
static const int numEq = BlackoilIndices::numEq;
typedef double Scalar;

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

@@ -164,12 +164,12 @@ namespace Opm {
, phaseUsage_(phaseUsageFromDeck(eclState()))
, has_disgas_(FluidSystem::enableDissolvedGas())
, has_vapoil_(FluidSystem::enableVaporizedOil())
, has_solvent_(GET_PROP_VALUE(TypeTag, EnableSolvent))
, has_polymer_(GET_PROP_VALUE(TypeTag, EnablePolymer))
, has_polymermw_(GET_PROP_VALUE(TypeTag, EnablePolymerMW))
, has_energy_(GET_PROP_VALUE(TypeTag, EnableEnergy))
, has_foam_(GET_PROP_VALUE(TypeTag, EnableFoam))
, has_brine_(GET_PROP_VALUE(TypeTag, EnableBrine))
, has_solvent_(getPropValue<TypeTag, Properties::EnableSolvent>())
, has_polymer_(getPropValue<TypeTag, Properties::EnablePolymer>())
, has_polymermw_(getPropValue<TypeTag, Properties::EnablePolymerMW>())
, has_energy_(getPropValue<TypeTag, Properties::EnableEnergy>())
, has_foam_(getPropValue<TypeTag, Properties::EnableFoam>())
, has_brine_(getPropValue<TypeTag, Properties::EnableBrine>())
, param_( param )
, well_model_ (well_model)
, terminal_output_ (terminal_output)

2
opm/simulators/linalg/ISTLSolverEbos.hpp
View File

@@ -67,7 +67,7 @@ SET_PROP(FlowIstlSolver, SparseMatrixAdapter)
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
enum { numEq = getPropValue<TypeTag, Properties::NumEq>() };
typedef Opm::MatrixBlock<Scalar, numEq, numEq> Block;
public:

8
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@@ -29,8 +29,8 @@ namespace Opm {
BlackoilWellModel<TypeTag>::
BlackoilWellModel(Simulator& ebosSimulator)
: ebosSimulator_(ebosSimulator)
, has_solvent_(GET_PROP_VALUE(TypeTag, EnableSolvent))
, has_polymer_(GET_PROP_VALUE(TypeTag, EnablePolymer))
, has_solvent_(getPropValue<TypeTag, Properties::EnableSolvent>())
, has_polymer_(getPropValue<TypeTag, Properties::EnablePolymer>())
{
terminal_output_ = false;
if (ebosSimulator.gridView().comm().rank() == 0)
@@ -350,7 +350,7 @@ namespace Opm {
if (has_polymer_)
{
const Grid& grid = ebosSimulator_.vanguard().grid();
if (PolymerModule::hasPlyshlog() || GET_PROP_VALUE(TypeTag, EnablePolymerMW) ) {
if (PolymerModule::hasPlyshlog() || getPropValue<TypeTag, Properties::EnablePolymerMW>() ) {
computeRepRadiusPerfLength(grid, local_deferredLogger);
}
}
@@ -446,7 +446,7 @@ namespace Opm {
Opm::DeferredLogger local_deferredLogger;
for (const auto& well : well_container_) {
if (GET_PROP_VALUE(TypeTag, EnablePolymerMW) && well->isInjector()) {
if (getPropValue<TypeTag, Properties::EnablePolymerMW>() && well->isInjector()) {
well->updateWaterThroughput(dt, well_state_);
}
}

2
opm/simulators/wells/MultisegmentWell.hpp
View File

@@ -69,7 +69,7 @@ namespace Opm
static const int SPres = gasoil? 2 : 3;
/// the number of well equations // TODO: it should have a more general strategy for it
static const int numWellEq = GET_PROP_VALUE(TypeTag, EnablePolymer)? numEq : numEq + 1;
static const int numWellEq = getPropValue<TypeTag, Properties::EnablePolymer>() ? numEq : numEq + 1;
using typename Base::Scalar;

14
opm/simulators/wells/WellInterface.hpp
View File

@@ -91,14 +91,14 @@ namespace Opm
typedef Dune::BlockVector<VectorBlockType> BVector;
typedef DenseAd::Evaluation<double, /*size=*/numEq> Eval;
static const bool has_solvent = GET_PROP_VALUE(TypeTag, EnableSolvent);
static const bool has_polymer = GET_PROP_VALUE(TypeTag, EnablePolymer);
static const bool has_energy = GET_PROP_VALUE(TypeTag, EnableEnergy);
static const bool has_temperature = GET_PROP_VALUE(TypeTag, EnableTemperature);
static const bool has_solvent = getPropValue<TypeTag, Properties::EnableSolvent>();
static const bool has_polymer = getPropValue<TypeTag, Properties::EnablePolymer>();
static const bool has_energy = getPropValue<TypeTag, Properties::EnableEnergy>();
static const bool has_temperature = getPropValue<TypeTag, Properties::EnableTemperature>();
// flag for polymer molecular weight related
static const bool has_polymermw = GET_PROP_VALUE(TypeTag, EnablePolymerMW);
static const bool has_foam = GET_PROP_VALUE(TypeTag, EnableFoam);
static const bool has_brine = GET_PROP_VALUE(TypeTag, EnableBrine);
static const bool has_polymermw = getPropValue<TypeTag, Properties::EnablePolymerMW>();
static const bool has_foam = getPropValue<TypeTag, Properties::EnableFoam>();
static const bool has_brine = getPropValue<TypeTag, Properties::EnableBrine>();
static const int contiSolventEqIdx = Indices::contiSolventEqIdx;
static const int contiPolymerEqIdx = Indices::contiPolymerEqIdx;
// index for the polymer molecular weight continuity equation