OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixes: correct sign for pressure increment, initialise rock_comp.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-06-13 10:34:15 +02:00
parent 92f1ce9b83
commit b9afae7ef6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/core/pressure/IncompTpfa.cpp
View File

@ -267,7 +267,7 @@ namespace Opm
} }
if ((iter == maxiter_) && (res_norm > residual_tol_) && (inc_norm > change_tol_)) { if ((iter == maxiter_) && (res_norm > residual_tol_) && (inc_norm > change_tol_)) {
THROW("CompressibleTpfa::solve() failed to converge in " << maxiter_ << " iterations."); THROW("IncompTpfa::solve() failed to converge in " << maxiter_ << " iterations.");
} }
std::cout << "Solved pressure in " << iter << " iterations." << std::endl; std::cout << "Solved pressure in " << iter << " iterations." << std::endl;
@ -303,6 +303,9 @@ namespace Opm
// gpress_omegaweighted_ is sent to assembler always, and it dislikes // gpress_omegaweighted_ is sent to assembler always, and it dislikes
// getting a zero pointer. // getting a zero pointer.
gpress_omegaweighted_.resize(gg->cell_facepos[ gg->number_of_cells ], 0.0); gpress_omegaweighted_.resize(gg->cell_facepos[ gg->number_of_cells ], 0.0);
if (rock_comp_props_) {
rock_comp_.resize(grid_.number_of_cells);
}
for (int c = 0; c < grid_.number_of_cells; ++c) { for (int c = 0; c < grid_.number_of_cells; ++c) {
allcells_[c] = c; allcells_[c] = c;
} }
@ -416,7 +419,10 @@ namespace Opm
// Increment is equal to -J^{-1}R. // Increment is equal to -J^{-1}R.
// The Jacobian is in h_->A, residual in h_->b. // The Jacobian is in h_->A, residual in h_->b.
linsolver_.solve(h_->A, h_->b, h_->x); linsolver_.solve(h_->A, h_->b, h_->x);
std::transform(h_->x, h_->x + h_->A->m, h_->x, std::negate<double>()); // It is not necessary to negate the increment,
// apparently the system for the increment is generated,
// not the Jacobian and residual as such.
// std::transform(h_->x, h_->x + h_->A->m, h_->x, std::negate<double>());
} }