Merge pull request #1458 from joakim-hove/eclstate-aquifer-config

Eclstate aquifer config
This commit is contained in:
Joakim Hove
2020-02-20 08:25:25 +01:00
committed by GitHub
6 changed files with 167 additions and 8 deletions

View File

@@ -24,6 +24,7 @@
#include <vector>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/EclipseState/AquiferConfig.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Edit/EDITNNC.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
@@ -57,6 +58,7 @@ namespace Opm {
class TableManager;
class UnitSystem;
class EclipseState {
public:
enum EnabledTypes {
@@ -104,7 +106,7 @@ namespace Opm {
void applyModifierDeck(const Deck& deck);
const Runspec& runspec() const;
const AquiferConfig& aquifer() const;
private:
void initIOConfigPostSchedule(const Deck& deck);
void initTransMult();
@@ -128,7 +130,7 @@ namespace Opm {
FaultCollection m_faults;
std::string m_title;
AquiferConfig aquifer_config;
};
}