Further reduction of modifications.

opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp

@@ -218,7 +218,7 @@ public:
             ebosSimulator_.setEpisodeIndex(-1);
             ebosSimulator_.setEpisodeLength(0.0);
             ebosSimulator_.setTimeStepSize(0.0);
-            // make cach upto date. no nead for updating it in elementCtx
+            // Make cache up to date. No need for updating it in elementCtx.
             ebosSimulator_.model().invalidateAndUpdateIntensiveQuantities(/*timeIdx=*/0);
             wellModel_().beginReportStep(timer.currentStepNum());
             ebosSimulator_.problem().writeOutput();

opm/simulators/wells/BlackoilWellModel.hpp

@@ -128,8 +128,6 @@ namespace Opm {
             typedef Dune::FieldVector<Scalar, numEq    > VectorBlockType;
             typedef Dune::BlockVector<VectorBlockType> BVector;
 
-            typedef Opm::MatrixBlock<Scalar, numEq, numEq > MatrixBlockType;
-
             typedef BlackOilPolymerModule<TypeTag> PolymerModule;
             typedef BlackOilMICPModule<TypeTag> MICPModule;
 
@@ -210,13 +208,11 @@ namespace Opm {
             {
                 endReportStep();
             }
-            
-      
+
             void computeTotalRatesForDof(RateVector& rate,
                                          unsigned globalIdx,
                                          unsigned timeIdx) const;
 
-            
             template <class Context>
             void computeTotalRatesForDof(RateVector& rate,
                                          const Context& context,
@@ -273,9 +269,6 @@ namespace Opm {
 
             void addWellContributions(SparseMatrixAdapter& jacobian) const;
 
-            // void addReservoirSourceTerms(GlobalEqVector& residual,
-            //                              SparseMatrixAdapter& jacobian) const;
-
             // called at the beginning of a report step
             void beginReportStep(const int time_step);
 

opm/simulators/wells/BlackoilWellModel_impl.hpp

@@ -1202,38 +1202,6 @@ namespace Opm {
         }
     }
 
-#if 0
-    template<typename TypeTag>
-    void
-    BlackoilWellModel<TypeTag>::
-    addReservoirSourceTerms(GlobalEqVector& residual,
-                            SparseMatrixAdapter& jacobian) const
-    {
-        // NB this loop may write to same element if a cell has more than one perforation
-#ifdef _OPENMP
-#pragma omp parallel for
-#endif
-        for (size_t i = 0; i < well_container_.size(); i++) {
-            const auto& well = well_container_[i];
-            if (!well->isOperableAndSolvable() && !well->wellIsStopped())
-                continue;
-            const auto& cells = well->cells();
-            const auto& rates = well->connectionRates();
-            for (unsigned perfIdx = 0; perfIdx < rates.size(); ++perfIdx) {
-                unsigned cellIdx = cells[perfIdx];
-                auto rate = rates[perfIdx];
-                // Scalar volume = ebosSimulator_.model().dofTotalVolume(cellIdx);
-                rate *= -1.0;
-                VectorBlockType res(0.0);
-                MatrixBlockType bMat(0.0);
-                ebosSimulator_.model().linearizer().setResAndJacobi(res, bMat, rate);
-                residual[cellIdx] += res;
-                jacobian.addToBlock(cellIdx, cellIdx, bMat);
-            }
-        }
-    }
-#endif
-
     template<typename TypeTag>
     void
     BlackoilWellModel<TypeTag>::

opm/simulators/wells/WellInterface.hpp

@@ -288,7 +288,6 @@ public:
                            const GroupState& group_state,
                            DeferredLogger& deferred_logger);
 
-//    const std::vector<RateVector>& connectionRates() const {return connectionRates_;}
 protected:
 
     // simulation parameters