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

Merge pull request #1608 from andlaus/fix_2p_wells

Browse Source 
well model: fix valgrind complaints if either oil or gas are disabled
This commit is contained in:
Atgeirr Flø Rasmussen authored and GitHub committed 2018-10-31 15:16:56 +01:00
2 parents ea67829e4d b04c82a64e
commit 985b1b17f0
1 file changed
+15 -2
Download Patch File Download Diff File Expand all files Collapse all files
opm/autodiff/RateConverter.hpp
+15 -2
View File
@@ -692,8 +692,21 @@ namespace Opm {
} }
// Use average Rs and Rv: // Use average Rs and Rv:
double Rs = std::min(ra.rs, surface_rates[ig]/(surface_rates[io]+1.0e-15)); auto a = ra.rs;
double Rv = std::min(ra.rv, surface_rates[io]/(surface_rates[ig]+1.0e-15)); auto b = a;
if (io >= 0 && ig >= 0) {
b = surface_rates[ig]/(surface_rates[io]+1.0e-15);
}
double Rs = std::min(a, b);
a = ra.rv;
b = a;
if (io >= 0 && ig >= 0) {
b = surface_rates[io]/(surface_rates[ig]+1.0e-15);
}
double Rv = std::min(a, b);
// Determinant of 'R' matrix // Determinant of 'R' matrix
const double detR = 1.0 - (Rs * Rv); const double detR = 1.0 - (Rs * Rv);