Merge pull request #6549 from daavid00/backport-of-pr-6539

UDQ support for WTRACER

opm/simulators/flow/GenericTracerModel.hpp

@@ -138,7 +138,9 @@ protected:
                                std::vector<TracerVector>& x,
                                std::vector<TracerVector>& b);
 
-    Scalar currentConcentration_(const Well& eclWell, const std::string& name) const;
+    Scalar currentConcentration_(const Well& eclWell,
+                                 const std::string& trName,
+                                 const SummaryState& summaryState) const;
 
     //! \brief Tracer type index
     enum TracerTypeIdx {

opm/simulators/flow/GenericTracerModel_impl.hpp

@@ -208,9 +208,11 @@ enableSolTracers() const
 
 template<class Grid, class GridView, class DofMapper, class Stencil, class FluidSystem, class Scalar>
 Scalar GenericTracerModel<Grid,GridView,DofMapper,Stencil,FluidSystem,Scalar>::
-currentConcentration_(const Well& eclWell, const std::string& name) const
+currentConcentration_(const Well& eclWell, const std::string& trName, const SummaryState& summaryState) const
 {
-    return eclWell.getTracerProperties().getConcentration(name);
+    return eclWell.getTracerProperties().getConcentration(WellTracerProperties::Well { eclWell.name() },
+                                                          WellTracerProperties::Tracer { trName },
+                                                          summaryState);
 }
 
 template<class Grid, class GridView, class DofMapper, class Stencil, class FluidSystem, class Scalar>

opm/simulators/flow/TracerModel.hpp

@@ -463,7 +463,8 @@ protected:
 
         std::vector<Scalar> wtracer(tr.numTracer());
         for (int tIdx = 0; tIdx < tr.numTracer(); ++tIdx) {
-            wtracer[tIdx] = this->currentConcentration_(eclWell, this->name(tr.idx_[tIdx]));
+            wtracer[tIdx] = this->currentConcentration_(eclWell, this->name(tr.idx_[tIdx]),
+                                                        simulator_.problem().wellModel().summaryState());
         }
 
         const Scalar dt = simulator_.timeStepSize();