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

Merge pull request #3036 from akva2/use_compile_time_info

Browse Source 
changed: this is known on compile time
This commit is contained in:
Bård Skaflestad
2021-01-28 16:31:58 +01:00
committed by GitHub
parent 2a5d908c2e 9b74b5dfac
commit 3e71c6fd65
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opm/simulators/wells/BlackoilWellModel.hpp
View File

@@ -106,6 +106,8 @@ namespace Opm {
static const int numEq = Indices::numEq;
static const int solventSaturationIdx = Indices::solventSaturationIdx;
static constexpr bool has_solvent_ = getPropValue<TypeTag, Properties::EnableSolvent>();
static constexpr bool has_polymer_ = getPropValue<TypeTag, Properties::EnablePolymer>();
// TODO: where we should put these types, WellInterface or Well Model?
// or there is some other strategy, like TypeTag
@@ -315,9 +317,6 @@ namespace Opm {
const ModelParameters param_;
bool terminal_output_;
bool has_solvent_;
bool has_zFraction_;
bool has_polymer_;
std::vector<int> pvt_region_idx_;
PhaseUsage phase_usage_;
size_t global_num_cells_;

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

@@ -34,9 +34,6 @@ namespace Opm {
BlackoilWellModel<TypeTag>::
BlackoilWellModel(Simulator& ebosSimulator)
: ebosSimulator_(ebosSimulator)
, has_solvent_(getPropValue<TypeTag, Properties::EnableSolvent>())
, has_zFraction_(getPropValue<TypeTag, Properties::EnableExtbo>())
, has_polymer_(getPropValue<TypeTag, Properties::EnablePolymer>())
{
terminal_output_ = false;
if (ebosSimulator.gridView().comm().rank() == 0)
@@ -359,7 +356,7 @@ namespace Opm {
// calculate the efficiency factors for each well
calculateEfficiencyFactors(reportStepIdx);
if (has_polymer_)
if constexpr (has_polymer_)
{
if (PolymerModule::hasPlyshlog() || getPropValue<TypeTag, Properties::EnablePolymerMW>() ) {
setRepRadiusPerfLength();
@@ -1620,7 +1617,7 @@ namespace Opm {
B += 1 / fs.invB(phaseIdx).value();
}
if (has_solvent_) {
if constexpr (has_solvent_) {
auto& B = B_avg[solventSaturationIdx];
B += 1 / intQuants.solventInverseFormationVolumeFactor().value();
}
@@ -1672,7 +1669,7 @@ namespace Opm {
return numPhases();
}
int numComp = FluidSystem::numComponents;
if (has_solvent_) {
if constexpr (has_solvent_) {
numComp ++;
}