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

This commit is contained in:
Halvor Møll Nilsen 2012-11-16 13:38:03 +01:00
parent cfae3edcaf
commit 74cddb0b01
2 changed files with 27 additions and 21 deletions

View File

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

View File

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