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

Using the units from the opm-core.

Browse Source 
And a new interface for getConvergence based on x and xw.
This commit is contained in:
Kai Bao 2014-05-08 11:03:42 +02:00
parent ccc1577f09
commit 5ef4976f4a
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/FullyImplicitBlackoilSolver.hpp
View File

@ -268,6 +268,10 @@ namespace Opm {
/// residual mass balance (tol_cnv).
bool getConvergence(const SolutionState& state, const double dt);
bool getConvergence_b( const BlackoilState& x,
const WellStateFullyImplicitBlackoil& xw,
const double dt);
};
} // namespace Opm

16
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
View File

@ -33,6 +33,7 @@
#include <opm/core/simulator/BlackoilState.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/well_controls.h>
#include <cassert>
@ -1790,10 +1791,10 @@ namespace {
double residualWellFlux = residual_.well_flux_eq.value().matrix().lpNorm<Eigen::Infinity>();
double residualWell = residual_.well_eq.value().matrix().lpNorm<Eigen::Infinity>();
const double day = 24 * 60 * 60;
const double barsa = 1.e5;
// const double day = 24 * 60 * 60;
// const double barsa = 1.e5;
bool converged_Well = (residualWellFlux < 1./day) && (residualWell < barsa);
bool converged_Well = (residualWellFlux < 1./Opm::unit::day) && (residualWell < Opm::unit::barsa);
bool converged = converged_MB && converged_CNV && converged_Well;
@ -1803,6 +1804,15 @@ namespace {
return converged;
}
template<class T>
bool
FullyImplicitBlackoilSolver<T>::getConvergence_b( const BlackoilState& x,
const WellStateFullyImplicitBlackoil& xw,
const double dt){
}
template<class T>
ADB