Changes needed to for makeing a simulator using ImplicitTransport. Several changes in names to highlight what is reorder simulator classes

opm/core/transport/TwoPhaseTransportSolver.cpp

@@ -29,6 +29,4 @@
 
 #include "TwoPhaseTransportSolver.hpp"
 
-TwoPhaseTransportSolver::TwoPhaseTransportSolver()
-{
-}
+

opm/core/transport/TwoPhaseTransportSolver.hpp

@@ -29,24 +29,32 @@
 
 #ifndef TWOPHASETRANSPORTSOLVER_HPP
 #define TWOPHASETRANSPORTSOLVER_HPP
-/// Base class for tranport solvers
-class TwoPhaseTransportSolver
-{
-public:
-    /// Construct solver.
-    virtual ~TwoPhaseTransportSolver() {};
 
-    /// Solve for saturation at next timestep.
-    /// \param[in] darcyflux         Array of signed face fluxes.
-    /// \param[in] porevolume        Array of pore volumes.
-    /// \param[in] source            Transport source term.
-    /// \param[in] dt                Time step.
-    /// \param[in, out] saturation   Phase saturations.
-    virtual void solve(const double* darcyflux,
-               const double* porevolume,
-               const double* source,
-               const double dt,
-               std::vector<double>& saturation) = 0;
-};
+#include <opm/core/simulator/TwophaseState.hpp>
+#include <opm/core/simulator/WellState.hpp>
+namespace Opm
+{
+
+    /// Base class for tranport solvers
+    class TwoPhaseTransportSolver
+    {
+    public:
+        /// Virtual destructor to enable inheritance.
+        virtual ~TwoPhaseTransportSolver() {}
+
+        /// Solve for saturation at next timestep.
+        /// \param[in] darcyflux         Array of signed face fluxes.
+        /// \param[in] porevolume        Array of pore volumes.
+        /// \param[in] source            Transport source term.
+        /// \param[in] dt                Time step.
+        /// \param[in, out] saturation   Phase saturations.
+        virtual void solve(const double* porevolume,
+                           const double* source,
+                           const double dt,
+                           TwophaseState& state,
+                           WellState& wstate) = 0;
+    };
+
+}
 
 #endif // TWOPHASETRANSPORTSOLVER_HPP