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

Remove unneeded timeIdx function parameters.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2022-08-10 10:00:12 +02:00
parent 3e8c024cdb
commit 0d4c19b723
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/models/blackoil/blackoillocalresidualtpfa.hh
View File

@ -114,14 +114,12 @@ public:
{ {
const IntensiveQuantities& intQuants = elemCtx.intensiveQuantities(dofIdx, timeIdx); const IntensiveQuantities& intQuants = elemCtx.intensiveQuantities(dofIdx, timeIdx);
computeStorage(storage, computeStorage(storage,
intQuants, intQuants);
timeIdx);
} }
template <class LhsEval> template <class LhsEval>
static void computeStorage(Dune::FieldVector<LhsEval, numEq>& storage, static void computeStorage(Dune::FieldVector<LhsEval, numEq>& storage,
const IntensiveQuantities& intQuants, const IntensiveQuantities& intQuants)
unsigned timeIdx)
{ {
// retrieve the intensive quantities for the SCV at the specified point in time // retrieve the intensive quantities for the SCV at the specified point in time
const auto& fs = intQuants.fluidState(); const auto& fs = intQuants.fluidState();
@ -196,11 +194,9 @@ public:
const unsigned globalIndexEx, const unsigned globalIndexEx,
const IntensiveQuantities& intQuantsIn, const IntensiveQuantities& intQuantsIn,
const IntensiveQuantities& intQuantsEx, const IntensiveQuantities& intQuantsEx,
const unsigned timeIdx,
const Scalar trans, const Scalar trans,
const Scalar faceArea) const Scalar faceArea)
{ {
assert(timeIdx == 0);
flux = 0.0; flux = 0.0;
Scalar Vin = problem.model().dofTotalVolume(globalIndexIn); Scalar Vin = problem.model().dofTotalVolume(globalIndexIn);
Scalar Vex = problem.model().dofTotalVolume(globalIndexEx); Scalar Vex = problem.model().dofTotalVolume(globalIndexEx);
@ -227,7 +223,6 @@ public:
calculateFluxes_(flux, calculateFluxes_(flux,
intQuantsIn, intQuantsIn,
intQuantsEx, intQuantsEx,
timeIdx, // input
Vin, Vin,
Vex, Vex,
globalIndexIn, globalIndexIn,
@ -290,7 +285,6 @@ public:
calculateFluxes_(flux, calculateFluxes_(flux,
intQuantsIn, intQuantsIn,
intQuantsEx, intQuantsEx,
timeIdx, // input
Vin, Vin,
Vex, Vex,
globalIndexIn, globalIndexIn,
@ -304,7 +298,6 @@ public:
static void calculateFluxes_(RateVector& flux, static void calculateFluxes_(RateVector& flux,
const IntensiveQuantities& intQuantsIn, const IntensiveQuantities& intQuantsIn,
const IntensiveQuantities& intQuantsEx, const IntensiveQuantities& intQuantsEx,
const unsigned timeIdx,
const Scalar& Vin, const Scalar& Vin,
const Scalar& Vex, const Scalar& Vex,
const unsigned& globalIndexIn, const unsigned& globalIndexIn,
@ -330,7 +323,6 @@ public:
pressureDifference, pressureDifference,
intQuantsIn, intQuantsIn,
intQuantsEx, intQuantsEx,
timeIdx, // input
phaseIdx, // input phaseIdx, // input
interiorDofIdx, // input interiorDofIdx, // input
exteriorDofIdx, // intput exteriorDofIdx, // intput

4
opm/models/discretization/common/tpfalinearizer.hh
View File

@ -410,7 +410,7 @@ private:
} }
const IntensiveQuantities& intQuantsEx = *intQuantsExP; const IntensiveQuantities& intQuantsEx = *intQuantsExP;
LocalResidual::computeFlux( LocalResidual::computeFlux(
adres, problem_(), globI, globJ, intQuantsIn, intQuantsEx, 0, nbInfo.trans, nbInfo.faceArea); adres, problem_(), globI, globJ, intQuantsIn, intQuantsEx, nbInfo.trans, nbInfo.faceArea);
adres *= nbInfo.faceArea; adres *= nbInfo.faceArea;
setResAndJacobi(res, bMat, adres); setResAndJacobi(res, bMat, adres);
residual_[globI] += res; residual_[globI] += res;
@ -425,7 +425,7 @@ private:
double volume = model_().dofTotalVolume(globI); double volume = model_().dofTotalVolume(globI);
Scalar storefac = volume / dt; Scalar storefac = volume / dt;
adres = 0.0; adres = 0.0;
LocalResidual::computeStorage(adres, intQuantsIn, 0); LocalResidual::computeStorage(adres, intQuantsIn);
setResAndJacobi(res, bMat, adres); setResAndJacobi(res, bMat, adres);
// TODO: check recycleFirst etc. // TODO: check recycleFirst etc.
// first we use it as storage cache // first we use it as storage cache