Merge pull request #3128 from totto82/fixTarget

reset target from wconprod and wconinje
This commit is contained in:
Bård Skaflestad 2021-03-23 23:59:27 +01:00 committed by GitHub
commit f980ff5f77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -238,13 +238,11 @@ namespace Opm
// thp
thp()[ newIndex ] = prevState->thp()[ oldIndex ];
// Currently this is taken care of by updateWellStateFromTarge. Maybe we should just remove the initialization and just use updateWellStateFromTarget
//if (effective_events_occurred_[w]) {
// continue;
//}
current_injection_controls_[ newIndex ] = prevState->currentInjectionControls()[ oldIndex ];
current_production_controls_[ newIndex ] = prevState->currentProductionControls()[ oldIndex ];
// If new target is set using WCONPROD, WCONINJE etc. we change to the new control.
if (!effective_events_occurred_[w]) {
current_injection_controls_[ newIndex ] = prevState->currentInjectionControls()[ oldIndex ];
current_production_controls_[ newIndex ] = prevState->currentProductionControls()[ oldIndex ];
}
// wellrates
for( int i=0, idx=newIndex*np, oldidx=oldIndex*np; i<np; ++i, ++idx, ++oldidx )