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

Fix two bugs in solver.

Browse Source 
- Using x/x.abs() instead of a proper sign function led to problems
   when x = 0. Solved by using new sign() utility.
 - Pass pressure instead of rs as parameter to fluidRsMax().
This commit is contained in:
Atgeirr Flø Rasmussen
2013-06-03 00:33:05 +02:00
parent 90f3886d20
commit 04eb340a3b
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
opm/autodiff/FullyImplicitBlackoilSolver.cpp
View File

@@ -814,8 +814,7 @@ namespace Opm {
const double dpmaxrel = 0.8; const double dpmaxrel = 0.8;
const V p_old = Eigen::Map<const V>(&state.pressure()[0], nc, 1); const V p_old = Eigen::Map<const V>(&state.pressure()[0], nc, 1);
const V absdpmax = dpmaxrel*p_old.abs(); const V absdpmax = dpmaxrel*p_old.abs();
const V dpsign = dp/dp.abs(); const V dp_limited = sign(dp) * dp.abs().min(absdpmax);
const V dp_limited = dpsign * dp.abs().min(absdpmax);
const V p = (p_old - dp_limited).max(zero); const V p = (p_old - dp_limited).max(zero);
std::copy(&p[0], &p[0] + nc, state.pressure().begin()); std::copy(&p[0], &p[0] + nc, state.pressure().begin());
@@ -825,8 +824,7 @@ namespace Opm {
const double drsmaxrel = 0.8; const double drsmaxrel = 0.8;
const V rs_old = Eigen::Map<const V>(&state.gasoilratio()[0], nc); const V rs_old = Eigen::Map<const V>(&state.gasoilratio()[0], nc);
const V absdrsmax = drsmaxrel*rs_old.abs(); const V absdrsmax = drsmaxrel*rs_old.abs();
const V drssign = drs/drs.abs(); const V drs_limited = sign(drs) * drs.abs().min(absdrsmax);
const V drs_limited = drssign * drs.abs().min(absdrsmax);
const V rs = rs_old - drs_limited; const V rs = rs_old - drs_limited;
std::copy(&rs[0], &rs[0] + nc, state.gasoilratio().begin()); std::copy(&rs[0], &rs[0] + nc, state.gasoilratio().begin());
} }
@@ -839,8 +837,7 @@ namespace Opm {
if (active_[ Water ]) { if (active_[ Water ]) {
const int pos = pu.phase_pos[ Water ]; const int pos = pu.phase_pos[ Water ];
const V sw_old = s_old.col(pos); const V sw_old = s_old.col(pos);
const V dswsign = dsw/dsw.abs(); const V dsw_limited = sign(dsw) * dsw.abs().min(dsmax);
const V dsw_limited = dswsign * dsw.abs().min(dsmax);
const V sw = (sw_old - dsw_limited).unaryExpr(Chop01()); const V sw = (sw_old - dsw_limited).unaryExpr(Chop01());
so -= sw; so -= sw;
for (int c = 0; c < nc; ++c) { for (int c = 0; c < nc; ++c) {
@@ -850,8 +847,7 @@ namespace Opm {
if (active_[ Gas ]) { if (active_[ Gas ]) {
const int pos = pu.phase_pos[ Gas ]; const int pos = pu.phase_pos[ Gas ];
const V sg_old = s_old.col(pos); const V sg_old = s_old.col(pos);
const V dsgsign = dsg/dsg.abs(); const V dsg_limited = sign(dsg) * dsg.abs().min(dsmax);
const V dsg_limited = dsgsign * dsg.abs().min(dsmax);
V sg = sg_old - dsg_limited; V sg = sg_old - dsg_limited;
if (active_[ Oil ]) { if (active_[ Oil ]) {
// Appleyard chop process. // Appleyard chop process.
@@ -860,7 +856,7 @@ namespace Opm {
const double rs_adjust = 1.0; const double rs_adjust = 1.0;
auto sat2usat = (sg_old > 0.0) && (sg <= 0.0); auto sat2usat = (sg_old > 0.0) && (sg <= 0.0);
Eigen::Map<V> rs(&state.gasoilratio()[0], nc); Eigen::Map<V> rs(&state.gasoilratio()[0], nc);
const V rs_sat = fluidRsMax(rs, cells_); const V rs_sat = fluidRsMax(p, cells_);
auto over_saturated = ((sg > 0) || (rs > rs_sat*rs_adjust)) && (sat2usat == false); auto over_saturated = ((sg > 0) || (rs > rs_sat*rs_adjust)) && (sat2usat == false);
auto usat2sat = (sg_old < epsilon) && over_saturated; auto usat2sat = (sg_old < epsilon) && over_saturated;
auto zerosg = (sat2usat && sg_old <= above_epsilon); auto zerosg = (sat2usat && sg_old <= above_epsilon);