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

fixed direct acces to matrix in lineariser

Browse Source
This commit is contained in:
hnil
2022-12-14 20:01:35 +01:00
parent 888565c335
commit d465ebdb78
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -384,13 +384,14 @@ private:
// allocate raw matrix // allocate raw matrix
jacobian_.reset(new SparseMatrixAdapter(simulator_())); jacobian_.reset(new SparseMatrixAdapter(simulator_()));
diagElemAddress_.resize(numCells); diagMatAddress_.resize(numCells);
// create matrix structure based on sparsity pattern // create matrix structure based on sparsity pattern
jacobian_->reserve(sparsityPattern); jacobian_->reserve(sparsityPattern);
for (unsigned globI = 0; globI < numCells; globI++) { for (unsigned globI = 0; globI < numCells; globI++) {
diagElements_[globI] = jacobian_->blockAddress(globI,globI,bMat); const auto& nbInfos = neighborInfo_[globI];
diagMatAddress_[globI] = jacobian_->blockAddress(globI,globI);
for (auto& nbInfo : nbInfos) { for (auto& nbInfo : nbInfos) {
nbInfo.matAdress = jacobian_->blockAddress(globI,nbInfo.neighbor); nbInfo.matAddress = jacobian_->blockAddress(nbInfo.neighbor,globI);
} }
} }
} }
@@ -435,23 +436,23 @@ private:
MatrixBlock bMat(0.0); MatrixBlock bMat(0.0);
ADVectorBlock adres(0.0); ADVectorBlock adres(0.0);
const IntensiveQuantities* intQuantsInP = model_().cachedIntensiveQuantities(globI, /*timeIdx*/ 0); const IntensiveQuantities* intQuantsInP = model_().cachedIntensiveQuantities(globI, /*timeIdx*/ 0);
if (intQuantsInP == nullptr) { // if (intQuantsInP == nullptr) {
throw std::logic_error("Missing updated intensive quantities for cell " + std::to_string(globI)); // throw std::logic_error("Missing updated intensive quantities for cell " + std::to_string(globI));
} // }
const IntensiveQuantities& intQuantsIn = *intQuantsInP; const IntensiveQuantities& intQuantsIn = *intQuantsInP;
// Flux term. // Flux term.
short loc = 0; short loc = 0;
for (const auto& nbInfo : nbInfos) { for (const auto& nbInfo : nbInfos) {
unsigned globJ = nbInfo.neighbor; unsigned globJ = nbInfo.neighbor;
assert(globJ != globI); //assert(globJ != globI);
res = 0.0; res = 0.0;
bMat = 0.0; bMat = 0.0;
adres = 0.0; adres = 0.0;
const IntensiveQuantities* intQuantsExP = model_().cachedIntensiveQuantities(globJ, /*timeIdx*/ 0); const IntensiveQuantities* intQuantsExP = model_().cachedIntensiveQuantities(globJ, /*timeIdx*/ 0);
if (intQuantsExP == nullptr) { // if (intQuantsExP == nullptr) {
throw std::logic_error("Missing updated intensive quantities for cell " + std::to_string(globJ) + " when assembling fluxes for cell " + std::to_string(globI)); // throw std::logic_error("Missing updated intensive quantities for cell " + std::to_string(globJ) + " when assembling fluxes for cell " + std::to_string(globI));
} // }
const IntensiveQuantities& intQuantsEx = *intQuantsExP; const IntensiveQuantities& intQuantsEx = *intQuantsExP;
LocalResidual::computeFlux( LocalResidual::computeFlux(
adres, problem_(), globI, globJ, intQuantsIn, intQuantsEx, adres, problem_(), globI, globJ, intQuantsIn, intQuantsEx,
@@ -460,7 +461,7 @@ private:
setResAndJacobi(res, bMat, adres); setResAndJacobi(res, bMat, adres);
residual_[globI] += res; residual_[globI] += res;
//jacobian_->addToBlock(globI, globI, bMat); //jacobian_->addToBlock(globI, globI, bMat);
*diagElemAddress_[globI] += bMat; *diagMatAddress_[globI] += bMat;
bMat *= -1.0; bMat *= -1.0;
//jacobian_->addToBlock(globJ, globI, bMat); //jacobian_->addToBlock(globJ, globI, bMat);
*nbInfo.matAddress += bMat; *nbInfo.matAddress += bMat;
@@ -485,7 +486,7 @@ private:
// residual_[globI] -= model_().cachedStorage(globI, 1); //*storefac; // residual_[globI] -= model_().cachedStorage(globI, 1); //*storefac;
residual_[globI] += res; residual_[globI] += res;
//jacobian_->addToBlock(globI, globI, bMat); //jacobian_->addToBlock(globI, globI, bMat);
*diagElemAddress_[globI] += bMat; *diagMatAddress_[globI] += bMat;
// wells sources for now (should be moved out) // wells sources for now (should be moved out)
if (well_local) { if (well_local) {
res = 0.0; res = 0.0;
@@ -496,7 +497,7 @@ private:
setResAndJacobi(res, bMat, adres); setResAndJacobi(res, bMat, adres);
residual_[globI] += res; residual_[globI] += res;
//jacobian_->addToBlock(globI, globI, bMat); //jacobian_->addToBlock(globI, globI, bMat);
*diagElemAddress_[globI] += bMat; *diagMatAddress_[globI] += bMat;
} }
} // end of loop for cell globI. } // end of loop for cell globI.
@@ -515,7 +516,7 @@ private:
setResAndJacobi(res, bMat, adres); setResAndJacobi(res, bMat, adres);
residual_[globI] += res; residual_[globI] += res;
//jacobian_->addToBlock(globI, globI, bMat); //jacobian_->addToBlock(globI, globI, bMat);
*diagElemAddress_[globI] += bMat; *diagMatAddress_[globI] += bMat;
} }
} }
@@ -557,10 +558,10 @@ private:
double trans; double trans;
double faceArea; double faceArea;
FaceDir::DirEnum faceDirection; FaceDir::DirEnum faceDirection;
MatrixBlock* matAddres; MatrixBlock* matAddress;
}; };
SparseTable<NeighborInfo> neighborInfo_; SparseTable<NeighborInfo> neighborInfo_;
std::vector<MatrixBlock*> diagElemAddress_; std::vector<MatrixBlock*> diagMatAddress_;
using ScalarFluidState = typename IntensiveQuantities::ScalarFluidState; using ScalarFluidState = typename IntensiveQuantities::ScalarFluidState;
struct BoundaryConditionData struct BoundaryConditionData