mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
5 blank lines between functions in BlackoilModelBase_impl
This commit is contained in:
parent
df5bd78d0c
commit
ce7ca517cd
@ -187,6 +187,8 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
void
|
void
|
||||||
BlackoilModelBase<Grid, Implementation>::
|
BlackoilModelBase<Grid, Implementation>::
|
||||||
@ -203,6 +205,7 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
void
|
void
|
||||||
BlackoilModelBase<Grid, Implementation>::
|
BlackoilModelBase<Grid, Implementation>::
|
||||||
@ -216,6 +219,7 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
int
|
int
|
||||||
BlackoilModelBase<Grid, Implementation>::
|
BlackoilModelBase<Grid, Implementation>::
|
||||||
@ -227,6 +231,7 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
int
|
int
|
||||||
BlackoilModelBase<Grid, Implementation>::
|
BlackoilModelBase<Grid, Implementation>::
|
||||||
@ -238,6 +243,7 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
bool
|
bool
|
||||||
BlackoilModelBase<Grid, Implementation>::
|
BlackoilModelBase<Grid, Implementation>::
|
||||||
@ -249,6 +255,7 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
int
|
int
|
||||||
BlackoilModelBase<Grid, Implementation>::
|
BlackoilModelBase<Grid, Implementation>::
|
||||||
@ -260,6 +267,7 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
void
|
void
|
||||||
BlackoilModelBase<Grid, Implementation>::
|
BlackoilModelBase<Grid, Implementation>::
|
||||||
@ -281,6 +289,7 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
BlackoilModelBase<Grid, Implementation>::ReservoirResidualQuant::ReservoirResidualQuant()
|
BlackoilModelBase<Grid, Implementation>::ReservoirResidualQuant::ReservoirResidualQuant()
|
||||||
: accum(2, ADB::null())
|
: accum(2, ADB::null())
|
||||||
@ -356,6 +365,10 @@ namespace detail {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
typename BlackoilModelBase<Grid, Implementation>::SolutionState
|
typename BlackoilModelBase<Grid, Implementation>::SolutionState
|
||||||
BlackoilModelBase<Grid, Implementation>::variableState(const ReservoirState& x,
|
BlackoilModelBase<Grid, Implementation>::variableState(const ReservoirState& x,
|
||||||
@ -387,6 +400,11 @@ namespace detail {
|
|||||||
variableWellStateInitials(xw,vars0);
|
variableWellStateInitials(xw,vars0);
|
||||||
return vars0;
|
return vars0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
void
|
void
|
||||||
BlackoilModelBase<Grid, Implementation>::variableReservoirStateInitials(const ReservoirState& x, std::vector<V>& vars0) const
|
BlackoilModelBase<Grid, Implementation>::variableReservoirStateInitials(const ReservoirState& x, std::vector<V>& vars0) const
|
||||||
@ -421,6 +439,10 @@ namespace detail {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
void
|
void
|
||||||
BlackoilModelBase<Grid, Implementation>::variableWellStateInitials(const WellState& xw, std::vector<V>& vars0) const
|
BlackoilModelBase<Grid, Implementation>::variableWellStateInitials(const WellState& xw, std::vector<V>& vars0) const
|
||||||
@ -474,6 +496,10 @@ namespace detail {
|
|||||||
assert(next == fluid_.numPhases() + 2);
|
assert(next == fluid_.numPhases() + 2);
|
||||||
return indices;
|
return indices;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
std::vector<int>
|
std::vector<int>
|
||||||
BlackoilModelBase<Grid, Implementation>::variableWellStateIndices() const
|
BlackoilModelBase<Grid, Implementation>::variableWellStateIndices() const
|
||||||
@ -488,6 +514,10 @@ namespace detail {
|
|||||||
return indices;
|
return indices;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
typename BlackoilModelBase<Grid, Implementation>::SolutionState
|
typename BlackoilModelBase<Grid, Implementation>::SolutionState
|
||||||
BlackoilModelBase<Grid, Implementation>::variableStateExtractVars(const ReservoirState& x,
|
BlackoilModelBase<Grid, Implementation>::variableStateExtractVars(const ReservoirState& x,
|
||||||
@ -555,6 +585,11 @@ namespace detail {
|
|||||||
variableStateExtractWellsVars(indices,vars,state);
|
variableStateExtractWellsVars(indices,vars,state);
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
void
|
void
|
||||||
BlackoilModelBase<Grid, Implementation>::variableStateExtractWellsVars(const std::vector<int>& indices,
|
BlackoilModelBase<Grid, Implementation>::variableStateExtractWellsVars(const std::vector<int>& indices,
|
||||||
@ -832,6 +867,8 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
void
|
void
|
||||||
BlackoilModelBase<Grid, Implementation>::addWellContributionToMassBalanceEq(const std::vector<ADB>& cq_s)
|
BlackoilModelBase<Grid, Implementation>::addWellContributionToMassBalanceEq(const std::vector<ADB>& cq_s)
|
||||||
@ -847,6 +884,10 @@ namespace detail {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
void
|
void
|
||||||
BlackoilModelBase<Grid, Implementation>::addWellEq(const SolutionState& state,
|
BlackoilModelBase<Grid, Implementation>::addWellEq(const SolutionState& state,
|
||||||
@ -1095,6 +1136,7 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
void BlackoilModelBase<Grid, Implementation>::updateWellControls(WellState& xw) const
|
void BlackoilModelBase<Grid, Implementation>::updateWellControls(WellState& xw) const
|
||||||
{
|
{
|
||||||
@ -1168,6 +1210,10 @@ namespace detail {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
void BlackoilModelBase<Grid, Implementation>::solveWellEq(const std::vector<ADB>& mob_perfcells,
|
void BlackoilModelBase<Grid, Implementation>::solveWellEq(const std::vector<ADB>& mob_perfcells,
|
||||||
const std::vector<ADB>& b_perfcells,
|
const std::vector<ADB>& b_perfcells,
|
||||||
@ -1253,6 +1299,7 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
void BlackoilModelBase<Grid, Implementation>::addWellControlEq(const SolutionState& state,
|
void BlackoilModelBase<Grid, Implementation>::addWellControlEq(const SolutionState& state,
|
||||||
const WellState& xw,
|
const WellState& xw,
|
||||||
@ -1616,6 +1663,10 @@ namespace detail {
|
|||||||
updatePhaseCondFromPrimalVariable();
|
updatePhaseCondFromPrimalVariable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
void BlackoilModelBase<Grid, Implementation>::updateWellState(const V& dx,
|
void BlackoilModelBase<Grid, Implementation>::updateWellState(const V& dx,
|
||||||
WellState& well_state)
|
WellState& well_state)
|
||||||
@ -1658,7 +1709,6 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
std::vector<ADB>
|
std::vector<ADB>
|
||||||
BlackoilModelBase<Grid, Implementation>::computeRelPerm(const SolutionState& state) const
|
BlackoilModelBase<Grid, Implementation>::computeRelPerm(const SolutionState& state) const
|
||||||
@ -1810,6 +1860,7 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
std::vector<double>
|
std::vector<double>
|
||||||
BlackoilModelBase<Grid, Implementation>::computeResidualNorms() const
|
BlackoilModelBase<Grid, Implementation>::computeResidualNorms() const
|
||||||
@ -1852,6 +1903,7 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
double
|
double
|
||||||
BlackoilModelBase<Grid, Implementation>::convergenceReduction(const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases>& B,
|
BlackoilModelBase<Grid, Implementation>::convergenceReduction(const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases>& B,
|
||||||
@ -1936,6 +1988,7 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
bool
|
bool
|
||||||
BlackoilModelBase<Grid, Implementation>::getConvergence(const double dt, const int iteration)
|
BlackoilModelBase<Grid, Implementation>::getConvergence(const double dt, const int iteration)
|
||||||
@ -2038,6 +2091,10 @@ namespace detail {
|
|||||||
return converged;
|
return converged;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
bool
|
bool
|
||||||
BlackoilModelBase<Grid, Implementation>::getWellConvergence(const int iteration)
|
BlackoilModelBase<Grid, Implementation>::getWellConvergence(const int iteration)
|
||||||
@ -2114,6 +2171,7 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
ADB
|
ADB
|
||||||
BlackoilModelBase<Grid, Implementation>::fluidViscosity(const int phase,
|
BlackoilModelBase<Grid, Implementation>::fluidViscosity(const int phase,
|
||||||
@ -2219,6 +2277,9 @@ namespace detail {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
V
|
V
|
||||||
BlackoilModelBase<Grid, Implementation>::fluidRvSat(const V& p,
|
BlackoilModelBase<Grid, Implementation>::fluidRvSat(const V& p,
|
||||||
@ -2243,6 +2304,8 @@ namespace detail {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <class Grid, class Implementation>
|
template <class Grid, class Implementation>
|
||||||
ADB
|
ADB
|
||||||
BlackoilModelBase<Grid, Implementation>::poroMult(const ADB& p) const
|
BlackoilModelBase<Grid, Implementation>::poroMult(const ADB& p) const
|
||||||
|
Loading…
Reference in New Issue
Block a user