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

@@ -29,7 +29,6 @@
#include <opm/core/simulator/BlackoilState.hpp>
#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
#include <opm/autodiff/WellStateFullyImplicitBlackoilDense.hpp>
#include <opm/autodiff/BlackoilSolventState.hpp>
#include <opm/output/data/Cells.hpp>
#include <opm/output/data/Solution.hpp>
#include <opm/output/data/Wells.hpp>
@@ -111,7 +110,7 @@ data::Solution simToSolution( const SimulationDataContainer& reservoir,
}
if (phases.has_solvent) {
sol.insert( "SSOL", UnitSystem::measure::identity, reservoir.getCellData( BlackoilSolventState::SSOL ) , data::TargetType::RESTART_SOLUTION );
sol.insert( "SSOL", UnitSystem::measure::identity, reservoir.getCellData( BlackoilState::SSOL ) , data::TargetType::RESTART_SOLUTION );
}
return sol;