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

Do fluxes before storage, as for the existing linearizer.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2022-07-07 08:55:02 +02:00
parent b6986a24f7
commit 9ff81d2a42
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -413,39 +413,14 @@ private:
#endif #endif
for (unsigned globI = 0; globI < numCells; globI++) { for (unsigned globI = 0; globI < numCells; globI++) {
const auto& nbInfos = neighborInfo_[globI]; // this is a set but should maybe be changed const auto& nbInfos = neighborInfo_[globI]; // this is a set but should maybe be changed
// accumulation term VectorBlock res(0.0);
double dt = simulator_().timeStepSize(); MatrixBlock bMat(0.0);
double volume = model_().dofTotalVolume(globI);
Scalar storefac = volume / dt;
ADVectorBlock adres(0.0); ADVectorBlock adres(0.0);
const IntensiveQuantities* intQuantsInP = model_().cachedIntensiveQuantities(globI, /*timeIdx*/ 0); const IntensiveQuantities* intQuantsInP = model_().cachedIntensiveQuantities(globI, /*timeIdx*/ 0);
assert(intQuantsInP); assert(intQuantsInP);
const IntensiveQuantities& intQuantsIn = *intQuantsInP; const IntensiveQuantities& intQuantsIn = *intQuantsInP;
// intensiveQuantity(globI, 0);
LocalResidual::computeStorage(adres, intQuantsIn, 0); // Flux term.
adres *= storefac;
VectorBlock res(0.0);
MatrixBlock bMat(0.0);
setResAndJacobi(res, bMat, adres);
// TODO: check recycleFirst etc.
// first we use it as storage cache
if (model_().newtonMethod().numIterations() == 0) {
model_().updateCachedStorage(globI, /*timeIdx=*/1, res);
}
residual_[globI] -= model_().cachedStorage(globI, 1); //*storefac;
residual_[globI] += res;
jacobian_->addToBlock(globI, globI, bMat);
// wells sources for now (should be moved out)
if (well_local) {
res = 0.0;
bMat = 0.0;
adres = 0.0;
LocalResidual::computeSource(adres, problem_(), globI, 0);
adres *= -volume;
setResAndJacobi(res, bMat, adres);
residual_[globI] += res;
jacobian_->addToBlock(globI, globI, bMat);
}
short loc = 0; short loc = 0;
for (const auto& nbInfo : nbInfos) { for (const auto& nbInfo : nbInfos) {
unsigned globJ = nbInfo.neighbor; unsigned globJ = nbInfo.neighbor;
@ -466,6 +441,34 @@ private:
jacobian_->addToBlock(globJ, globI, bMat); jacobian_->addToBlock(globJ, globI, bMat);
++loc; ++loc;
} }
// Accumulation term.
double dt = simulator_().timeStepSize();
double volume = model_().dofTotalVolume(globI);
Scalar storefac = volume / dt;
adres = 0.0;
LocalResidual::computeStorage(adres, intQuantsIn, 0);
adres *= storefac;
setResAndJacobi(res, bMat, adres);
// TODO: check recycleFirst etc.
// first we use it as storage cache
if (model_().newtonMethod().numIterations() == 0) {
model_().updateCachedStorage(globI, /*timeIdx=*/1, res);
}
residual_[globI] -= model_().cachedStorage(globI, 1); //*storefac;
residual_[globI] += res;
jacobian_->addToBlock(globI, globI, bMat);
// wells sources for now (should be moved out)
if (well_local) {
res = 0.0;
bMat = 0.0;
adres = 0.0;
LocalResidual::computeSource(adres, problem_(), globI, 0);
adres *= -volume;
setResAndJacobi(res, bMat, adres);
residual_[globI] += res;
jacobian_->addToBlock(globI, globI, bMat);
}
} }
if (not(well_local)) { if (not(well_local)) {
problem_().wellModel().addReseroirSourceTerms(residual_, *jacobian_); problem_().wellModel().addReseroirSourceTerms(residual_, *jacobian_);