fixing mistakes due to rebasing.

opm/autodiff/BlackoilWellModel.hpp

@@ -379,7 +379,7 @@ namespace Opm {
             /// at the beginning of the time step and no derivatives are included in these quantities
             void calculateExplicitQuantities(Opm::DeferredLogger& deferred_logger) const;
 
-            SimulatorReport solveWellEq(const double dt, Opm::DeferredLogger& deferred_logger);
+            SimulatorReport solveWellEq(const std::vector<Scalar>& B_avg, const double dt, Opm::DeferredLogger& deferred_logger);
 
             void initPrimaryVariablesEvaluation() const;
 
@@ -392,7 +392,7 @@ namespace Opm {
 
             void resetWellControlFromState() const;
 
-            void assembleWellEq(const double dt, Opm::DeferredLogger& deferred_logger);
+            void assembleWellEq(const std::vector<Scalar>& B_avg, const double dt, Opm::DeferredLogger& deferred_logger);
 
             // some preparation work, mostly related to group control and RESV,
             // at the beginning of each time step (Not report step)

opm/autodiff/BlackoilWellModel_impl.hpp

@@ -688,6 +688,7 @@ namespace Opm {
             initPrimaryVariablesEvaluation();
 
 
+
             std::vector< Scalar > B_avg(numComponents(), Scalar() );
             computeAverageFormationFactor(B_avg);
 
@@ -707,8 +708,8 @@ namespace Opm {
                 // basically, this is a more updated state from the solveWellEq based on fixed
                 // reservoir state, will tihs be a better place to inialize the explict information?
             }
-
-            assembleWellEq(dt, local_deferredLogger);
+	    assembleWellEq(B_avg, dt, local_deferredLogger);
+	    
         } catch (std::exception& e) {
             exception_thrown = 1;
         }
@@ -720,10 +721,10 @@ namespace Opm {
     template<typename TypeTag>
     void
     BlackoilWellModel<TypeTag>::
-    assembleWellEq(const double dt, Opm::DeferredLogger& deferred_logger)
+    assembleWellEq(const std::vector<Scalar>& B_avg, const double dt, Opm::DeferredLogger& deferred_logger)
     {
         for (auto& well : well_container_) {
-            well->assembleWellEq(ebosSimulator_, dt, well_state_, deferred_logger);
+            well->assembleWellEq(ebosSimulator_, B_avg, dt, well_state_, deferred_logger);
         }
     }
 
@@ -878,7 +879,7 @@ namespace Opm {
     template<typename TypeTag>
     SimulatorReport
     BlackoilWellModel<TypeTag>::
-    solveWellEq(const double dt, Opm::DeferredLogger& deferred_logger)
+    solveWellEq(const std::vector<Scalar>& B_avg, const double dt, Opm::DeferredLogger& deferred_logger)
     {
         WellState well_state0 = well_state_;
 
@@ -888,8 +889,9 @@ namespace Opm {
         bool converged;
         int exception_thrown = 0;
         do {
+
             try {
-                assembleWellEq(dt, deferred_logger);
+                assembleWellEq(B_avg, dt, deferred_logger);
             } catch (std::exception& e) {
                 exception_thrown = 1;
             }

opm/autodiff/MultisegmentWell_impl.hpp

@@ -2066,10 +2066,4 @@ namespace Opm
         return volume / vol_ratio;
     }
 
-    }
-
-
-
-
-
 }

opm/autodiff/WellInterface_impl.hpp

@@ -1182,7 +1182,7 @@ namespace Opm
         bool converged;
         WellState well_state0 = well_state;
         do {
-            assembleWellEq(ebosSimulator, dt, well_state, deferred_logger);
+            assembleWellEq(ebosSimulator, B_avg, dt, well_state, deferred_logger);
 
             auto report = getWellConvergence(B_avg, deferred_logger);