Add option for wvfpexp item 2 plus minor fixes

This commit is contained in:
Tor Harald Sandve
2022-04-08 10:15:13 +02:00
parent e875849497
commit 9364d4c54b
11 changed files with 35 additions and 33 deletions

View File

@@ -346,15 +346,15 @@ VFPEvaluation bhp(const VFPProdTable& table,
const double vapour,
const double thp,
const double alq,
const double explicit_wfr,
const double explicit_gfr,
const bool vfpexplicit)
const double explicit_wfr,
const double explicit_gfr,
const bool use_vfpexplicit)
{
//Find interpolation variables
double flo = detail::getFlo(table, aqua, liquid, vapour);
double wfr = detail::getWFR(table, aqua, liquid, vapour);
double gfr = detail::getGFR(table, aqua, liquid, vapour);
if (vfpexplicit) {
if (use_vfpexplicit) {
wfr = explicit_wfr;
gfr = explicit_gfr;
}