Relegating implementation details.

ebos/eclgenerictracermodel.cc

@@ -269,7 +269,7 @@ linearSolveBatchwise_(const TracerMatrix& M, std::vector<TracerVector>& x, std::
                          verbosity);
 
     bool converged = true;
-    for (int nrhs =0; nrhs < b.size(); ++nrhs) {
+    for (size_t nrhs =0; nrhs < b.size(); ++nrhs) {
         x[nrhs] = 0.0;
         Dune::InverseOperatorResult result;
         solver.apply(x[nrhs], b[nrhs], result);

opm/simulators/wells/BlackoilWellModel.hpp

@@ -63,7 +63,6 @@
 #include <opm/simulators/wells/WellProdIndexCalculator.hpp>
 #include <opm/simulators/wells/ParallelWellInfo.hpp>
 #include <opm/simulators/timestepping/gatherConvergenceReport.hpp>
-#include <ebos/eclgenerictracermodel.hh>
 #include <dune/common/fmatrix.hh>
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/matrixmatrix.hh>
@@ -219,7 +218,7 @@ namespace Opm {
                                                           return this->wasDynamicallyShutThisTimeStep(well_ndex);
                                                       });
 
-                this->assignWellTracerRates(wsrpt, ebosSimulator_.problem().tracerModel().getWellTracerRates());
+                this->assignWellTracerRates(wsrpt);
 
                 this->assignWellGuideRates(wsrpt);
                 this->assignShutConnections(wsrpt, this->reportStepIndex());
@@ -382,8 +381,7 @@ namespace Opm {
 
             void computeWellTemperature();
 
-            void assignWellTracerRates(data::Wells& wsrpt,
-                                       const std::map<std::pair<std::string, std::string>, double>& wellTracerRates) const;
+            void assignWellTracerRates(data::Wells& wsrpt) const;
 
         private:
             BlackoilWellModel(Simulator& ebosSimulator, const PhaseUsage& pu);

opm/simulators/wells/BlackoilWellModel_impl.hpp

@@ -1567,9 +1567,9 @@ namespace Opm {
     template <typename TypeTag>
     void
     BlackoilWellModel<TypeTag>::
-    assignWellTracerRates(data::Wells& wsrpt,
-                          const std::map<std::pair<std::string, std::string>, double>& wellTracerRates) const
+    assignWellTracerRates(data::Wells& wsrpt) const
     {
+        const auto & wellTracerRates = ebosSimulator_.problem().tracerModel().getWellTracerRates();
 
         if (wellTracerRates.empty())
             return; // no tracers