OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extracted Schedule and SummaryConfig,

Browse Source
This commit is contained in:
Joakim Hove
2017-09-27 16:34:38 +02:00
parent 77fcc865de
commit 612e255d4f
21 changed files with 124 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/EclipseState/EclipseState.hpp
View File

@@ -30,7 +30,6 @@
#include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/TransMult.hpp>
#include <opm/parser/eclipse/EclipseState/Runspec.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
#include <opm/parser/eclipse/Parser/MessageContainer.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
@@ -69,8 +68,6 @@ namespace Opm {
EclipseState(const Deck& deck , ParseContext parseContext = ParseContext());
const ParseContext& getParseContext() const;
const Schedule& getSchedule() const;
const IOConfig& getIOConfig() const;
IOConfig& getIOConfig();
@@ -129,7 +126,6 @@ namespace Opm {
Eclipse3DProperties m_eclipseProperties;
const SimulationConfig m_simulationConfig;
TransMult m_transMult;
Schedule m_schedule;
FaultCollection m_faults;
std::string m_title;

7
opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
View File

@@ -53,8 +53,11 @@ namespace Opm
class Schedule {
public:
Schedule(const ParseContext& parseContext, const EclipseGrid& grid,
const Eclipse3DProperties& eclipseProperties ,const Deck& deck, const Phases &phases );
Schedule(const Deck& deck,
const EclipseGrid& grid,
const Eclipse3DProperties& eclipseProperties,
const Phases &phases,
const ParseContext& parseContext);
/*
* If the input deck does not specify a start time, Eclipse's 1. Jan