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

Merge pull request #1684 from andlaus/fix_tabulation_api

Browse Source 
use the common API opm-material for functions
This commit is contained in:
Andreas Lauser 2019-01-08 13:34:58 +01:00 committed by GitHub
commit 69e21eec0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/autodiff/StandardWellV_impl.hpp
View File

@ -2944,7 +2944,7 @@ namespace Opm
const EvalWell throughput_eval(numWellEq_ + numEq, throughput);
// the skin pressure when injecting water, which also means the polymer concentration is zero
EvalWell pskin_water(numWellEq_ + numEq, 0.0);
water_table_func.eval(throughput_eval, water_velocity, pskin_water);
pskin_water = water_table_func.eval(throughput_eval, water_velocity);
return pskin_water;
}
@ -2977,7 +2977,7 @@ namespace Opm
const EvalWell throughput_eval(numWellEq_ + numEq, throughput);
// the skin pressure when injecting water, which also means the polymer concentration is zero
EvalWell pskin_poly(numWellEq_ + numEq, 0.0);
skprpolytable.table_func.eval(throughput_eval, water_velocity_abs, pskin_poly);
pskin_poly = skprpolytable.table_func.eval(throughput_eval, water_velocity_abs);
if (poly_inj_conc == reference_concentration) {
return sign * pskin_poly;
}
@ -3008,7 +3008,7 @@ namespace Opm
if (wpolymer() == 0.) { // not injecting polymer
return molecular_weight;
}
table_func.eval(throughput_eval, Opm::abs(water_velocity), molecular_weight);
molecular_weight = table_func.eval(throughput_eval, Opm::abs(water_velocity));
return molecular_weight;
}