Replaced SimulatorState -> SimulationDatacontainer
Have removed the SimulatorState base class, and instead replaced with the SimulationDatacontainer class from opm-common. The SimulatorState objects were typcially created with a default constructor, and then explicitly initialized with a SimulatorState::init() method. For the SimulationDataContainer RAII is employed; the init( ) has been removed - and there is no default constructor.
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
|
||||
#include <opm/parser/eclipse/Deck/Deck.hpp>
|
||||
|
||||
#include <opm/core/simulator/SimulatorState.hpp>
|
||||
|
||||
struct UnstructuredGrid;
|
||||
|
||||
namespace Opm
|
||||
@@ -31,6 +31,7 @@ namespace Opm
|
||||
namespace parameter { class ParameterGroup; }
|
||||
class IncompPropertiesInterface;
|
||||
class BlackoilPropertiesInterface;
|
||||
class SimulationDataContainer;
|
||||
|
||||
/// \file
|
||||
///
|
||||
@@ -45,7 +46,7 @@ namespace Opm
|
||||
|
||||
enum ExtremalSat { MinSat, MaxSat };
|
||||
template <class Props>
|
||||
static void initSaturation(const std::vector<int>& cells , const Props& props , SimulatorState& state , ExtremalSat satType);
|
||||
static void initSaturation(const std::vector<int>& cells , const Props& props , SimulationDataContainer& state , ExtremalSat satType);
|
||||
|
||||
|
||||
/// Initialize a two-phase state from parameters.
|
||||
|
||||
Reference in New Issue
Block a user