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

Deleting some unused variables.

Browse Source 
In FullyImplicitBlackoilSolver_impl.hpp
atol, rtol, resTooLarge
Not setting the converged to be false for the first iteration.
This commit is contained in:
Kai Bao 2014-05-09 12:48:04 +02:00
parent 02ab5b0f22
commit 8d51dac6c6
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
View File

@ -257,8 +257,6 @@ namespace {
computeWellConnectionPressures(state, xw); computeWellConnectionPressures(state, xw);
} }
const double atol = 1.0e-12;
const double rtol = 5.0e-8;
const int maxit = 15; const int maxit = 15;
assemble(pvdt, x, xw); assemble(pvdt, x, xw);
@ -273,9 +271,7 @@ namespace {
std::cout << "\nIteration Residual\n" std::cout << "\nIteration Residual\n"
<< std::setw(9) << it << std::setprecision(9) << std::setw(9) << it << std::setprecision(9)
<< std::setw(18) << r0 << std::endl; << std::setw(18) << r0 << std::endl;
bool resTooLarge = r0 > atol;
converged = false;
// while (resTooLarge && (it < maxit)) {
while ((!converged) && (it < maxit)) { while ((!converged) && (it < maxit)) {
const V dx = solveJacobianSystem(); const V dx = solveJacobianSystem();
@ -285,8 +281,6 @@ namespace {
const double r = residualNorm(); const double r = residualNorm();
resTooLarge = (r > atol) && (r > rtol*r0);
converged = getConvergence(dt); converged = getConvergence(dt);
it += 1; it += 1;
@ -294,7 +288,6 @@ namespace {
<< std::setw(18) << r << std::endl; << std::setw(18) << r << std::endl;
} }
// if (resTooLarge) {
if (!converged) { if (!converged) {
std::cerr << "Failed to compute converged solution in " << it << " iterations. Ignoring!\n"; std::cerr << "Failed to compute converged solution in " << it << " iterations. Ignoring!\n";
// OPM_THROW(std::runtime_error, "Failed to compute converged solution in " << it << " iterations."); // OPM_THROW(std::runtime_error, "Failed to compute converged solution in " << it << " iterations.");