Add MessageContainer to EclipseState.

This commit is contained in:
Liu Ming
2016-04-11 10:44:39 +08:00
parent 0d0fc43e50
commit ed92c70efd
2 changed files with 15 additions and 0 deletions

View File

@@ -42,6 +42,7 @@
#include <opm/parser/eclipse/Parser/ParserKeywords/M.hpp>
#include <opm/parser/eclipse/Units/Dimension.hpp>
#include <opm/parser/eclipse/Units/UnitSystem.hpp>
#include <opm/parser/eclipse/Parser/MessageContainer.hpp>
namespace Opm {
@@ -125,6 +126,7 @@ namespace Opm {
initFaults(deck);
initMULTREGT(deck);
initNNC(deck);
initMessageContainer();
}
const UnitSystem& EclipseState::getDeckUnitSystem() const {
@@ -141,6 +143,11 @@ namespace Opm {
}
std::shared_ptr<MessageContainer> EclipseState::getMessageContainer() {
return m_messageContainer;
}
std::shared_ptr<const TableManager> EclipseState::getTableManager() const {
return m_tables;
}
@@ -238,6 +245,10 @@ namespace Opm {
m_nnc = std::make_shared<NNC>( deck, grid);
}
void EclipseState::initMessageContainer() {
m_messageContainer = std::make_shared<MessageContainer>();
}
void EclipseState::initTransMult() {
EclipseGridConstPtr grid = getEclipseGrid();
m_transMult = std::make_shared<TransMult>( grid->getNX() , grid->getNY() , grid->getNZ());

View File

@@ -50,6 +50,7 @@ namespace Opm {
class TableManager;
class TransMult;
class UnitSystem;
class MessageContainer;
class EclipseState {
public:
@@ -70,6 +71,7 @@ namespace Opm {
std::shared_ptr< const SimulationConfig > getSimulationConfig() const;
std::shared_ptr< const EclipseGrid > getEclipseGrid() const;
std::shared_ptr< EclipseGrid > getEclipseGridCopy() const;
std::shared_ptr< MessageContainer> getMessageContainer();
bool hasPhase(enum Phase::PhaseEnum phase) const;
std::string getTitle() const;
bool supportsGridProperty(const std::string& keyword, int enabledTypes=AllProperties) const;
@@ -120,6 +122,7 @@ namespace Opm {
void initTransMult();
void initFaults(std::shared_ptr< const Deck > deck);
void initNNC(std::shared_ptr< const Deck > deck);
void initMessageContainer();
void setMULTFLT(std::shared_ptr<const Opm::Section> section) const;
@@ -169,6 +172,7 @@ namespace Opm {
std::shared_ptr<NNC> m_nnc;
std::string m_defaultRegion;
const ParseContext& m_parseContext;
std::shared_ptr<MessageContainer> m_messageContainer;
};
typedef std::shared_ptr<EclipseState> EclipseStatePtr;