From 9d602f0cd02c77858d9b1190b53be81829375ad5 Mon Sep 17 00:00:00 2001 From: babrodtk Date: Thu, 6 Aug 2015 15:11:11 +0200 Subject: [PATCH] Update support for VFP tables: Now produces almost identical results to BHP for 'identity' table' --- opm/core/simulator/WellState.hpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/opm/core/simulator/WellState.hpp b/opm/core/simulator/WellState.hpp index 3f5def72f..a3ee2e02c 100644 --- a/opm/core/simulator/WellState.hpp +++ b/opm/core/simulator/WellState.hpp @@ -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; } } }