OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-12 08:54:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'atgeirr_twophase' into two_phase_bugfixes

Browse Source
This commit is contained in:
babrodtk committed 2016-04-26 08:25:20 +02:00
2 parents 613052525b 0d85f3642c
commit 1846c4146d
1 file changed
+12 -4
Download Patch File Download Diff File Expand all files Collapse all files
opm/autodiff/BlackoilModelBase_impl.hpp
+12 -4
View File
@@ -1613,7 +1613,9 @@ namespace detail {
auto ixg = sg < 0;
for (int c = 0; c < nc; ++c) {
if (ixg[c]) {
sw[c] = sw[c] / (1-sg[c]);
if (active_[Water]) {
sw[c] = sw[c] / (1-sg[c]);
}
so[c] = so[c] / (1-sg[c]);
sg[c] = 0;
}
@@ -1624,8 +1626,12 @@ namespace detail {
auto ixo = so < 0;
for (int c = 0; c < nc; ++c) {
if (ixo[c]) {
sw[c] = sw[c] / (1-so[c]);
sg[c] = sg[c] / (1-so[c]);
if (active_[Water]) {
sw[c] = sw[c] / (1-so[c]);
}
if (active_[Gas]) {
sg[c] = sg[c] / (1-so[c]);
}
so[c] = 0;
}
}
@@ -1636,7 +1642,9 @@ namespace detail {
for (int c = 0; c < nc; ++c) {
if (ixw[c]) {
so[c] = so[c] / (1-sw[c]);
sg[c] = sg[c] / (1-sw[c]);
if (active_[Gas]) {
sg[c] = sg[c] / (1-sw[c]);
}
sw[c] = 0;
}
}