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

Moved SummaryConfig to EclipseState root.

Browse Source
This commit is contained in:
Joakim Hove 2017-09-24 02:34:01 +02:00
parent 4c3aacc685
commit df12c44963
5 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/parser/eclipse/EclipseState/EclipseConfig.hpp
View File

@ -29,21 +29,11 @@
namespace Opm {
class Deck;
class GridDims;
class Eclipse3DProperties;
class IOConfig;
class ParseContext;
class TableManager;
class EclipseConfig
{
public:
EclipseConfig(const Deck& deck,
const Eclipse3DProperties& eclipse3DProperties,
const TableManager& tables,
const GridDims& gridDims,
const Schedule& schedule,
const ParseContext& parseContext);
EclipseConfig(const Deck& deck);
const InitConfig& init() const;
const IOConfig& io() const;

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

@ -125,12 +125,12 @@ namespace Opm {
const TableManager m_tables;
Runspec m_runspec;
const GridDims m_gridDims;
EclipseConfig m_eclipseConfig;
EclipseGrid m_inputGrid;
Eclipse3DProperties m_eclipseProperties;
const SimulationConfig m_simulationConfig;
Schedule m_schedule;
const SummaryConfig m_summaryConfig;
EclipseConfig m_eclipseConfig;
TransMult m_transMult;
NNC m_inputNnc;
UnitSystem m_deckUnitSystem;

14
src/opm/parser/eclipse/EclipseState/EclipseConfig.cpp
View File

@ -20,31 +20,19 @@
#include <memory>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
#include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/GridDims.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
namespace Opm {
EclipseConfig::EclipseConfig(const Deck& deck,
const Eclipse3DProperties& eclipse3DProperties,
const TableManager& tables,
const GridDims& inputGrid,
const Schedule& schedule,
const ParseContext& parseContext) :
EclipseConfig::EclipseConfig(const Deck& deck) :
m_ioConfig( deck),
m_initConfig( deck),
m_restartConfig( deck )
{
this->m_ioConfig.initFirstRFTOutput(schedule);
}

3
src/opm/parser/eclipse/EclipseState/EclipseState.cpp
View File

@ -55,18 +55,19 @@ namespace Opm {
m_tables( deck ),
m_runspec( deck ),
m_gridDims( deck ),
m_eclipseConfig( deck ),
m_inputGrid( deck, nullptr ),
m_eclipseProperties( deck, m_tables, m_inputGrid ),
m_simulationConfig( deck, m_eclipseProperties ),
m_schedule( m_parseContext, m_inputGrid, m_eclipseProperties, deck, m_runspec.phases() ),
m_summaryConfig( deck, m_schedule, m_tables, m_parseContext , m_inputGrid.getNXYZ()),
m_eclipseConfig( deck, m_eclipseProperties, m_tables, m_gridDims, m_schedule, parseContext ),
m_transMult( m_inputGrid.getNX(), m_inputGrid.getNY(), m_inputGrid.getNZ(),
m_eclipseProperties, deck.getKeywordList( "MULTREGT" ) ),
m_inputNnc( deck, m_gridDims ),
m_deckUnitSystem( deck.getActiveUnitSystem() )
{
m_inputGrid.resetACTNUM(m_eclipseProperties.getIntGridProperty("ACTNUM").getData().data());
m_eclipseConfig.io().initFirstRFTOutput(m_schedule);
if( this->runspec().phases().size() < 3 )
m_messageContainer.info("Only " + std::to_string( this->runspec().phases().size() )

2
tests/parser/SummaryConfigTests.cpp
View File

@ -101,7 +101,7 @@ static std::vector< std::string > sorted_key_names( const SummaryConfig& summary
static SummaryConfig createSummary( std::string input , const ParseContext& parseContext = ParseContext()) {
auto deck = createDeck( input );
EclipseState state( deck, parseContext );
return state.getEclipseConfig().getSummaryConfig();
return state.getSummaryConfig();
}
BOOST_AUTO_TEST_CASE(wells_all) {