From dadb31f0931785c85ac475ced85b3a259dcaa396 Mon Sep 17 00:00:00 2001 From: Kai Bao Date: Fri, 15 Mar 2019 10:25:53 +0100 Subject: [PATCH] fixing some mistakes from rebasing --- opm/autodiff/MultisegmentWell.hpp | 2 +- opm/autodiff/MultisegmentWell_impl.hpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/opm/autodiff/MultisegmentWell.hpp b/opm/autodiff/MultisegmentWell.hpp index 67375e875..bbd075f3c 100644 --- a/opm/autodiff/MultisegmentWell.hpp +++ b/opm/autodiff/MultisegmentWell.hpp @@ -272,7 +272,7 @@ namespace Opm // updating the well_state based on well solution dwells void updateWellState(const BVectorWell& dwells, WellState& well_state, - Opm::DeferredLogger& deferred_logger, + Opm::DeferredLogger& deferred_logger, const double relaxation_factor=1.0) const; diff --git a/opm/autodiff/MultisegmentWell_impl.hpp b/opm/autodiff/MultisegmentWell_impl.hpp index ffc2d5868..38967062d 100644 --- a/opm/autodiff/MultisegmentWell_impl.hpp +++ b/opm/autodiff/MultisegmentWell_impl.hpp @@ -590,7 +590,7 @@ namespace Opm template void MultisegmentWell:: - updatePrimaryVariables(const WellState& well_state, Opm::DeferredLogger& deferred_logger) const + updatePrimaryVariables(const WellState& well_state, Opm::DeferredLogger& /* deferred_logger */) const { // TODO: to test using rate conversion coefficients to see if it will be better than // this default one @@ -767,9 +767,8 @@ namespace Opm void MultisegmentWell:: updateWellState(const BVectorWell& dwells, - WellState& well_state, - Opm::DeferredLogger& deferred_logger + Opm::DeferredLogger& deferred_logger, const double relaxation_factor) const { const double dFLimit = param_.dwell_fraction_max_; @@ -823,7 +822,7 @@ namespace Opm const WellState& well_state, Opm::DeferredLogger& deferred_logger) { - updatePrimaryVariables(well_state); + updatePrimaryVariables(well_state, deferred_logger); initPrimaryVariablesEvaluation(); computePerfCellPressDiffs(ebosSimulator); computeInitialSegmentFluids(ebosSimulator);