OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 18:50:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Using the updated rq_ instead of recomputing them.

Browse Source
This commit is contained in:
Kai Bao 2014-05-08 11:41:54 +02:00
parent 3798e3f69b
commit aec38e503d
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/FullyImplicitBlackoilSolver.hpp
View File

@ -268,10 +268,6 @@ 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

23
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
View File

@ -1718,6 +1718,7 @@ namespace {
const double tol_cnv = 1.0e-3;
const int nc = Opm::AutoDiffGrid::numCells(grid_);
const Opm::PhaseUsage& pu = fluid_.phaseUsage();
const V pv = geo_.poreVolume();
const double pvSum = pv.sum();
@ -1742,7 +1743,8 @@ namespace {
double BG_avg = 0.;
if (active_[Water]) {
ADB tempBW = fluidReciprocFVF(Water, press, rs, rv, cond, cells_);
const int pos = pu.phase_pos[Water];
const ADB& tempBW = rq_[pos].b;
V BW = 1./tempBW.value();
V RW = residual_.material_balance_eq[Water].value();
BW_avg = BW.sum()/nc;
@ -1755,7 +1757,8 @@ namespace {
if (active_[Oil]) {
// Omit the disgas here. We should add it.
ADB tempBO = fluidReciprocFVF(Oil, press, rs, rv, cond, cells_);
const int pos = pu.phase_pos[Oil];
const ADB& tempBO = rq_[pos].b;
V BO = 1./tempBO.value();
V RO = residual_.material_balance_eq[Oil].value();
BO_avg = BO.sum()/nc;
@ -1768,7 +1771,8 @@ namespace {
if (active_[Gas]) {
// Omit the vapoil here. We should add it.
ADB tempBG = fluidReciprocFVF(Gas, press, rs, rv, cond, cells_);
const int pos = pu.phase_pos[Gas];
const ADB& tempBG = rq_[pos].b;
V BG = 1./tempBG.value();
V RG = residual_.material_balance_eq[Gas].value();
BG_avg = BG.sum()/nc;
@ -1791,9 +1795,6 @@ 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;
bool converged_Well = (residualWellFlux < 1./Opm::unit::day) && (residualWell < Opm::unit::barsa);
bool converged = converged_MB && converged_CNV && converged_Well;
@ -1804,16 +1805,6 @@ namespace {
return converged;
}
template<class T>
bool
FullyImplicitBlackoilSolver<T>::getConvergence_b( const BlackoilState& x,
const WellStateFullyImplicitBlackoil& xw,
const double dt){
bool converged = false;
return converged;
}
template<class T>
ADB