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

MultisegmentWellSegments: remove unnecessary Scalar template parameter

Browse Source 
use the Scalar type from the FluidSystem
This commit is contained in:
Arne Morten Kvarving 2024-02-22 15:17:09 +01:00
parent 58e8022bb1
commit 215d22730b
3 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ protected:
static constexpr int WQTotal = PrimaryVariables::WQTotal; static constexpr int WQTotal = PrimaryVariables::WQTotal;
using Equations = MultisegmentWellEquations<Scalar,numWellEq,Indices::numEq>; using Equations = MultisegmentWellEquations<Scalar,numWellEq,Indices::numEq>;
using MSWSegments = MultisegmentWellSegments<FluidSystem,Indices,Scalar>; using MSWSegments = MultisegmentWellSegments<FluidSystem,Indices>;
using BVector = typename Equations::BVector; using BVector = typename Equations::BVector;
using BVectorWell = typename Equations::BVectorWell; using BVectorWell = typename Equations::BVectorWell;

82
opm/simulators/wells/MultisegmentWellSegments.cpp
View File

@ -58,8 +58,8 @@
namespace Opm namespace Opm
{ {
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices>
MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: MultisegmentWellSegments<FluidSystem,Indices>::
MultisegmentWellSegments(const int numSegments, MultisegmentWellSegments(const int numSegments,
WellInterfaceGeneric& well) WellInterfaceGeneric& well)
: perforations_(numSegments) : perforations_(numSegments)
@ -129,8 +129,8 @@ MultisegmentWellSegments(const int numSegments,
} }
} }
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices>
void MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: void MultisegmentWellSegments<FluidSystem,Indices>::
computeFluidProperties(const EvalWell& temperature, computeFluidProperties(const EvalWell& temperature,
const EvalWell& saltConcentration, const EvalWell& saltConcentration,
const PrimaryVariables& primary_variables, const PrimaryVariables& primary_variables,
@ -306,8 +306,8 @@ computeFluidProperties(const EvalWell& temperature,
} }
} }
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices>
void MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: void MultisegmentWellSegments<FluidSystem,Indices>::
updateUpwindingSegments(const PrimaryVariables& primary_variables) updateUpwindingSegments(const PrimaryVariables& primary_variables)
{ {
for (std::size_t seg = 0; seg < perforations_.size(); ++seg) { for (std::size_t seg = 0; seg < perforations_.size(); ++seg) {
@ -331,26 +331,27 @@ updateUpwindingSegments(const PrimaryVariables& primary_variables)
} }
} }
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices>
typename MultisegmentWellSegments<FluidSystem,Indices,Scalar>::EvalWell typename MultisegmentWellSegments<FluidSystem,Indices>::EvalWell
MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: MultisegmentWellSegments<FluidSystem,Indices>::
getHydroPressureLoss(const int seg, getHydroPressureLoss(const int seg,
const int seg_density) const const int seg_density) const
{ {
return densities_[seg_density] * well_.gravity() * depth_diffs_[seg]; return densities_[seg_density] * well_.gravity() * depth_diffs_[seg];
} }
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices>
Scalar MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: typename MultisegmentWellSegments<FluidSystem,Indices>::Scalar
MultisegmentWellSegments<FluidSystem,Indices>::
getPressureDiffSegPerf(const int seg, getPressureDiffSegPerf(const int seg,
const int perf) const const int perf) const
{ {
return well_.gravity() * densities_[seg].value() * perforation_depth_diffs_[perf]; return well_.gravity() * densities_[seg].value() * perforation_depth_diffs_[perf];
} }
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices>
typename MultisegmentWellSegments<FluidSystem,Indices,Scalar>::EvalWell typename MultisegmentWellSegments<FluidSystem,Indices>::EvalWell
MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: MultisegmentWellSegments<FluidSystem,Indices>::
getSurfaceVolume(const EvalWell& temperature, getSurfaceVolume(const EvalWell& temperature,
const EvalWell& saltConcentration, const EvalWell& saltConcentration,
const PrimaryVariables& primary_variables, const PrimaryVariables& primary_variables,
@ -495,9 +496,9 @@ getSurfaceVolume(const EvalWell& temperature,
return volume / vol_ratio; return volume / vol_ratio;
} }
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices>
typename MultisegmentWellSegments<FluidSystem,Indices,Scalar>::EvalWell typename MultisegmentWellSegments<FluidSystem,Indices>::EvalWell
MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: MultisegmentWellSegments<FluidSystem,Indices>::
getFrictionPressureLoss(const int seg, getFrictionPressureLoss(const int seg,
const bool extra_reverse_flow_derivatives /*false*/) const const bool extra_reverse_flow_derivatives /*false*/) const
{ {
@ -547,9 +548,9 @@ getFrictionPressureLoss(const int seg,
return sign * mswellhelpers::frictionPressureLoss(length, diameter, area, roughness, density, mass_rate, visc); return sign * mswellhelpers::frictionPressureLoss(length, diameter, area, roughness, density, mass_rate, visc);
} }
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices>
typename MultisegmentWellSegments<FluidSystem,Indices,Scalar>::EvalWell typename MultisegmentWellSegments<FluidSystem,Indices>::EvalWell
MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: MultisegmentWellSegments<FluidSystem,Indices>::
pressureDropSpiralICD(const int seg, pressureDropSpiralICD(const int seg,
const bool extra_reverse_flow_derivatives /*false*/) const const bool extra_reverse_flow_derivatives /*false*/) const
{ {
@ -651,9 +652,9 @@ pressureDropSpiralICD(const int seg,
return sign * temp_value1 * temp_value2 * strength * reservoir_rate_icd * reservoir_rate_icd; return sign * temp_value1 * temp_value2 * strength * reservoir_rate_icd * reservoir_rate_icd;
} }
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices>
typename MultisegmentWellSegments<FluidSystem,Indices,Scalar>::EvalWell typename MultisegmentWellSegments<FluidSystem,Indices>::EvalWell
MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: MultisegmentWellSegments<FluidSystem,Indices>::
pressureDropAutoICD(const int seg, pressureDropAutoICD(const int seg,
const UnitSystem& unit_system, const UnitSystem& unit_system,
const bool extra_reverse_flow_derivatives /*false*/) const const bool extra_reverse_flow_derivatives /*false*/) const
@ -765,9 +766,9 @@ pressureDropAutoICD(const int seg,
return result; return result;
} }
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices>
typename MultisegmentWellSegments<FluidSystem,Indices,Scalar>::EvalWell typename MultisegmentWellSegments<FluidSystem,Indices>::EvalWell
MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: MultisegmentWellSegments<FluidSystem,Indices>::
pressureDropValve(const int seg, pressureDropValve(const int seg,
const SummaryState& summary_state, const SummaryState& summary_state,
const bool extra_reverse_flow_derivatives /*false*/) const const bool extra_reverse_flow_derivatives /*false*/) const
@ -826,9 +827,9 @@ pressureDropValve(const int seg,
return sign * (friction_pressure_loss + constriction_pressure_loss); return sign * (friction_pressure_loss + constriction_pressure_loss);
} }
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices>
typename MultisegmentWellSegments<FluidSystem,Indices,Scalar>::EvalWell typename MultisegmentWellSegments<FluidSystem,Indices>::EvalWell
MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: MultisegmentWellSegments<FluidSystem,Indices>::
accelerationPressureLossContribution(const int seg, accelerationPressureLossContribution(const int seg,
const double area, const double area,
const bool extra_reverse_flow_derivatives /*false*/) const const bool extra_reverse_flow_derivatives /*false*/) const
@ -860,9 +861,9 @@ accelerationPressureLossContribution(const int seg,
return sign*mswellhelpers::velocityHead(area, mass_rate, density); return sign*mswellhelpers::velocityHead(area, mass_rate, density);
} }
template <class FluidSystem, class Indices, class Scalar> template <class FluidSystem, class Indices>
void void
MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: MultisegmentWellSegments<FluidSystem,Indices>::
copyPhaseDensities(const PhaseUsage& pu, SegmentState& segSol) const copyPhaseDensities(const PhaseUsage& pu, SegmentState& segSol) const
{ {
auto* rho = segSol.phase_density.data(); auto* rho = segSol.phase_density.data();
@ -895,9 +896,9 @@ copyPhaseDensities(const PhaseUsage& pu, SegmentState& segSol) const
} }
} }
template <class FluidSystem, class Indices, class Scalar> template <class FluidSystem, class Indices>
void void
MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: MultisegmentWellSegments<FluidSystem,Indices>::
copyPhaseDensities(const unsigned phaseIdx, copyPhaseDensities(const unsigned phaseIdx,
const std::size_t stride, const std::size_t stride,
double* dens) const double* dens) const
@ -911,9 +912,9 @@ copyPhaseDensities(const unsigned phaseIdx,
} }
} }
template <class FluidSystem, class Indices, class Scalar> template <class FluidSystem, class Indices>
double double
MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: MultisegmentWellSegments<FluidSystem,Indices>::
mixtureDensity(const int seg) const mixtureDensity(const int seg) const
{ {
auto mixDens = 0.0; auto mixDens = 0.0;
@ -940,9 +941,9 @@ mixtureDensity(const int seg) const
return mixDens; return mixDens;
} }
template <class FluidSystem, class Indices, class Scalar> template <class FluidSystem, class Indices>
double double
MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: MultisegmentWellSegments<FluidSystem,Indices>::
mixtureDensityWithExponents(const int seg) const mixtureDensityWithExponents(const int seg) const
{ {
if (const auto& segment = this->well_.wellEcl().getSegments()[seg]; if (const auto& segment = this->well_.wellEcl().getSegments()[seg];
@ -956,9 +957,9 @@ mixtureDensityWithExponents(const int seg) const
return this->mixtureDensity(seg); return this->mixtureDensity(seg);
} }
template <class FluidSystem, class Indices, class Scalar> template <class FluidSystem, class Indices>
double double
MultisegmentWellSegments<FluidSystem,Indices,Scalar>:: MultisegmentWellSegments<FluidSystem,Indices>::
mixtureDensityWithExponents(const AutoICD& aicd, const int seg) const mixtureDensityWithExponents(const AutoICD& aicd, const int seg) const
{ {
auto mixDens = 0.0; auto mixDens = 0.0;
@ -988,7 +989,7 @@ mixtureDensityWithExponents(const AutoICD& aicd, const int seg) const
} }
#define INSTANCE(...) \ #define INSTANCE(...) \
template class MultisegmentWellSegments<BlackOilFluidSystem<double,BlackOilDefaultIndexTraits>,__VA_ARGS__,double>; template class MultisegmentWellSegments<BlackOilFluidSystem<double,BlackOilDefaultIndexTraits>,__VA_ARGS__>;
// One phase // One phase
INSTANCE(BlackOilOnePhaseIndices<0u,0u,0u,0u,false,false,0u,1u,0u>) INSTANCE(BlackOilOnePhaseIndices<0u,0u,0u,0u,false,false,0u,1u,0u>)
@ -1007,6 +1008,7 @@ INSTANCE(BlackOilTwoPhaseIndices<0u,0u,0u,0u,false,true,0u,0u,0u>)
INSTANCE(BlackOilTwoPhaseIndices<0u,0u,0u,1u,false,false,0u,0u,0u>) INSTANCE(BlackOilTwoPhaseIndices<0u,0u,0u,1u,false,false,0u,0u,0u>)
INSTANCE(BlackOilTwoPhaseIndices<0u,0u,0u,1u,false,true,0u,0u,0u>) INSTANCE(BlackOilTwoPhaseIndices<0u,0u,0u,1u,false,true,0u,0u,0u>)
INSTANCE(BlackOilTwoPhaseIndices<1u,0u,0u,0u,false,false,0u,0u,0u>) INSTANCE(BlackOilTwoPhaseIndices<1u,0u,0u,0u,false,false,0u,0u,0u>)
// Blackoil // Blackoil
INSTANCE(BlackOilIndices<0u,0u,0u,0u,false,false,0u,0u>) INSTANCE(BlackOilIndices<0u,0u,0u,0u,false,false,0u,0u>)
INSTANCE(BlackOilIndices<0u,0u,0u,0u,true,false,0u,0u>) INSTANCE(BlackOilIndices<0u,0u,0u,0u,true,false,0u,0u>)

3
opm/simulators/wells/MultisegmentWellSegments.hpp
View File

@ -40,10 +40,11 @@ namespace Opm {
namespace Opm { namespace Opm {
template<typename FluidSystem, typename Indices, typename Scalar> template<typename FluidSystem, typename Indices>
class MultisegmentWellSegments class MultisegmentWellSegments
{ {
using PrimaryVariables = MultisegmentWellPrimaryVariables<FluidSystem,Indices>; using PrimaryVariables = MultisegmentWellPrimaryVariables<FluidSystem,Indices>;
using Scalar = typename FluidSystem::Scalar;
using EvalWell = typename PrimaryVariables::EvalWell; using EvalWell = typename PrimaryVariables::EvalWell;
public: public: