From 72ca91d59b60ab6f14cd80405570d37ef755e7cc Mon Sep 17 00:00:00 2001
From: Kai Bao <kai.bao@sintef.no>
Date: Fri, 28 Jul 2017 10:08:57 +0200
Subject: [PATCH] more cleaning up for StandardWellsDense and StandardWell

---
 opm/autodiff/StandardWell.hpp            | 16 ++++++-------
 opm/autodiff/StandardWellsDense.hpp      |  5 ----
 opm/autodiff/StandardWellsDense_impl.hpp | 29 ------------------------
 3 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/opm/autodiff/StandardWell.hpp b/opm/autodiff/StandardWell.hpp
index 83df3027a..b0d2b7680 100644
--- a/opm/autodiff/StandardWell.hpp
+++ b/opm/autodiff/StandardWell.hpp
@@ -39,13 +39,13 @@ namespace Opm
         // TODO: several functions related to polymer and PLYSHLOG are not incorprated yet,
         // like the function wpolymer, setupCompressedToCartesian, computeRepRadiusPerfLength,
         // They are introduced though PR 1220 and will be included later.
-        using Simulator = typename WellInterface<TypeTag>::Simulator;
-        using WellState = typename WellInterface<TypeTag>::WellState;
-        using IntensiveQuantities = typename WellInterface<TypeTag>::IntensiveQuantities;
-        using FluidSystem = typename WellInterface<TypeTag>::FluidSystem;
-        using MaterialLaw = typename WellInterface<TypeTag>::MaterialLaw;
-        using ModelParameters = typename WellInterface<TypeTag>::ModelParameters;
-        using BlackoilIndices = typename WellInterface<TypeTag>::BlackoilIndices;
+        using typename WellInterface<TypeTag>::Simulator;
+        using typename WellInterface<TypeTag>::WellState;
+        using typename WellInterface<TypeTag>::IntensiveQuantities;
+        using typename WellInterface<TypeTag>::FluidSystem;
+        using typename WellInterface<TypeTag>::MaterialLaw;
+        using typename WellInterface<TypeTag>::ModelParameters;
+        using typename WellInterface<TypeTag>::BlackoilIndices;
 
         // the positions of the primary variables for StandardWell
         // there are three primary variables, the second and the third ones are F_w and F_g
@@ -57,13 +57,13 @@ namespace Opm
             SFrac = 3
         };
 
-        using WellInterface<TypeTag>::numEq;
         using typename WellInterface<TypeTag>::VectorBlockType;
         using typename WellInterface<TypeTag>::MatrixBlockType;
         using typename WellInterface<TypeTag>::Mat;
         using typename WellInterface<TypeTag>::BVector;
         using typename WellInterface<TypeTag>::Eval;
 
+        using WellInterface<TypeTag>::numEq;
         static const int numWellEq = GET_PROP_VALUE(TypeTag, EnablePolymer)? numEq-1 : numEq; // //numEq; //number of wellEq is only numEq for polymer
         static const int contiSolventEqIdx = BlackoilIndices::contiSolventEqIdx;
         static const int contiPolymerEqIdx = BlackoilIndices::contiPolymerEqIdx;
diff --git a/opm/autodiff/StandardWellsDense.hpp b/opm/autodiff/StandardWellsDense.hpp
index b0cf3e28c..025eedc84 100644
--- a/opm/autodiff/StandardWellsDense.hpp
+++ b/opm/autodiff/StandardWellsDense.hpp
@@ -76,10 +76,7 @@ namespace Opm {
             typedef typename GET_PROP_TYPE(TypeTag, FluidSystem)         FluidSystem;
             typedef typename GET_PROP_TYPE(TypeTag, ElementContext)      ElementContext;
             typedef typename GET_PROP_TYPE(TypeTag, Indices)             BlackoilIndices;
-            typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables)    PrimaryVariables;
-            typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw)         MaterialLaw;
             typedef typename GET_PROP_TYPE(TypeTag, Simulator)           Simulator;
-            typedef typename GET_PROP_TYPE(TypeTag, IntensiveQuantities) IntensiveQuantities;
             typedef typename GET_PROP_TYPE(TypeTag, Scalar)              Scalar;
 
             static const int numEq = BlackoilIndices::numEq;
@@ -282,8 +279,6 @@ namespace Opm {
 
             void computeAverageFormationFactor(Simulator& ebosSimulator,
                                                std::vector<double>& B_avg) const;
-
-            void outputWellState(const WellState& well_state) const;
         };
 
 
diff --git a/opm/autodiff/StandardWellsDense_impl.hpp b/opm/autodiff/StandardWellsDense_impl.hpp
index ef70793c9..c3ab836f5 100644
--- a/opm/autodiff/StandardWellsDense_impl.hpp
+++ b/opm/autodiff/StandardWellsDense_impl.hpp
@@ -1116,33 +1116,4 @@ namespace Opm {
     }
 
 
-
-
-    template<typename TypeTag>
-    void
-    StandardWellsDense<TypeTag>::
-    outputWellState(const WellState& well_state) const
-    {
-        std::cout << " output the bhp " << std::endl;
-        for (const double bhp : well_state.bhp()) {
-            std::cout << bhp << " ";
-        }
-        std::cout << std::endl;
-
-        std::cout << " output the well rates " << std::endl;
-        for (const double rate : well_state.wellRates()) {
-            std::cout << rate << " ";
-        }
-        std::cout << std::endl;
-
-        std::cout << " output the wellSolutions " << std::endl;
-        for (const double solution : well_state.wellSolutions()) {
-            std::cout << solution << " ";
-        }
-        std::cout << std::endl;
-    }
-
-
-
-
 } // namespace Opm