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

Apply Appleyard fixes to solven model

Browse Source 
Tested on SPE5 and Model2 + co2
This commit is contained in:
Tor Harald Sandve
2016-11-04 08:46:52 +01:00
parent 294ca31fc8
commit 6e03b9706f
1 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
opm/autodiff/BlackoilSolventModel_impl.hpp
View File

@@ -401,6 +401,7 @@ namespace Opm {
const V null; const V null;
assert(null.size() == 0); assert(null.size() == 0);
const V zero = V::Zero(nc); const V zero = V::Zero(nc);
const V ones = V::Constant(nc,1.0);
// Extract parts of dx corresponding to each part. // Extract parts of dx corresponding to each part.
const V dp = subset(dx, Span(nc)); const V dp = subset(dx, Span(nc));
@@ -459,6 +460,9 @@ namespace Opm {
} }
if (has_solvent_){ if (has_solvent_){
maxVal = dss.abs().max(maxVal); maxVal = dss.abs().max(maxVal);
// solvent is not added note that the so calculated
// here is overwritten later
//dso = dso - dss;
} }
maxVal = dso.abs().max(maxVal); maxVal = dso.abs().max(maxVal);
@@ -488,6 +492,7 @@ namespace Opm {
so = so_old - step * dso; so = so_old - step * dso;
} }
// solvent is not included in the adjustment for negative saturation
auto ixg = sg < 0; auto ixg = sg < 0;
for (int c = 0; c < nc; ++c) { for (int c = 0; c < nc; ++c) {
if (ixg[c]) { if (ixg[c]) {
@@ -515,10 +520,18 @@ namespace Opm {
} }
} }
auto ixs = ss < 0;
for (int c = 0; c < nc; ++c) {
if (ixs[c]) {
ss[c] = 0;
}
}
// The oil saturation is defined to // The oil saturation is defined to
// fill the rest of the pore space. // fill the rest of the pore space.
// For convergence reasons oil saturations // For convergence reasons oil saturations
// is included in the appelyard chopping. // is included in the appelyard chopping
so = V::Constant(nc,1.0) - sw - sg - ss; so = V::Constant(nc,1.0) - sw - sg - ss;
// Update rs and rv // Update rs and rv
@@ -527,15 +540,17 @@ namespace Opm {
if (has_disgas_) { if (has_disgas_) {
const V rs_old = Eigen::Map<const V>(&reservoir_state.gasoilratio()[0], nc); const V rs_old = Eigen::Map<const V>(&reservoir_state.gasoilratio()[0], nc);
const V drs = Base::isRs_ * dxvar; const V drs = Base::isRs_ * dxvar;
const V drs_limited = sign(drs) * drs.abs().min(rs_old.abs()*drmaxrel); const V drs_limited = sign(drs) * drs.abs().min( (rs_old.abs()*drmaxrel).max( ones*1.0));
rs = rs_old - drs_limited; rs = rs_old - drs_limited;
rs = rs.max(zero);
} }
V rv; V rv;
if (has_vapoil_) { if (has_vapoil_) {
const V rv_old = Eigen::Map<const V>(&reservoir_state.rv()[0], nc); const V rv_old = Eigen::Map<const V>(&reservoir_state.rv()[0], nc);
const V drv = Base::isRv_ * dxvar; const V drv = Base::isRv_ * dxvar;
const V drv_limited = sign(drv) * drv.abs().min(rv_old.abs()*drmaxrel); const V drv_limited = sign(drv) * drv.abs().min( (rv_old.abs()*drmaxrel).max( ones*1e-6));
rv = rv_old - drv_limited; rv = rv_old - drv_limited;
rv = rv.max(zero);
} }
// Sg is used as primal variable for water only cells. // Sg is used as primal variable for water only cells.
@@ -560,11 +575,18 @@ namespace Opm {
for (int c = 0; c < nc; ++c) { for (int c = 0; c < nc; ++c) {
if (useSg[c]) { if (useSg[c]) {
rs[c] = rsSat[c]; rs[c] = rsSat[c];
if (watOnly[c]) {
so[c] = 0;
sg[c] = 0;
ss[c] = 0;
rs[c] = 0;
}
} else { } else {
hydroCarbonState[c] = HydroCarbonState::OilOnly; hydroCarbonState[c] = HydroCarbonState::OilOnly;
} }
} }
rs = rs.min(rsSat);
} }
// phase transitions so <-> rv // phase transitions so <-> rv
@@ -587,10 +609,19 @@ namespace Opm {
for (int c = 0; c < nc; ++c) { for (int c = 0; c < nc; ++c) {
if (useSg[c]) { if (useSg[c]) {
rv[c] = rvSat[c]; rv[c] = rvSat[c];
if (watOnly[c]) {
so[c] = 0;
sg[c] = 0;
ss[c] = 0;
rv[c] = 0;
}
} else { } else {
hydroCarbonState[c] = HydroCarbonState::GasOnly; hydroCarbonState[c] = HydroCarbonState::GasOnly;
} }
} }
rv = rv.min(rvSat);
} }
// Update the reservoir_state // Update the reservoir_state
@@ -623,7 +654,7 @@ namespace Opm {
std::copy(&rv[0], &rv[0] + nc, reservoir_state.rv().begin()); std::copy(&rv[0], &rv[0] + nc, reservoir_state.rv().begin());
} }
wellModel().updateWellState(dwells, dpMaxRel(), well_state); wellModel().updateWellState(dwells, Base::dbhpMaxRel(), well_state);
for( auto w = 0; w < wells().number_of_wells; ++w ) { for( auto w = 0; w < wells().number_of_wells; ++w ) {
if (wells().type[w] == INJECTOR) { if (wells().type[w] == INJECTOR) {