Remove BlackoilSolventState

The solvent saturation is added to BlackoilState and the
BlackoilSolventState is thus redundant.
This commit is contained in:
Tor Harald Sandve
2017-05-10 11:16:28 +02:00
parent b987e4b324
commit 50c1a1404a
8 changed files with 5 additions and 90 deletions

View File

@@ -22,7 +22,6 @@
#include <opm/autodiff/SimulatorBase.hpp>
#include <opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp>
#include <opm/autodiff/BlackoilSolventState.hpp>
#include <opm/autodiff/BlackoilSolventModel.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
@@ -85,7 +84,7 @@ namespace Opm
struct SimulatorTraits<SimulatorFullyImplicitBlackoilSolvent<GridT> >
{
typedef WellStateFullyImplicitBlackoilSolvent WellState;
typedef BlackoilSolventState ReservoirState;
typedef BlackoilState ReservoirState;
typedef BlackoilOutputWriter OutputWriter;
typedef GridT Grid;
typedef BlackoilSolventModel<Grid> Model;