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

OPM-211: Added InitConfig member to EclipseState

Browse Source
This commit is contained in:
Edvin Brudevoll
2015-06-09 09:40:48 +02:00
parent 90c023f1f0
commit b163ce400b
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opm/parser/eclipse/EclipseState/EclipseState.cpp
View File

@@ -137,6 +137,7 @@ namespace Opm {
initIOConfigPostSchedule(deck);
initTitle(deck);
initProperties(deck);
initInitConfig(deck);
initSimulationConfig(deck);
initTransMult();
initFaults(deck);
@@ -265,6 +266,10 @@ namespace Opm {
return m_ioConfig;
}
InitConfigConstPtr EclipseState::getInitConfig() const {
return m_initConfig;
}
SimulationConfigConstPtr EclipseState::getSimulationConfig() const {
return m_simulationConfig;
}
@@ -374,7 +379,6 @@ namespace Opm {
}
}
void EclipseState::initIOConfigPostSchedule(DeckConstPtr deck) {
if (Section::hasSOLUTION(deck)) {
std::shared_ptr<const SOLUTIONSection> solutionSection = std::make_shared<const SOLUTIONSection>(deck);
@@ -382,6 +386,9 @@ namespace Opm {
}
}
void EclipseState::initInitConfig(DeckConstPtr deck){
m_initConfig = std::make_shared<const InitConfig>(deck);
}
void EclipseState::initSimulationConfig(DeckConstPtr deck) {
m_simulationConfig = std::make_shared<const SimulationConfig>(deck , m_intGridProperties);
@@ -468,6 +475,7 @@ namespace Opm {
for (size_t index=0; index < section->count("MULTFLT"); index++) {
DeckKeywordConstPtr faultsKeyword = section->getKeyword("MULTFLT" , index);
for (auto iter = faultsKeyword->begin(); iter != faultsKeyword->end(); ++iter) {
DeckRecordConstPtr faultRecord = *iter;
const std::string& faultName = faultRecord->getItem(0)->getString(0);
double multFlt = faultRecord->getItem(1)->getRawDouble(0);

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

@@ -58,7 +58,7 @@
#include <opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SwofTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SwfnTable.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
@@ -80,6 +80,7 @@ namespace Opm {
ScheduleConstPtr getSchedule() const;
IOConfigConstPtr getIOConfig() const;
InitConfigConstPtr getInitConfig() const;
SimulationConfigConstPtr getSimulationConfig() const;
EclipseGridConstPtr getEclipseGrid() const;
EclipseGridPtr getEclipseGridCopy() const;
@@ -144,6 +145,7 @@ namespace Opm {
void initIOConfig(DeckConstPtr deck);
void initSchedule(DeckConstPtr deck);
void initIOConfigPostSchedule(DeckConstPtr deck);
void initInitConfig(DeckConstPtr deck);
void initSimulationConfig(DeckConstPtr deck);
void initEclipseGrid(DeckConstPtr deck);
void initGridopts(DeckConstPtr deck);
@@ -245,6 +247,7 @@ namespace Opm {
EclipseGridConstPtr m_eclipseGrid;
IOConfigPtr m_ioConfig;
InitConfigConstPtr m_initConfig;
ScheduleConstPtr schedule;
SimulationConfigConstPtr m_simulationConfig;