From 49df0c12f688a651a29ad4260b51632731210d56 Mon Sep 17 00:00:00 2001
From: Kai Bao <kai.bao@sintef.no>
Date: Thu, 10 Aug 2017 13:33:45 +0200
Subject: [PATCH] cleaing up and fixing the error from rebasing.

---
 opm/autodiff/StandardWell_impl.hpp       | 27 ------------------------
 opm/autodiff/StandardWellsDense_impl.hpp |  8 ++-----
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/opm/autodiff/StandardWell_impl.hpp b/opm/autodiff/StandardWell_impl.hpp
index 8c48ecfeb..71af53dbe 100644
--- a/opm/autodiff/StandardWell_impl.hpp
+++ b/opm/autodiff/StandardWell_impl.hpp
@@ -807,7 +807,6 @@ namespace Opm
                     const BlackoilModelParameters& param,
                     WellState& well_state) const
     {
-        // TODO: to check whether all the things from PR 1220 were incoporated.
         const int np = number_of_phases_;
         const int nw = well_state.bhp().size();
         const double dBHPLimit = param.dbhp_max_rel_;
@@ -1311,21 +1310,6 @@ namespace Opm
             well_controls_set_current( wc, current);
         }
 
-        // update whether well is under group control
-        /* if (wellCollection()->groupControlActive()) {
-            // get well node in the well collection
-            WellNode& well_node = well_collection_->findWellNode(std::string(wells().name[w]));
-
-            // update whehter the well is under group control or individual control
-            if (well_node.groupControlIndex() >= 0 && current == well_node.groupControlIndex()) {
-                // under group control
-                well_node.setIndividualControl(false);
-            } else {
-                // individual control
-                well_node.setIndividualControl(true);
-            }
-        } */
-
         // the new well control indices after all the related updates,
         const int updated_control_index = xw.currentControls()[w];
 
@@ -1339,17 +1323,6 @@ namespace Opm
         if (updated_control_index != old_control_index) { //  || well_collection_->groupControlActive()) {
             updateWellStateWithTarget(updated_control_index, xw);
         }
-
-        // upate the well targets following group controls
-        // it will not change the control mode, only update the targets
-        /* if (wellCollection()->groupControlActive()) {
-            applyVREPGroupControl(xw);
-            wellCollection()->updateWellTargets(xw.wellRates());
-            for (int w = 0; w < nw; ++w) {
-                const WellControls* wc = wells().ctrls[w];
-                updateWellStateWithTarget(wc, updated_control_index[w], w, xw);
-            }
-        } */
     }
 
 
diff --git a/opm/autodiff/StandardWellsDense_impl.hpp b/opm/autodiff/StandardWellsDense_impl.hpp
index e7bf238b8..4b262a06c 100644
--- a/opm/autodiff/StandardWellsDense_impl.hpp
+++ b/opm/autodiff/StandardWellsDense_impl.hpp
@@ -24,10 +24,6 @@ namespace Opm {
        , has_polymer_(GET_PROP_VALUE(TypeTag, EnablePolymer))
        , current_timeIdx_(current_timeIdx)
        , rate_converter_(rate_converter)
-       , well_perforation_efficiency_factors_((wells_!=nullptr ? wells_->well_connpos[wells_->number_of_wells] : 0), 1.0)
-       , well_perforation_densities_( wells_ ? wells_arg->well_connpos[wells_arg->number_of_wells] : 0)
-       , well_perforation_pressure_diffs_( wells_ ? wells_arg->well_connpos[wells_arg->number_of_wells] : 0)
-       , wellVariables_( wells_ ? (wells_arg->number_of_wells * numWellEq) : 0)
     {
        createWellContainer(wells_arg);
     }
@@ -507,7 +503,6 @@ namespace Opm {
             well_state = well_state0;
             setWellSolutions(well_state);
             // also recover the old well controls
-            // TODO: well_solutions_ for each well not recovered here.
             for (int w = 0; w < nw; ++w) {
                 WellControls* wc = well_container_[w]->wellControls();
                 well_controls_set_current(wc, well_state.currentControls()[w]);
@@ -586,6 +581,8 @@ namespace Opm {
             }
         }
 
+        // TODO: there should be a better way to do the following, while I did not find
+        // a direct way to handle boolean variables there.
         {
             const auto& grid = ebosSimulator.gridManager().grid();
             int value = 0;
@@ -995,7 +992,6 @@ namespace Opm {
     StandardWellsDense<TypeTag>::
     computeRepRadiusPerfLength(const Grid& grid)
     {
-
         // TODO, the function does not work for parallel running
         // to be fixed later.
         int number_of_cells = Opm::UgGridHelpers::numCells(grid);