Update support for VFP tables: Now produces almost identical results to BHP for 'identity' table'

This commit is contained in:
babrodtk 2015-08-06 15:11:11 +02:00
parent 25155aefbb
commit 9d602f0cd0

View File

@ -67,6 +67,7 @@ namespace Opm
bhp_[w] = well_controls_get_current_target( ctrl );
break;
case THP:
assert(false && "Not properly implemented");
thp_[w] = well_controls_get_current_target( ctrl );
break;
default:
@ -123,13 +124,10 @@ namespace Opm
// pressure in first perforation cell.
switch (well_controls_get_current_type(ctrl)) {
case BHP:
bhp_[w] = well_controls_get_current_target( ctrl );
thp_[w] = -1e100;
break;
case THP:
bhp_[w] = -1e100;
thp_[w] = well_controls_get_current_target( ctrl );
//bhp_[w] = thp_[w]; //< TODO: ARB Adding this produces identical results as without THP control for artificial test case
//Already taken care of above in 2.
break;
default:
@ -137,7 +135,7 @@ namespace Opm
const int first_cell = wells->well_cells[wells->well_connpos[w]];
const double safety_factor = (wells->type[w] == INJECTOR) ? 1.01 : 0.99;
bhp_[w] = safety_factor*state.pressure()[first_cell];
thp_[w] = -1e100;
// thp_[w] = -1e100;
}
}
}