diff --git a/opm/json/JsonObject.hpp b/opm/json/JsonObject.hpp index e949859cf..a9ce32c4d 100644 --- a/opm/json/JsonObject.hpp +++ b/opm/json/JsonObject.hpp @@ -22,10 +22,14 @@ #include -#include - struct cJSON; +namespace boost { + namespace filesystem { + class path; + } +} + namespace Json { class JsonObject { diff --git a/opm/json/tests/jsonTests.cpp b/opm/json/tests/jsonTests.cpp index 65a4082c7..a76ab0758 100644 --- a/opm/json/tests/jsonTests.cpp +++ b/opm/json/tests/jsonTests.cpp @@ -24,6 +24,8 @@ #include #include +#include + #include diff --git a/opm/parser/eclipse/Applications/Schedule.cpp b/opm/parser/eclipse/Applications/Schedule.cpp index 0bfcf174e..ea7f2e452 100644 --- a/opm/parser/eclipse/Applications/Schedule.cpp +++ b/opm/parser/eclipse/Applications/Schedule.cpp @@ -9,7 +9,9 @@ #include #include #include +#include #include +#include int main(int /* argc */, char** argv) { diff --git a/opm/parser/eclipse/CMakeLists.txt b/opm/parser/eclipse/CMakeLists.txt index deee7fafe..ee7c2a31f 100644 --- a/opm/parser/eclipse/CMakeLists.txt +++ b/opm/parser/eclipse/CMakeLists.txt @@ -115,6 +115,8 @@ EclipseState/Tables/TableColumn.cpp EclipseState/Tables/ColumnSchema.cpp EclipseState/Tables/TableSchema.cpp EclipseState/Tables/TableIndex.cpp +EclipseState/Tables/PvtgTable.cpp +EclipseState/Tables/PvtoTable.cpp EclipseState/Tables/PvtxTable.cpp # EclipseState/Grid/GridProperty.cpp diff --git a/opm/parser/eclipse/Deck/Deck.cpp b/opm/parser/eclipse/Deck/Deck.cpp index 320f037c3..7215325f7 100644 --- a/opm/parser/eclipse/Deck/Deck.cpp +++ b/opm/parser/eclipse/Deck/Deck.cpp @@ -21,6 +21,7 @@ #include #include +#include namespace Opm { diff --git a/opm/parser/eclipse/Deck/Deck.hpp b/opm/parser/eclipse/Deck/Deck.hpp index 99590f349..f1a4288bb 100644 --- a/opm/parser/eclipse/Deck/Deck.hpp +++ b/opm/parser/eclipse/Deck/Deck.hpp @@ -20,14 +20,16 @@ #ifndef DECK_HPP #define DECK_HPP -#include +#include #include +#include #include -#include namespace Opm { + class UnitSystem; + class Deck { public: Deck(); diff --git a/opm/parser/eclipse/Deck/DeckDoubleItem.cpp b/opm/parser/eclipse/Deck/DeckDoubleItem.cpp index 368a525ca..4752632d7 100644 --- a/opm/parser/eclipse/Deck/DeckDoubleItem.cpp +++ b/opm/parser/eclipse/Deck/DeckDoubleItem.cpp @@ -19,8 +19,6 @@ #include -#include - #include #include #include diff --git a/opm/parser/eclipse/Deck/DeckFloatItem.cpp b/opm/parser/eclipse/Deck/DeckFloatItem.cpp index b85538956..84acdc56f 100644 --- a/opm/parser/eclipse/Deck/DeckFloatItem.cpp +++ b/opm/parser/eclipse/Deck/DeckFloatItem.cpp @@ -19,8 +19,6 @@ #include -#include - #include #include #include diff --git a/opm/parser/eclipse/Deck/DeckKeyword.cpp b/opm/parser/eclipse/Deck/DeckKeyword.cpp index fe8e9d68e..7d255d47b 100644 --- a/opm/parser/eclipse/Deck/DeckKeyword.cpp +++ b/opm/parser/eclipse/Deck/DeckKeyword.cpp @@ -18,6 +18,8 @@ */ #include "DeckKeyword.hpp" +#include "DeckRecord.hpp" +#include "DeckItem.hpp" namespace Opm { diff --git a/opm/parser/eclipse/Deck/DeckKeyword.hpp b/opm/parser/eclipse/Deck/DeckKeyword.hpp index 99ea35111..b6e781fdc 100644 --- a/opm/parser/eclipse/Deck/DeckKeyword.hpp +++ b/opm/parser/eclipse/Deck/DeckKeyword.hpp @@ -12,10 +12,9 @@ #include #include -#include - namespace Opm { class ParserKeyword; + class DeckRecord; class DeckKeyword { public: @@ -40,9 +39,9 @@ namespace Opm { void setParserKeyword(std::shared_ptr &parserKeyword); size_t size() const; - void addRecord(DeckRecordConstPtr record); - DeckRecordConstPtr getRecord(size_t index) const; - DeckRecordConstPtr getDataRecord() const; + void addRecord(std::shared_ptr< const DeckRecord > record); + std::shared_ptr< const DeckRecord > getRecord(size_t index) const; + std::shared_ptr< const DeckRecord > getDataRecord() const; void setDataKeyword(bool isDataKeyword = true); bool isKnown() const; bool isDataKeyword() const; @@ -63,15 +62,15 @@ namespace Opm { return false; } - std::vector::const_iterator begin() const; - std::vector::const_iterator end() const; + std::vector>::const_iterator begin() const; + std::vector>::const_iterator end() const; private: std::string m_keywordName; std::string m_fileName; int m_lineNumber; std::shared_ptr m_parserKeyword; - std::vector m_recordList; + std::vector> m_recordList; bool m_knownKeyword; bool m_isDataKeyword; }; diff --git a/opm/parser/eclipse/Deck/SCHEDULESection.cpp b/opm/parser/eclipse/Deck/SCHEDULESection.cpp index e961ff04b..8b87d93fb 100644 --- a/opm/parser/eclipse/Deck/SCHEDULESection.cpp +++ b/opm/parser/eclipse/Deck/SCHEDULESection.cpp @@ -18,6 +18,8 @@ */ +#include +#include #include namespace Opm { diff --git a/opm/parser/eclipse/Deck/SCHEDULESection.hpp b/opm/parser/eclipse/Deck/SCHEDULESection.hpp index a0a9f619d..81d8edb76 100644 --- a/opm/parser/eclipse/Deck/SCHEDULESection.hpp +++ b/opm/parser/eclipse/Deck/SCHEDULESection.hpp @@ -21,7 +21,6 @@ #define SCHEDULESECTION_HPP -#include #include #include diff --git a/opm/parser/eclipse/Deck/Section.hpp b/opm/parser/eclipse/Deck/Section.hpp index 60369d619..615fa4054 100644 --- a/opm/parser/eclipse/Deck/Section.hpp +++ b/opm/parser/eclipse/Deck/Section.hpp @@ -22,15 +22,11 @@ -#include #include #include -#include - #include - namespace Opm { class Section : public Deck diff --git a/opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp b/opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp index dcab5b0d3..5c6b9f986 100644 --- a/opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp +++ b/opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp @@ -28,6 +28,7 @@ #include +#include using namespace Opm; diff --git a/opm/parser/eclipse/EclipseState/EclipseState.cpp b/opm/parser/eclipse/EclipseState/EclipseState.cpp index 80970153e..31d628109 100644 --- a/opm/parser/eclipse/EclipseState/EclipseState.cpp +++ b/opm/parser/eclipse/EclipseState/EclipseState.cpp @@ -17,23 +17,25 @@ along with OPM. If not, see . */ -#include -#include -#include #include #include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include #include - +#include #include diff --git a/opm/parser/eclipse/EclipseState/EclipseState.hpp b/opm/parser/eclipse/EclipseState/EclipseState.hpp index 8ab3dba8e..1fde84511 100644 --- a/opm/parser/eclipse/EclipseState/EclipseState.hpp +++ b/opm/parser/eclipse/EclipseState/EclipseState.hpp @@ -20,33 +20,30 @@ #ifndef OPM_ECLIPSE_STATE_HPP #define OPM_ECLIPSE_STATE_HPP -#include -#include - -#include -#include -#include #include -#include +#include #include #include -#include -#include - -#include -#include -#include -#include - -#include #include -#include -#include -#include -#include namespace Opm { + + template< typename > class GridProperty; + template< typename > class GridProperties; + + class Deck; + class DeckItem; + class Fault; + class FaultCollection; + class InitConfig; + class IOConfig; + class ParseMode; + class Schedule; + class Section; + class SimulationConfig; + class TableManager; + class EclipseState { public: enum EnabledTypes { @@ -56,21 +53,21 @@ namespace Opm { AllProperties = IntProperties | DoubleProperties }; - EclipseState(DeckConstPtr deck , const ParseMode& parseMode); + EclipseState(std::shared_ptr< const Deck > deck , const ParseMode& parseMode); const ParseMode& getParseMode() const; - ScheduleConstPtr getSchedule() const; - IOConfigConstPtr getIOConfigConst() const; - IOConfigPtr getIOConfig() const; - InitConfigConstPtr getInitConfig() const; - SimulationConfigConstPtr getSimulationConfig() const; - EclipseGridConstPtr getEclipseGrid() const; - EclipseGridPtr getEclipseGridCopy() const; + std::shared_ptr< const Schedule > getSchedule() const; + std::shared_ptr< const IOConfig > getIOConfigConst() const; + std::shared_ptr< IOConfig > getIOConfig() const; + std::shared_ptr< const InitConfig > getInitConfig() const; + std::shared_ptr< const SimulationConfig > getSimulationConfig() const; + std::shared_ptr< const EclipseGrid > getEclipseGrid() const; + std::shared_ptr< EclipseGrid > getEclipseGridCopy() const; bool hasPhase(enum Phase::PhaseEnum phase) const; std::string getTitle() const; bool supportsGridProperty(const std::string& keyword, int enabledTypes=AllProperties) const; - std::shared_ptr > getRegion(DeckItemConstPtr regionItem) const; + std::shared_ptr > getRegion(std::shared_ptr< const DeckItem > regionItem) const; std::shared_ptr > getDefaultRegion() const; std::shared_ptr > getIntGridProperty( const std::string& keyword ) const; std::shared_ptr > getDoubleGridProperty( const std::string& keyword ) const; @@ -78,7 +75,7 @@ namespace Opm { bool hasDoubleGridProperty(const std::string& keyword) const; void loadGridPropertyFromDeckKeyword(std::shared_ptr inputBox, - DeckKeywordConstPtr deckKeyword, + std::shared_ptr< const DeckKeyword > deckKeyword, int enabledTypes = AllProperties); std::shared_ptr getFaults() const; @@ -96,54 +93,54 @@ namespace Opm { void applyModifierDeck( std::shared_ptr deck); private: - void initTabdims(DeckConstPtr deck); - void initTables(DeckConstPtr deck); - 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); - void initPhases(DeckConstPtr deck); - void initTitle(DeckConstPtr deck); - void initProperties(DeckConstPtr deck); + void initTabdims(std::shared_ptr< const Deck > deck); + void initTables(std::shared_ptr< const Deck > deck); + void initIOConfig(std::shared_ptr< const Deck > deck); + void initSchedule(std::shared_ptr< const Deck > deck); + void initIOConfigPostSchedule(std::shared_ptr< const Deck > deck); + void initInitConfig(std::shared_ptr< const Deck > deck); + void initSimulationConfig(std::shared_ptr< const Deck > deck); + void initEclipseGrid(std::shared_ptr< const Deck > deck); + void initGridopts(std::shared_ptr< const Deck > deck); + void initPhases(std::shared_ptr< const Deck > deck); + void initTitle(std::shared_ptr< const Deck > deck); + void initProperties(std::shared_ptr< const Deck > deck); void initTransMult(); - void initFaults(DeckConstPtr deck); - void initNNC(DeckConstPtr deck); + void initFaults(std::shared_ptr< const Deck > deck); + void initNNC(std::shared_ptr< const Deck > deck); - void setMULTFLT(std::shared_ptr section) const; - void initMULTREGT(DeckConstPtr deck); + void setMULTFLT(std::shared_ptr section) const; + void initMULTREGT(std::shared_ptr< const Deck > deck); double getSIScaling(const std::string &dimensionString) const; - void processGridProperties(Opm::DeckConstPtr deck, int enabledTypes); + void processGridProperties(std::shared_ptr< const Deck > deck, int enabledTypes); void scanSection(std::shared_ptr section , int enabledTypes); - void handleADDKeyword(DeckKeywordConstPtr deckKeyword , BoxManager& boxManager, int enabledTypes); - void handleBOXKeyword(DeckKeywordConstPtr deckKeyword , BoxManager& boxManager); - void handleCOPYKeyword(DeckKeywordConstPtr deckKeyword , BoxManager& boxManager, int enabledTypes); + void handleADDKeyword(std::shared_ptr< const DeckKeyword > deckKeyword , BoxManager& boxManager, int enabledTypes); + void handleBOXKeyword(std::shared_ptr< const DeckKeyword > deckKeyword , BoxManager& boxManager); + void handleCOPYKeyword(std::shared_ptr< const DeckKeyword > deckKeyword , BoxManager& boxManager, int enabledTypes); void handleENDBOXKeyword(BoxManager& boxManager); - void handleEQUALSKeyword(DeckKeywordConstPtr deckKeyword , BoxManager& boxManager, int enabledTypes); - void handleMULTIPLYKeyword(DeckKeywordConstPtr deckKeyword , BoxManager& boxManager, int enabledTypes); + void handleEQUALSKeyword(std::shared_ptr< const DeckKeyword > deckKeyword , BoxManager& boxManager, int enabledTypes); + void handleMULTIPLYKeyword(std::shared_ptr< const DeckKeyword > deckKeyword , BoxManager& boxManager, int enabledTypes); - void handleEQUALREGKeyword(DeckKeywordConstPtr deckKeyword, int enabledTypes); - void handleMULTIREGKeyword(DeckKeywordConstPtr deckKeyword, int enabledTypes); - void handleADDREGKeyword(DeckKeywordConstPtr deckKeyword , int enabledTypes); - void handleCOPYREGKeyword(DeckKeywordConstPtr deckKeyword , int enabledTypes); + void handleEQUALREGKeyword(std::shared_ptr< const DeckKeyword > deckKeyword, int enabledTypes); + void handleMULTIREGKeyword(std::shared_ptr< const DeckKeyword > deckKeyword, int enabledTypes); + void handleADDREGKeyword(std::shared_ptr< const DeckKeyword > deckKeyword , int enabledTypes); + void handleCOPYREGKeyword(std::shared_ptr< const DeckKeyword > deckKeyword , int enabledTypes); - void setKeywordBox(DeckKeywordConstPtr deckKeyword, size_t recordIdx, BoxManager& boxManager); + void setKeywordBox(std::shared_ptr< const DeckKeyword > deckKeyword, size_t recordIdx, BoxManager& boxManager); void copyIntKeyword(const std::string& srcField , const std::string& targetField , std::shared_ptr inputBox); void copyDoubleKeyword(const std::string& srcField , const std::string& targetField , std::shared_ptr inputBox); - void complainAboutAmbiguousKeyword(DeckConstPtr deck, const std::string& keywordName) const; + void complainAboutAmbiguousKeyword(std::shared_ptr< const Deck > deck, const std::string& keywordName) const; - EclipseGridConstPtr m_eclipseGrid; - IOConfigPtr m_ioConfig; - InitConfigConstPtr m_initConfig; - ScheduleConstPtr schedule; - SimulationConfigConstPtr m_simulationConfig; + std::shared_ptr< const EclipseGrid > m_eclipseGrid; + std::shared_ptr< IOConfig > m_ioConfig; + std::shared_ptr< const InitConfig > m_initConfig; + std::shared_ptr< const Schedule > schedule; + std::shared_ptr< const SimulationConfig > m_simulationConfig; std::shared_ptr m_tables; diff --git a/opm/parser/eclipse/EclipseState/Grid/Fault.hpp b/opm/parser/eclipse/EclipseState/Grid/Fault.hpp index 1ea97c78c..e457511d9 100644 --- a/opm/parser/eclipse/EclipseState/Grid/Fault.hpp +++ b/opm/parser/eclipse/EclipseState/Grid/Fault.hpp @@ -23,10 +23,10 @@ #include #include -#include - namespace Opm { + class FaultFace; + class Fault { public: diff --git a/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp b/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp index 0ecad9056..af020da1f 100644 --- a/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp +++ b/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp @@ -21,7 +21,11 @@ #include +#include +#include #include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp b/opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp index 868394c54..cb2b884f5 100644 --- a/opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp +++ b/opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp @@ -22,20 +22,15 @@ #include #include #include -#include - #include -#include - -#include -#include -#include -#include - namespace Opm { + class Deck; + class EclipseGrid; + class Fault; + class FaultCollection { public: diff --git a/opm/parser/eclipse/EclipseState/Grid/GridProperties.hpp b/opm/parser/eclipse/EclipseState/Grid/GridProperties.hpp index fdcf77673..e22d7d430 100644 --- a/opm/parser/eclipse/EclipseState/Grid/GridProperties.hpp +++ b/opm/parser/eclipse/EclipseState/Grid/GridProperties.hpp @@ -22,10 +22,8 @@ #include #include -#include #include -#include #include /* @@ -47,6 +45,8 @@ namespace Opm { + class EclipseGrid; + template class GridProperties { public: diff --git a/opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp b/opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp index b1935623f..20c4fab4c 100644 --- a/opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp +++ b/opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp @@ -19,11 +19,9 @@ #ifndef ECLIPSE_GRIDPROPERTY_HPP_ #define ECLIPSE_GRIDPROPERTY_HPP_ -#include #include #include #include -#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Grid/GridPropertyInitializers.hpp b/opm/parser/eclipse/EclipseState/Grid/GridPropertyInitializers.hpp index 4dae5f446..63f54e07d 100644 --- a/opm/parser/eclipse/EclipseState/Grid/GridPropertyInitializers.hpp +++ b/opm/parser/eclipse/EclipseState/Grid/GridPropertyInitializers.hpp @@ -30,7 +30,6 @@ #include #include -#include #include @@ -47,6 +46,7 @@ class Deck; class EclipseState; class EnptvdTable; class ImptvdTable; +class TableContainer; template class GridPropertyBaseInitializer diff --git a/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp b/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp index 51829f544..e0695a0a8 100644 --- a/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp +++ b/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp @@ -21,8 +21,11 @@ #include #include -#include +#include +#include #include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp b/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp index ac1b17263..7609db1bc 100644 --- a/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp +++ b/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp @@ -22,13 +22,14 @@ #define MULTREGTSCANNER_HPP #include -#include #include #include namespace Opm { + template< typename > class GridProperties; + namespace MULTREGT { diff --git a/opm/parser/eclipse/EclipseState/Grid/NNC.cpp b/opm/parser/eclipse/EclipseState/Grid/NNC.cpp index a18c5eb55..a006a11d7 100644 --- a/opm/parser/eclipse/EclipseState/Grid/NNC.cpp +++ b/opm/parser/eclipse/EclipseState/Grid/NNC.cpp @@ -18,6 +18,7 @@ */ #include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Grid/NNC.hpp b/opm/parser/eclipse/EclipseState/Grid/NNC.hpp index 56b208061..1503e084e 100644 --- a/opm/parser/eclipse/EclipseState/Grid/NNC.hpp +++ b/opm/parser/eclipse/EclipseState/Grid/NNC.hpp @@ -20,12 +20,13 @@ #ifndef NNC_HPP #define NNC_HPP -#include -#include #include +#include + namespace Opm { + class EclipseGrid; struct NNCdata { size_t cell1; @@ -38,7 +39,7 @@ class NNC public: /// Construct from input deck. NNC(); - NNC(Opm::DeckConstPtr deck, EclipseGridConstPtr eclipseGrid); + NNC(Opm::DeckConstPtr deck, std::shared_ptr< const EclipseGrid > eclipseGrid); void addNNC(const size_t cell1, const size_t cell2, const double trans); const std::vector& nncdata() const { return m_nnc; } size_t numNNC() const; diff --git a/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp b/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp index fa8b57524..5f54f200e 100644 --- a/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp +++ b/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp @@ -25,18 +25,16 @@ #include #include #include -#include - #include +#include + #include #include #include #include #include -#include - namespace Opm { // forward definitions diff --git a/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp b/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp index b2538e546..f2def482c 100644 --- a/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp +++ b/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp @@ -19,7 +19,12 @@ #include #include +#include +#include +#include +#include #include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Grid/TransMult.hpp b/opm/parser/eclipse/EclipseState/Grid/TransMult.hpp index f67fd703b..bb23a6f8f 100644 --- a/opm/parser/eclipse/EclipseState/Grid/TransMult.hpp +++ b/opm/parser/eclipse/EclipseState/Grid/TransMult.hpp @@ -35,13 +35,14 @@ #include #include -#include -#include -#include -#include namespace Opm { + template< typename > class GridProperty; + class Fault; + class FaultCollection; + class MULTREGTScanner; + class TransMult { public: diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/ADDREGTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/ADDREGTests.cpp index f6bef0042..4659fc716 100644 --- a/opm/parser/eclipse/EclipseState/Grid/tests/ADDREGTests.cpp +++ b/opm/parser/eclipse/EclipseState/Grid/tests/ADDREGTests.cpp @@ -36,6 +36,7 @@ #include #include +#include #include diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/CopyRegTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/CopyRegTests.cpp index 2c45e5a29..cda3fb579 100644 --- a/opm/parser/eclipse/EclipseState/Grid/tests/CopyRegTests.cpp +++ b/opm/parser/eclipse/EclipseState/Grid/tests/CopyRegTests.cpp @@ -35,6 +35,7 @@ #include #include +#include #include diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/EqualRegTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/EqualRegTests.cpp index b5f42c2d4..f5913ffaf 100644 --- a/opm/parser/eclipse/EclipseState/Grid/tests/EqualRegTests.cpp +++ b/opm/parser/eclipse/EclipseState/Grid/tests/EqualRegTests.cpp @@ -35,6 +35,7 @@ #include #include +#include #include diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/GridPropertyTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/GridPropertyTests.cpp index 96f29b7f2..b9d338be1 100644 --- a/opm/parser/eclipse/EclipseState/Grid/tests/GridPropertyTests.cpp +++ b/opm/parser/eclipse/EclipseState/Grid/tests/GridPropertyTests.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include // forward declarations to avoid some pedantic warnings Opm::DeckKeywordConstPtr createSATNUMKeyword( ); diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/MultiRegTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/MultiRegTests.cpp index 7859760d8..5b863800d 100644 --- a/opm/parser/eclipse/EclipseState/Grid/tests/MultiRegTests.cpp +++ b/opm/parser/eclipse/EclipseState/Grid/tests/MultiRegTests.cpp @@ -35,6 +35,7 @@ #include #include +#include #include diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/SatfuncPropertyInitializersTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/SatfuncPropertyInitializersTests.cpp index 8326e939f..c2ec78b9e 100644 --- a/opm/parser/eclipse/EclipseState/Grid/tests/SatfuncPropertyInitializersTests.cpp +++ b/opm/parser/eclipse/EclipseState/Grid/tests/SatfuncPropertyInitializersTests.cpp @@ -26,6 +26,7 @@ #include #include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp b/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp index 5c60d225e..5da5c5569 100644 --- a/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp +++ b/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp @@ -18,10 +18,14 @@ */ #include +#include #include -#include +#include + #include +#include +#include #include diff --git a/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp b/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp index 757417d30..d05234cc7 100644 --- a/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp +++ b/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp @@ -21,12 +21,14 @@ #define OPM_IO_CONFIG_HPP #include -#include -#include - +#include namespace Opm { + template< typename > class DynamicState; + + class TimeMap; + /*The IOConfig class holds data about input / ouput configurations Amongst these configuration settings, a IOConfig object knows if @@ -126,14 +128,14 @@ namespace Opm { void overrideRestartWriteInterval(size_t interval); - void handleRPTRSTBasic(TimeMapConstPtr timemap, + void handleRPTRSTBasic(std::shared_ptr< const TimeMap > timemap, size_t timestep, size_t basic, size_t frequency = 1, bool update_default = false, bool reset_global = false); - void handleRPTSCHEDRestart(TimeMapConstPtr timemap, size_t timestep, size_t restart); - void handleSolutionSection(TimeMapConstPtr timemap, std::shared_ptr solutionSection); + void handleRPTSCHEDRestart(std::shared_ptr< const TimeMap > timemap, size_t timestep, size_t restart); + void handleSolutionSection(std::shared_ptr< const TimeMap > timemap, std::shared_ptr solutionSection); void handleGridSection(std::shared_ptr gridSection); void handleRunspecSection(std::shared_ptr runspecSection); void setWriteInitialRestartFile(bool writeInitialRestartFile); @@ -145,16 +147,16 @@ namespace Opm { private: - void assertTimeMap(TimeMapConstPtr timemap); + void assertTimeMap(std::shared_ptr< const TimeMap > timemap); bool getWriteRestartFileFrequency(size_t timestep, size_t start_timestep, size_t frequency, bool years = false, bool months = false) const; - void handleRPTSOL(DeckKeywordConstPtr keyword); + void handleRPTSOL(std::shared_ptr< const DeckKeyword > keyword); - TimeMapConstPtr m_timemap; + std::shared_ptr< const TimeMap > m_timemap; bool m_write_INIT_file; bool m_write_EGRID_file; bool m_write_initial_RST_file; diff --git a/opm/parser/eclipse/EclipseState/IOConfig/tests/IOConfigTest.cpp b/opm/parser/eclipse/EclipseState/IOConfig/tests/IOConfigTest.cpp index 56c304aae..9f1437699 100644 --- a/opm/parser/eclipse/EclipseState/IOConfig/tests/IOConfigTest.cpp +++ b/opm/parser/eclipse/EclipseState/IOConfig/tests/IOConfigTest.cpp @@ -26,7 +26,10 @@ #include #include #include +#include #include +#include +#include using namespace Opm; diff --git a/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp b/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp index 460080f75..ace18b8a0 100644 --- a/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp +++ b/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp @@ -17,8 +17,10 @@ along with OPM. If not, see . */ -#include #include +#include +#include +#include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/Completion.cpp b/opm/parser/eclipse/EclipseState/Schedule/Completion.cpp index 444dd850c..020a2c73a 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Completion.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Completion.cpp @@ -17,6 +17,11 @@ along with OPM. If not, see . */ +#include +#include + +#include +#include #include #include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/Completion.hpp b/opm/parser/eclipse/EclipseState/Schedule/Completion.hpp index 82231ed07..b5ba2688d 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Completion.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Completion.hpp @@ -21,18 +21,20 @@ #ifndef COMPLETION_HPP_ #define COMPLETION_HPP_ +#include #include #include -#include +#include -#include -#include #include #include namespace Opm { + class DeckKeyword; + class DeckRecord; + class Completion { public: Completion(int i, int j , int k , WellCompletion::StateEnum state , @@ -65,8 +67,8 @@ namespace Opm { WellCompletion::DirectionEnum getDirection() const; - static std::map > > completionsFromCOMPDATKeyword( DeckKeywordConstPtr compdatKeyword ); - static std::pair > > completionsFromCOMPDATRecord( DeckRecordConstPtr compdatRecord ); + static std::map > > completionsFromCOMPDATKeyword( std::shared_ptr< const DeckKeyword > compdatKeyword ); + static std::pair > > completionsFromCOMPDATRecord( std::shared_ptr< const DeckRecord > compdatRecord ); private: int m_i, m_j, m_k; diff --git a/opm/parser/eclipse/EclipseState/Schedule/CompletionSet.cpp b/opm/parser/eclipse/EclipseState/Schedule/CompletionSet.cpp index c88f78c68..a4bb1bacf 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/CompletionSet.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/CompletionSet.cpp @@ -17,10 +17,14 @@ along with OPM. If not, see . */ +#include +#include +#include + +#include #include #include #include -#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/CompletionSet.hpp b/opm/parser/eclipse/EclipseState/Schedule/CompletionSet.hpp index c070a8e15..98576691e 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/CompletionSet.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/CompletionSet.hpp @@ -23,24 +23,20 @@ #include -#include - -#include -#include -#include -#include #include namespace Opm { + class EclipseGrid; + class CompletionSet { public: CompletionSet(); - void add(CompletionConstPtr completion); + void add(std::shared_ptr< const Completion > completion); size_t size() const; CompletionSet * shallowCopy() const; - CompletionConstPtr get(size_t index) const; - CompletionConstPtr getFromIJK(const int i, const int j, const int k) const; + std::shared_ptr< const Completion > get(size_t index) const; + std::shared_ptr< const Completion > getFromIJK(const int i, const int j, const int k) const; bool allCompletionsShut() const; /// Order completions irrespective of input order. /// The algorithm used is the following: @@ -54,10 +50,10 @@ namespace Opm { /// \param[in] well_i logical cartesian i-coordinate of well head /// \param[in] well_j logical cartesian j-coordinate of well head /// \param[in] grid EclipseGrid object, used for cell depths - void orderCompletions(size_t well_i, size_t well_j, EclipseGridConstPtr grid); + void orderCompletions(size_t well_i, size_t well_j, std::shared_ptr< const EclipseGrid > grid); private: - std::vector m_completions; - size_t findClosestCompletion(int oi, int oj, EclipseGridConstPtr grid, + std::vector> m_completions; + size_t findClosestCompletion(int oi, int oj, std::shared_ptr< const EclipseGrid > grid, double oz, size_t start_pos); }; diff --git a/opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp b/opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp index abfcbd1b4..8c77f50fb 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp @@ -21,11 +21,9 @@ #ifndef DYNAMICSTATE_HPP_ #define DYNAMICSTATE_HPP_ -#include -#include -#include #include +#include namespace Opm { @@ -57,7 +55,7 @@ namespace Opm { public: - DynamicState(const TimeMapConstPtr timeMap, T initialValue) { + DynamicState(const std::shared_ptr< const TimeMap > timeMap, T initialValue) { m_timeMap = timeMap; init( initialValue ); } @@ -157,7 +155,7 @@ namespace Opm { std::vector m_data; - TimeMapConstPtr m_timeMap; + std::shared_ptr< const TimeMap > m_timeMap; T m_currentValue; T m_initialValue; size_t m_initialRange; diff --git a/opm/parser/eclipse/EclipseState/Schedule/DynamicVector.hpp b/opm/parser/eclipse/EclipseState/Schedule/DynamicVector.hpp index 360201813..fa6ed8a6c 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/DynamicVector.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/DynamicVector.hpp @@ -25,7 +25,6 @@ #include #include -#include #include #include @@ -53,7 +52,7 @@ namespace Opm { public: - DynamicVector(const TimeMapConstPtr timeMap, T defaultValue) { + DynamicVector(const std::shared_ptr< const TimeMap > timeMap, T defaultValue) { m_timeMap = timeMap; m_defaultValue = defaultValue; } @@ -97,7 +96,7 @@ namespace Opm { std::vector m_data; - TimeMapConstPtr m_timeMap; + std::shared_ptr< const TimeMap > m_timeMap; T m_defaultValue; }; } diff --git a/opm/parser/eclipse/EclipseState/Schedule/Events.hpp b/opm/parser/eclipse/EclipseState/Schedule/Events.hpp index 66b2fcd6b..0703bae0e 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Events.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Events.hpp @@ -20,7 +20,6 @@ #define SCHEDULE_EVENTS_HPP #include -#include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group.cpp b/opm/parser/eclipse/EclipseState/Schedule/Group.cpp index a27b4f99d..1d5f98aa1 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Group.cpp @@ -19,8 +19,9 @@ -#include +#include #include +#include #define INVALID_GROUP_RATE -999e100 diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group.hpp b/opm/parser/eclipse/EclipseState/Schedule/Group.hpp index 16296e9b3..e4b9cdc54 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Group.hpp @@ -21,17 +21,19 @@ #ifndef GROUP_HPP_ #define GROUP_HPP_ -#include #include -#include -#include -#include #include #include namespace Opm { + template< typename > class DynamicState; + + class TimeMap; + class Well; + class WellSet; + namespace GroupInjection { struct InjectionData; } @@ -43,7 +45,7 @@ namespace Opm { class Group { public: - Group(const std::string& name, TimeMapConstPtr timeMap , size_t creationTimeStep); + Group(const std::string& name, std::shared_ptr< const TimeMap > timeMap , size_t creationTimeStep); bool hasBeenDefined(size_t timeStep) const; const std::string& name() const; bool isProductionGroup(size_t timeStep) const; @@ -94,18 +96,18 @@ namespace Opm { /*****************************************************************/ bool hasWell(const std::string& wellName , size_t time_step) const; - WellConstPtr getWell(const std::string& wellName , size_t time_step) const; + std::shared_ptr< const Well > getWell(const std::string& wellName , size_t time_step) const; size_t numWells(size_t time_step) const; - void addWell(size_t time_step , WellPtr well); + void addWell(size_t time_step , std::shared_ptr< Well > well); void delWell(size_t time_step, const std::string& wellName ); private: - WellSetConstPtr wellMap(size_t time_step) const; + std::shared_ptr< const WellSet > wellMap(size_t time_step) const; size_t m_creationTimeStep; std::string m_name; std::shared_ptr m_injection; std::shared_ptr m_production; - std::shared_ptr > m_wells; + std::shared_ptr> > m_wells; std::shared_ptr > m_isProductionGroup; }; typedef std::shared_ptr GroupPtr; diff --git a/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp b/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp index a47a28d23..57ade661c 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp @@ -3,6 +3,7 @@ #include #include #include + #include namespace Opm diff --git a/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp b/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp index 7b254f0f1..5b58271b4 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp @@ -22,21 +22,32 @@ #include #include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include +#include +#include +#include namespace Opm { @@ -46,6 +57,10 @@ namespace Opm { initFromDeck(parseMode , deck, ioConfig); } + boost::posix_time::ptime Schedule::getStartTime() const { + return m_timeMap->getStartTime(/*timeStepIdx=*/0); + } + void Schedule::initFromDeck(const ParseMode& parseMode , DeckConstPtr deck, IOConfigPtr ioConfig) { initializeNOSIM(deck); createTimeMap(deck); diff --git a/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp b/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp index e966868c7..2e5d9bb82 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp @@ -19,54 +19,58 @@ #ifndef SCHEDULE_HPP #define SCHEDULE_HPP -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - #include +#include + +#include + +#include +#include +#include + namespace Opm { + template< typename > class DynamicState; + template< typename > class DynamicVector; + + class EclipseGrid; + class Events; + class Group; + class GroupTree; + class IOConfig; + class OilVaporizationProperties; + class ParseMode; + class SCHEDULESection; + class TimeMap; + class Tuning; + class Well; + const boost::gregorian::date defaultStartDate( 1983 , boost::gregorian::Jan , 1); class Schedule { public: - Schedule(const ParseMode& parseMode , std::shared_ptr grid , DeckConstPtr deck, IOConfigPtr ioConfig); - boost::posix_time::ptime getStartTime() const - { return m_timeMap->getStartTime(/*timeStepIdx=*/0); } - TimeMapConstPtr getTimeMap() const; + Schedule(const ParseMode& parseMode , std::shared_ptr grid , std::shared_ptr< const Deck > deck, std::shared_ptr< IOConfig > ioConfig); + boost::posix_time::ptime getStartTime() const; + std::shared_ptr< const TimeMap > getTimeMap() const; size_t numWells() const; size_t numWells(size_t timestep) const; size_t getMaxNumCompletionsForWells(size_t timestep) const; bool hasWell(const std::string& wellName) const; - WellPtr getWell(const std::string& wellName); - std::vector getOpenWells(size_t timeStep); - std::vector getWells() const; - std::vector getWells(size_t timeStep) const; - std::vector getWells(const std::string& wellNamePattern); - OilVaporizationPropertiesConstPtr getOilVaporizationProperties(size_t timestep); + std::shared_ptr< Well > getWell(const std::string& wellName); + std::vector> getOpenWells(size_t timeStep); + std::vector> getWells() const; + std::vector> getWells(size_t timeStep) const; + std::vector> getWells(const std::string& wellNamePattern); + std::shared_ptr< const OilVaporizationProperties > getOilVaporizationProperties(size_t timestep); - GroupTreePtr getGroupTree(size_t t) const; + std::shared_ptr< GroupTree > getGroupTree(size_t t) const; size_t numGroups() const; bool hasGroup(const std::string& groupName) const; - GroupPtr getGroup(const std::string& groupName) const; - TuningPtr getTuning() const; + std::shared_ptr< Group > getGroup(const std::string& groupName) const; + std::shared_ptr< Tuning > getTuning() const; bool initOnly() const; const Events& getEvents() const; @@ -76,60 +80,60 @@ namespace Opm private: - TimeMapPtr m_timeMap; - OrderedMap m_wells; + std::shared_ptr< TimeMap > m_timeMap; + OrderedMap> m_wells; std::shared_ptr m_grid; - std::map m_groups; - std::shared_ptr > m_rootGroupTree; - std::shared_ptr > m_oilvaporizationproperties; + std::map> m_groups; + std::shared_ptr> > m_rootGroupTree; + std::shared_ptr > > m_oilvaporizationproperties; std::shared_ptr m_events; std::shared_ptr > > m_modifierDeck; - TuningPtr m_tuning; + std::shared_ptr< Tuning > m_tuning; bool nosim; void updateWellStatus(std::shared_ptr well, size_t reportStep , WellCommon::StatusEnum status); - void addWellToGroup( GroupPtr newGroup , WellPtr well , size_t timeStep); - void initFromDeck(const ParseMode& parseMode , DeckConstPtr deck, IOConfigPtr ioConfig); - void initializeNOSIM(DeckConstPtr deck); - void createTimeMap(DeckConstPtr deck); - void initRootGroupTreeNode(TimeMapConstPtr timeMap); - void initOilVaporization(TimeMapConstPtr timeMap); - void iterateScheduleSection(const ParseMode& parseMode , std::shared_ptr section, IOConfigPtr ioConfig); - bool handleGroupFromWELSPECS(const std::string& groupName, GroupTreePtr newTree) const; + void addWellToGroup( std::shared_ptr< Group > newGroup , std::shared_ptr< Well > well , size_t timeStep); + void initFromDeck(const ParseMode& parseMode , std::shared_ptr< const Deck > deck, std::shared_ptr< IOConfig > ioConfig); + void initializeNOSIM(std::shared_ptr< const Deck > deck); + void createTimeMap(std::shared_ptr< const Deck > deck); + void initRootGroupTreeNode(std::shared_ptr< const TimeMap > timeMap); + void initOilVaporization(std::shared_ptr< const TimeMap > timeMap); + void iterateScheduleSection(const ParseMode& parseMode , std::shared_ptr section, std::shared_ptr< IOConfig > ioConfig); + bool handleGroupFromWELSPECS(const std::string& groupName, std::shared_ptr< GroupTree > newTree) const; void addGroup(const std::string& groupName , size_t timeStep); - void addWell(const std::string& wellName, DeckRecordConstPtr record, size_t timeStep, WellCompletion::CompletionOrderEnum wellCompletionOrder); + void addWell(const std::string& wellName, std::shared_ptr< const DeckRecord > record, size_t timeStep, WellCompletion::CompletionOrderEnum wellCompletionOrder); void handleCOMPORD(const ParseMode& parseMode, std::shared_ptr compordKeyword, size_t currentStep); - void checkWELSPECSConsistency(WellConstPtr well, DeckKeywordConstPtr keyword, size_t recordIdx) const; - void handleWELSPECS(std::shared_ptr section, DeckKeywordConstPtr keyword, size_t currentStep); - void handleWCONProducer(DeckKeywordConstPtr keyword, size_t currentStep, bool isPredictionMode); - void handleWCONHIST(DeckKeywordConstPtr keyword, size_t currentStep); - void handleWCONPROD(DeckKeywordConstPtr keyword, size_t currentStep); - void handleWGRUPCON(DeckKeywordConstPtr keyword, size_t currentStep); - void handleCOMPDAT(DeckKeywordConstPtr keyword, size_t currentStep); - void handleWELSEGS(DeckKeywordConstPtr keyword, size_t currentStep); - void handleCOMPSEGS(DeckKeywordConstPtr keyword, size_t currentStep); - void handleWCONINJE(std::shared_ptr section, DeckKeywordConstPtr keyword, size_t currentStep); - void handleWPOLYMER(DeckKeywordConstPtr keyword, size_t currentStep); - void handleWSOLVENT(DeckKeywordConstPtr keyword, size_t currentStep); - void handleWCONINJH(std::shared_ptr section, DeckKeywordConstPtr keyword, size_t currentStep); - void handleWELOPEN(DeckKeywordConstPtr keyword, size_t currentStep, bool hascomplump); - void handleWELTARG(std::shared_ptr section, DeckKeywordConstPtr keyword, size_t currentStep); - void handleGCONINJE(std::shared_ptr section, DeckKeywordConstPtr keyword, size_t currentStep); - void handleGCONPROD(DeckKeywordConstPtr keyword, size_t currentStep); - void handleTUNING(DeckKeywordConstPtr keyword, size_t currentStep); + void checkWELSPECSConsistency(std::shared_ptr< const Well > well, std::shared_ptr< const DeckKeyword > keyword, size_t recordIdx) const; + void handleWELSPECS(std::shared_ptr section, std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleWCONProducer(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep, bool isPredictionMode); + void handleWCONHIST(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleWCONPROD(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleWGRUPCON(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleCOMPDAT(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleWELSEGS(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleCOMPSEGS(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleWCONINJE(std::shared_ptr section, std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleWPOLYMER(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleWSOLVENT(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleWCONINJH(std::shared_ptr section, std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleWELOPEN(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep, bool hascomplump); + void handleWELTARG(std::shared_ptr section, std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleGCONINJE(std::shared_ptr section, std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleGCONPROD(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleTUNING(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); void handleNOSIM(); - void handleRPTRST(DeckKeywordConstPtr keyword, size_t currentStep, IOConfigPtr ioConfig); - void handleRPTSCHED(DeckKeywordConstPtr keyword, size_t currentStep, IOConfigPtr ioConfig); - void handleDATES(DeckKeywordConstPtr keyword); - void handleTSTEP(DeckKeywordConstPtr keyword); - void handleGRUPTREE(DeckKeywordConstPtr keyword, size_t currentStep); - void handleWRFT(DeckKeywordConstPtr keyword, size_t currentStep); - void handleWRFTPLT(DeckKeywordConstPtr keyword, size_t currentStep); - void handleWPIMULT(DeckKeywordConstPtr keyword, size_t currentStep); - void handleDRSDT(DeckKeywordConstPtr keyword, size_t currentStep); - void handleDRVDT(DeckKeywordConstPtr keyword, size_t currentStep); - void handleVAPPARS(DeckKeywordConstPtr keyword, size_t currentStep); + void handleRPTRST(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep, std::shared_ptr< IOConfig > ioConfig); + void handleRPTSCHED(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep, std::shared_ptr< IOConfig > ioConfig); + void handleDATES(std::shared_ptr< const DeckKeyword > keyword); + void handleTSTEP(std::shared_ptr< const DeckKeyword > keyword); + void handleGRUPTREE(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleWRFT(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleWRFTPLT(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleWPIMULT(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleDRSDT(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleDRVDT(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); + void handleVAPPARS(std::shared_ptr< const DeckKeyword > keyword, size_t currentStep); void checkUnhandledKeywords(std::shared_ptr section) const; @@ -138,7 +142,7 @@ namespace Opm static bool convertEclipseStringToBool(const std::string& eclipseString); - void setOilVaporizationProperties(const OilVaporizationPropertiesPtr vapor, size_t timestep); + void setOilVaporizationProperties(const std::shared_ptr< OilVaporizationProperties > vapor, size_t timestep); }; typedef std::shared_ptr SchedulePtr; diff --git a/opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.hpp b/opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.hpp index dad92b273..cfd47cf43 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.hpp @@ -21,7 +21,6 @@ #define SCHEDULE_ENUMS_H #include -#include namespace Opm { namespace WellCommon { diff --git a/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp b/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp index da0590cd0..59d4135d6 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp @@ -17,10 +17,11 @@ along with OPM. If not, see . */ -#include +#include -#include #include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp b/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp index 6cfdf5b54..74ddfba2e 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp @@ -23,7 +23,7 @@ #include -#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp b/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp index 05558be18..b2a2cee4b 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp @@ -18,6 +18,8 @@ */ +#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/Tuning.hpp b/opm/parser/eclipse/EclipseState/Schedule/Tuning.hpp index ccabd0a98..51ae91c6e 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Tuning.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Tuning.hpp @@ -20,12 +20,12 @@ #ifndef OPM_TUNING_HPP #define OPM_TUNING_HPP -#include -#include - - namespace Opm { + template< typename > class DynamicState; + + class TimeMap; + class Tuning { /* @@ -44,7 +44,7 @@ namespace Opm { */ public: - Tuning(TimeMapConstPtr timemap); + Tuning(std::shared_ptr< const TimeMap > timemap); void setTuningInitialValue(const std::string tuningItem, double value,bool resetVector); void setTuningInitialValue(const std::string tuningItem, int value, bool resetVector); diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well.cpp b/opm/parser/eclipse/EclipseState/Schedule/Well.cpp index c100000cc..73a2c76bc 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Well.cpp @@ -17,15 +17,18 @@ along with OPM. If not, see . */ -#include +#include -#include #include -#include -#include -#include +#include #include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well.hpp index 8521aad51..0ecae4750 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Well.hpp @@ -21,35 +21,29 @@ #ifndef WELL_HPP_ #define WELL_HPP_ -#include -#include -#include -#include -#include -#include #include #include #include -#include - -#include - -#include - -#include +#include #include #include -#include namespace Opm { + template< typename > class DynamicState; + class Completion; + class CompletionSet; + class EclipseGrid; + class Segment; + class SegmentSet; + class TimeMap; class Well { public: Well(const std::string& name, std::shared_ptr grid , int headI, int headJ, Value refDepth , Phase::PhaseEnum preferredPhase, - TimeMapConstPtr timeMap, size_t creationTimeStep, WellCompletion::CompletionOrderEnum completionOrdering = WellCompletion::TRACK, bool allowCrossFlow = true); + std::shared_ptr< const TimeMap > timeMap, size_t creationTimeStep, WellCompletion::CompletionOrderEnum completionOrdering = WellCompletion::TRACK, bool allowCrossFlow = true); const std::string& name() const; bool hasBeenDefined(size_t timeStep) const; @@ -78,10 +72,10 @@ namespace Opm { bool isProducer(size_t timeStep) const; bool isInjector(size_t timeStep) const; - void addWELSPECS(DeckRecordConstPtr deckRecord); - void addCompletions(size_t time_step , const std::vector& newCompletions); - void addCompletionSet(size_t time_step, const CompletionSetConstPtr newCompletionSet); - CompletionSetConstPtr getCompletions(size_t timeStep) const; + void addWELSPECS(std::shared_ptr< const DeckRecord > deckRecord); + void addCompletions(size_t time_step , const std::vector>& newCompletions); + void addCompletionSet(size_t time_step, const std::shared_ptr< const CompletionSet > newCompletionSet); + std::shared_ptr< const CompletionSet > getCompletions(size_t timeStep) const; bool setProductionProperties(size_t timeStep , const WellProductionProperties properties); WellProductionProperties getProductionPropertiesCopy(size_t timeStep) const; @@ -115,9 +109,9 @@ namespace Opm { // for multi-segment wells bool isMultiSegment(size_t time_step) const; - SegmentSetConstPtr getSegmentSet(size_t time_step) const; + std::shared_ptr< const SegmentSet > getSegmentSet(size_t time_step) const; - void addSegmentSet(size_t time_step, SegmentSetConstPtr new_segmentset); + void addSegmentSet(size_t time_step, std::shared_ptr< const SegmentSet > new_segmentset); private: void setRefDepthFromCompletions() const; @@ -132,7 +126,7 @@ namespace Opm { std::shared_ptr > m_guideRateScalingFactor; std::shared_ptr > m_isProducer; - std::shared_ptr > m_completions; + std::shared_ptr> > m_completions; std::shared_ptr > m_productionProperties; std::shared_ptr > m_injectionProperties; std::shared_ptr > m_polymerProperties; @@ -143,7 +137,7 @@ namespace Opm { // WELSPECS data - assumes this is not dynamic - TimeMapConstPtr m_timeMap; + std::shared_ptr< const TimeMap > m_timeMap; int m_headI; int m_headJ; mutable Value m_refDepth; @@ -155,7 +149,7 @@ namespace Opm { // WELSEGS DATA - for mutli-segment wells // flag indicating if the well is a multi-segment well - std::shared_ptr> m_segmentset; + std::shared_ptr>> m_segmentset; }; typedef std::shared_ptr WellPtr; typedef std::shared_ptr WellConstPtr; diff --git a/opm/parser/eclipse/EclipseState/Schedule/WellSet.cpp b/opm/parser/eclipse/EclipseState/Schedule/WellSet.cpp index 2565d801f..bde02a1aa 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/WellSet.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/WellSet.cpp @@ -17,7 +17,9 @@ along with OPM. If not, see . */ +#include #include + namespace Opm { @@ -34,7 +36,7 @@ namespace Opm { } - WellConstPtr WellSet::getWell(const std::string& wellName) const { + std::shared_ptr< const Well > WellSet::getWell(const std::string& wellName) const { if (hasWell(wellName)) return m_wells.find(wellName)->second; else @@ -42,7 +44,7 @@ namespace Opm { } - void WellSet::addWell(WellPtr well) { + void WellSet::addWell(std::shared_ptr< Well > well) { const std::string& wellName = well->name(); if (!hasWell(wellName)) m_wells[wellName] = well; @@ -62,7 +64,7 @@ namespace Opm { WellSet * WellSet::shallowCopy() const { WellSet * copy = new WellSet(); - for (std::map::const_iterator iter=m_wells.begin(); iter != m_wells.end(); ++iter) + for (std::map>::const_iterator iter=m_wells.begin(); iter != m_wells.end(); ++iter) copy->addWell( (*iter).second ); return copy; diff --git a/opm/parser/eclipse/EclipseState/Schedule/WellSet.hpp b/opm/parser/eclipse/EclipseState/Schedule/WellSet.hpp index 270431d25..c24755426 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/WellSet.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/WellSet.hpp @@ -19,14 +19,11 @@ #ifndef WELLSET_HPP #define WELLSET_HPP -#include -#include -#include - -#include - -#include #include +#include +#include + +#include namespace Opm { @@ -35,12 +32,12 @@ namespace Opm { WellSet(); size_t size() const; bool hasWell(const std::string& wellName) const; - WellConstPtr getWell(const std::string& wellName) const; - void addWell(WellPtr well); + std::shared_ptr< const Well > getWell(const std::string& wellName) const; + void addWell(std::shared_ptr< Well > well); void delWell(const std::string& wellName); WellSet * shallowCopy() const; private: - std::map m_wells; + std::map> m_wells; }; typedef std::shared_ptr WellSetPtr; diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/GeomodifierTests.cpp b/opm/parser/eclipse/EclipseState/Schedule/tests/GeomodifierTests.cpp index d5e095e5f..3f3f1716c 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/tests/GeomodifierTests.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/tests/GeomodifierTests.cpp @@ -31,6 +31,7 @@ #include #include +#include #include using namespace Opm; diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/GroupTests.cpp b/opm/parser/eclipse/EclipseState/Schedule/tests/GroupTests.cpp index 8d00dc4d9..26031a344 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/tests/GroupTests.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/tests/GroupTests.cpp @@ -28,6 +28,7 @@ #include +#include #include #include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/ScheduleTests.cpp b/opm/parser/eclipse/EclipseState/Schedule/tests/ScheduleTests.cpp index 02d860a9d..6a68e0d48 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/tests/ScheduleTests.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/tests/ScheduleTests.cpp @@ -28,12 +28,19 @@ #include #include +#include #include +#include +#include +#include +#include #include #include #include +#include #include #include +#include using namespace Opm; diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/TuningTests.cpp b/opm/parser/eclipse/EclipseState/Schedule/tests/TuningTests.cpp index fc129bf19..2e710a607 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/tests/TuningTests.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/tests/TuningTests.cpp @@ -24,6 +24,8 @@ #include #include +#include +#include #include #include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/WellSetTests.cpp b/opm/parser/eclipse/EclipseState/Schedule/tests/WellSetTests.cpp index 67994633b..7f6f5d7f0 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/tests/WellSetTests.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/tests/WellSetTests.cpp @@ -25,6 +25,7 @@ #include #include +#include #include #include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/WellSolventTests.cpp b/opm/parser/eclipse/EclipseState/Schedule/tests/WellSolventTests.cpp index d45e2174a..1137ca7ea 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/tests/WellSolventTests.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/tests/WellSolventTests.cpp @@ -24,7 +24,10 @@ #include #include +#include +#include #include +#include #include #include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/WellTests.cpp b/opm/parser/eclipse/EclipseState/Schedule/tests/WellTests.cpp index 6fb6450be..c8c163357 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/tests/WellTests.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/tests/WellTests.cpp @@ -31,7 +31,9 @@ #include #include +#include #include +#include #include #include #include diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp b/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp index b4422f304..cb5213b7f 100644 --- a/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp +++ b/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp @@ -18,8 +18,10 @@ */ -#include #include +#include +#include +#include #include diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp b/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp index 1a6835641..b8ecb18fb 100644 --- a/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp +++ b/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp @@ -21,11 +21,14 @@ #define OPM_SIMULATION_CONFIG_HPP #include -#include -#include namespace Opm { + template< typename > class GridProperties; + + class ThresholdPressure; + class ParseMode; + class SimulationConfig { public: @@ -42,7 +45,7 @@ namespace Opm { void initThresholdPressure(const ParseMode& parseMode , DeckConstPtr deck, std::shared_ptr> gridProperties); - ThresholdPressureConstPtr m_ThresholdPressure; + std::shared_ptr< const ThresholdPressure > m_ThresholdPressure; bool m_useCPR; bool m_DISGAS; bool m_VAPOIL; diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp b/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp index df32dd3b4..bda0a32ba 100644 --- a/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp +++ b/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp @@ -16,11 +16,12 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#include #include #include -#include +#include +#include #include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp b/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp index f3f6e869c..0d8e99167 100644 --- a/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp +++ b/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp @@ -24,12 +24,14 @@ #include #include -#include -#include namespace Opm { + template< typename > class GridProperties; + + class ParseMode; + class ThresholdPressure { public: diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/tests/SimulationConfigTest.cpp b/opm/parser/eclipse/EclipseState/SimulationConfig/tests/SimulationConfigTest.cpp index 53dfc94d4..fb40d42ee 100644 --- a/opm/parser/eclipse/EclipseState/SimulationConfig/tests/SimulationConfigTest.cpp +++ b/opm/parser/eclipse/EclipseState/SimulationConfig/tests/SimulationConfigTest.cpp @@ -29,7 +29,9 @@ #include #include #include +#include #include +#include #include diff --git a/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp b/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp index 925eed85a..413730661 100644 --- a/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp @@ -25,8 +25,6 @@ #include #include -#include - namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Tables/EnkrvdTable.hpp b/opm/parser/eclipse/EclipseState/Tables/EnkrvdTable.hpp index 736df21f5..7cadcefb5 100644 --- a/opm/parser/eclipse/EclipseState/Tables/EnkrvdTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/EnkrvdTable.hpp @@ -25,10 +25,13 @@ namespace Opm { + + class DeckItem; + class EnkrvdTable : public SimpleTable { public: - EnkrvdTable(Opm::DeckItemConstPtr item) + EnkrvdTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared( ); diff --git a/opm/parser/eclipse/EclipseState/Tables/EnptvdTable.hpp b/opm/parser/eclipse/EclipseState/Tables/EnptvdTable.hpp index 7adb46d03..a63f102da 100644 --- a/opm/parser/eclipse/EclipseState/Tables/EnptvdTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/EnptvdTable.hpp @@ -23,9 +23,12 @@ #include namespace Opm { + + class DeckItem; + class EnptvdTable : public SimpleTable { public: - EnptvdTable(Opm::DeckItemConstPtr item) + EnptvdTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared( ); m_schema->addColumn( ColumnSchema( "DEPTH" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE ) ); diff --git a/opm/parser/eclipse/EclipseState/Tables/GasvisctTable.hpp b/opm/parser/eclipse/EclipseState/Tables/GasvisctTable.hpp index 6b6c4725f..e905ff863 100644 --- a/opm/parser/eclipse/EclipseState/Tables/GasvisctTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/GasvisctTable.hpp @@ -23,11 +23,15 @@ #include #include "SimpleTable.hpp" #include +#include namespace Opm { + + class DeckItem; + class GasvisctTable : public SimpleTable { public: - GasvisctTable(const Deck& deck, Opm::DeckItemConstPtr deckItem) + GasvisctTable(const Deck& deck, std::shared_ptr< const DeckItem > deckItem) { int numComponents = deck.getKeyword()->getRecord(0)->getItem(0)->getInt(0); diff --git a/opm/parser/eclipse/EclipseState/Tables/ImkrvdTable.hpp b/opm/parser/eclipse/EclipseState/Tables/ImkrvdTable.hpp index 65f1110b6..84cc6ef6a 100644 --- a/opm/parser/eclipse/EclipseState/Tables/ImkrvdTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/ImkrvdTable.hpp @@ -24,9 +24,12 @@ namespace Opm { + + class DeckItem; + class ImkrvdTable : public SimpleTable { public: - ImkrvdTable(Opm::DeckItemConstPtr item) + ImkrvdTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared( ); m_schema->addColumn( ColumnSchema( "DEPTH" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE ) ); diff --git a/opm/parser/eclipse/EclipseState/Tables/ImptvdTable.hpp b/opm/parser/eclipse/EclipseState/Tables/ImptvdTable.hpp index ca6d3d0c3..69691b47b 100644 --- a/opm/parser/eclipse/EclipseState/Tables/ImptvdTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/ImptvdTable.hpp @@ -24,10 +24,13 @@ #include namespace Opm { + + class DeckItem; + class ImptvdTable : public SimpleTable { public: - ImptvdTable(Opm::DeckItemConstPtr item) + ImptvdTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared( ); m_schema->addColumn( ColumnSchema( "DEPTH" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE ) ); diff --git a/opm/parser/eclipse/EclipseState/Tables/MiscTable.hpp b/opm/parser/eclipse/EclipseState/Tables/MiscTable.hpp index 41921b2a4..9be60b946 100644 --- a/opm/parser/eclipse/EclipseState/Tables/MiscTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/MiscTable.hpp @@ -25,9 +25,11 @@ namespace Opm { + class DeckItem; + class MiscTable : public SimpleTable { public: - MiscTable(Opm::DeckItemConstPtr item) + MiscTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); m_schema->addColumn( ColumnSchema( "SolventFraction" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE) ); diff --git a/opm/parser/eclipse/EclipseState/Tables/MsfnTable.hpp b/opm/parser/eclipse/EclipseState/Tables/MsfnTable.hpp index 9d304d115..9e11caf9b 100644 --- a/opm/parser/eclipse/EclipseState/Tables/MsfnTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/MsfnTable.hpp @@ -24,9 +24,12 @@ #include namespace Opm { + + class DeckItem; + class MsfnTable : public SimpleTable { public: - MsfnTable(Opm::DeckItemConstPtr item) + MsfnTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared( ); m_schema->addColumn( ColumnSchema( "GasPhaseFraction", Table::STRICTLY_INCREASING , Table::DEFAULT_NONE)); diff --git a/opm/parser/eclipse/EclipseState/Tables/OilvisctTable.hpp b/opm/parser/eclipse/EclipseState/Tables/OilvisctTable.hpp index f7d8226ee..1079cc438 100644 --- a/opm/parser/eclipse/EclipseState/Tables/OilvisctTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/OilvisctTable.hpp @@ -23,10 +23,13 @@ #include namespace Opm { + + class DeckItem; + class OilvisctTable : public SimpleTable { public: - OilvisctTable(Opm::DeckItemConstPtr item) + OilvisctTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared( ); m_schema->addColumn( ColumnSchema("Temperature" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE) ); diff --git a/opm/parser/eclipse/EclipseState/Tables/PlyadsTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PlyadsTable.hpp index 51ac38b17..b56e55383 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PlyadsTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/PlyadsTable.hpp @@ -23,10 +23,13 @@ #include namespace Opm { + + class DeckItem; + class PlyadsTable : public SimpleTable { public: - PlyadsTable(Opm::DeckItemConstPtr item) + PlyadsTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); m_schema->addColumn( ColumnSchema("PolymerConcentration" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE )); diff --git a/opm/parser/eclipse/EclipseState/Tables/PlydhflfTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PlydhflfTable.hpp index c3b094bac..c0e43904b 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PlydhflfTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/PlydhflfTable.hpp @@ -24,10 +24,13 @@ namespace Opm { + + class DeckItem; + class PlydhflfTable : public SimpleTable { public: - PlydhflfTable(DeckItemConstPtr item) + PlydhflfTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared( ); m_schema->addColumn( ColumnSchema("Temperature" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE ) ); diff --git a/opm/parser/eclipse/EclipseState/Tables/PlymaxTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PlymaxTable.hpp index df79186d6..087b86607 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PlymaxTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/PlymaxTable.hpp @@ -21,11 +21,13 @@ #include "SimpleTable.hpp" #include +#include namespace Opm { + class PlymaxTable : public SimpleTable { public: - PlymaxTable(Opm::DeckRecordConstPtr record) + PlymaxTable(std::shared_ptr< const DeckRecord > record) { m_schema = std::make_shared( ); diff --git a/opm/parser/eclipse/EclipseState/Tables/PlyrockTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PlyrockTable.hpp index df1385071..de55ce306 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PlyrockTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/PlyrockTable.hpp @@ -24,11 +24,14 @@ #include namespace Opm { + + class DeckItem; + class PlyrockTable : public SimpleTable { public: // This is not really a table; every column has only one element. - PlyrockTable(DeckRecordConstPtr record) + PlyrockTable(std::shared_ptr< const DeckRecord > record) { m_schema = std::make_shared( ); m_schema->addColumn( ColumnSchema("DeadPoreVolume", Table::RANDOM , Table::DEFAULT_NONE) ); diff --git a/opm/parser/eclipse/EclipseState/Tables/PlyshlogTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PlyshlogTable.hpp index 6b75e9870..85e45e67b 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PlyshlogTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/PlyshlogTable.hpp @@ -19,20 +19,21 @@ #ifndef OPM_PARSER_PLYSHLOG_TABLE_HPP #define OPM_PARSER_PLYSHLOG_TABLE_HPP -#include #include "SimpleTable.hpp" +#include +#include #include namespace Opm { - // forward declaration + class TableManager; class PlyshlogTable : public SimpleTable { public: friend class TableManager; - PlyshlogTable(Opm::DeckRecordConstPtr indexRecord, Opm::DeckRecordConstPtr dataRecord) { + PlyshlogTable(std::shared_ptr< const DeckRecord > indexRecord, std::shared_ptr< const DeckRecord > dataRecord) { { const auto item = indexRecord->getItem(); setRefPolymerConcentration(item->getRawDouble(0)); diff --git a/opm/parser/eclipse/EclipseState/Tables/PlyviscTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PlyviscTable.hpp index 63051120c..1b8b456b0 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PlyviscTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/PlyviscTable.hpp @@ -24,9 +24,12 @@ namespace Opm { + + class DeckItem; + class PlyviscTable : public SimpleTable { public: - PlyviscTable(Opm::DeckItemConstPtr item) + PlyviscTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); m_schema->addColumn( ColumnSchema( "PolymerConcentration" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE)); diff --git a/opm/parser/eclipse/EclipseState/Tables/PmiscTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PmiscTable.hpp index 99d6f8d97..913d73d2a 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PmiscTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/PmiscTable.hpp @@ -24,10 +24,13 @@ #include namespace Opm { + + class DeckItem; + class PmiscTable : public SimpleTable { public: - PmiscTable(Opm::DeckItemConstPtr item) + PmiscTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); m_schema->addColumn( ColumnSchema( "OilPhasePressure" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE) ); diff --git a/opm/parser/eclipse/EclipseState/Tables/PvdgTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PvdgTable.hpp index 931f58fda..6b287f5cf 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PvdgTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/PvdgTable.hpp @@ -23,10 +23,13 @@ #include namespace Opm { + + class DeckItem; + class PvdgTable : public SimpleTable { public: - PvdgTable(Opm::DeckItemConstPtr item) + PvdgTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); m_schema->addColumn( ColumnSchema( "P" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE )); diff --git a/opm/parser/eclipse/EclipseState/Tables/PvdoTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PvdoTable.hpp index 3d98e0216..3ea9f6561 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PvdoTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/PvdoTable.hpp @@ -23,10 +23,13 @@ #include namespace Opm { + + class DeckItem; + class PvdoTable : public SimpleTable { public: - PvdoTable(Opm::DeckItemConstPtr item) + PvdoTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared( ); diff --git a/opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp index 702db7992..df3e353a5 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp @@ -24,9 +24,12 @@ #include namespace Opm { + + class DeckItem; + class PvdsTable : public SimpleTable { public: - PvdsTable(Opm::DeckItemConstPtr item) + PvdsTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); diff --git a/opm/parser/eclipse/EclipseState/Tables/PvtgTable.cpp b/opm/parser/eclipse/EclipseState/Tables/PvtgTable.cpp new file mode 100644 index 000000000..b9ab6e2b5 --- /dev/null +++ b/opm/parser/eclipse/EclipseState/Tables/PvtgTable.cpp @@ -0,0 +1,42 @@ +/* + Copyright (C) 2013 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . + */ + +#include +#include +#include +#include + +namespace Opm { + PvtgTable::PvtgTable(Opm::DeckKeywordConstPtr keyword, size_t tableIdx ) : PvtxTable("P") + { + m_underSaturatedSchema = std::make_shared( ); + m_underSaturatedSchema->addColumn( ColumnSchema( "RV" , Table::STRICTLY_DECREASING , Table::DEFAULT_NONE )); + m_underSaturatedSchema->addColumn( ColumnSchema( "BG" , Table::RANDOM , Table::DEFAULT_LINEAR )); + m_underSaturatedSchema->addColumn( ColumnSchema( "MUG" , Table::RANDOM , Table::DEFAULT_LINEAR )); + + + m_saturatedSchema = std::make_shared( ); + m_saturatedSchema->addColumn( ColumnSchema( "PG" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE )); + m_saturatedSchema->addColumn( ColumnSchema( "RV" , Table::RANDOM , Table::DEFAULT_NONE )); + m_saturatedSchema->addColumn( ColumnSchema( "BG" , Table::RANDOM , Table::DEFAULT_LINEAR )); + m_saturatedSchema->addColumn( ColumnSchema( "MUG" , Table::RANDOM , Table::DEFAULT_LINEAR )); + + PvtxTable::init(keyword , tableIdx); + } +} diff --git a/opm/parser/eclipse/EclipseState/Tables/PvtgTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PvtgTable.hpp index 91b2d9371..91b385aa1 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PvtgTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/PvtgTable.hpp @@ -22,27 +22,12 @@ #include namespace Opm { + + class DeckKeyword; + class PvtgTable : public PvtxTable { - public: - - PvtgTable(Opm::DeckKeywordConstPtr keyword , size_t tableIdx) : PvtxTable("P") - { - m_underSaturatedSchema = std::make_shared( ); - m_underSaturatedSchema->addColumn( ColumnSchema( "RV" , Table::STRICTLY_DECREASING , Table::DEFAULT_NONE )); - m_underSaturatedSchema->addColumn( ColumnSchema( "BG" , Table::RANDOM , Table::DEFAULT_LINEAR )); - m_underSaturatedSchema->addColumn( ColumnSchema( "MUG" , Table::RANDOM , Table::DEFAULT_LINEAR )); - - - m_saturatedSchema = std::make_shared( ); - m_saturatedSchema->addColumn( ColumnSchema( "PG" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE )); - m_saturatedSchema->addColumn( ColumnSchema( "RV" , Table::RANDOM , Table::DEFAULT_NONE )); - m_saturatedSchema->addColumn( ColumnSchema( "BG" , Table::RANDOM , Table::DEFAULT_LINEAR )); - m_saturatedSchema->addColumn( ColumnSchema( "MUG" , Table::RANDOM , Table::DEFAULT_LINEAR )); - - PvtxTable::init(keyword , tableIdx); - } - + PvtgTable(std::shared_ptr< const DeckKeyword > keyword, size_t tableIdx); }; } diff --git a/opm/parser/eclipse/EclipseState/Tables/PvtoTable.cpp b/opm/parser/eclipse/EclipseState/Tables/PvtoTable.cpp new file mode 100644 index 000000000..628362f39 --- /dev/null +++ b/opm/parser/eclipse/EclipseState/Tables/PvtoTable.cpp @@ -0,0 +1,24 @@ +#include +#include +#include +#include + +namespace Opm { + PvtoTable::PvtoTable(Opm::DeckKeywordConstPtr keyword , size_t tableIdx) : PvtxTable("RS") { + m_underSaturatedSchema = std::make_shared( ); + + m_underSaturatedSchema->addColumn( ColumnSchema( "P" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE )); + m_underSaturatedSchema->addColumn( ColumnSchema( "BO" , Table::RANDOM , Table::DEFAULT_LINEAR )); + m_underSaturatedSchema->addColumn( ColumnSchema( "MU" , Table::RANDOM , Table::DEFAULT_LINEAR )); + + + + m_saturatedSchema = std::make_shared( ); + m_saturatedSchema->addColumn( ColumnSchema( "RS" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE )); + m_saturatedSchema->addColumn( ColumnSchema( "P" , Table::RANDOM , Table::DEFAULT_NONE )); + m_saturatedSchema->addColumn( ColumnSchema( "BO" , Table::RANDOM , Table::DEFAULT_LINEAR )); + m_saturatedSchema->addColumn( ColumnSchema( "MU" , Table::RANDOM , Table::DEFAULT_LINEAR )); + + PvtxTable::init(keyword , tableIdx); + } +} diff --git a/opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp index f04d58ee2..1e1314425 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp @@ -22,28 +22,12 @@ #include namespace Opm { + + class DeckKeyword; + class PvtoTable : public PvtxTable { public: - - PvtoTable(Opm::DeckKeywordConstPtr keyword , size_t tableIdx) : PvtxTable("RS") - { - m_underSaturatedSchema = std::make_shared( ); - - m_underSaturatedSchema->addColumn( ColumnSchema( "P" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE )); - m_underSaturatedSchema->addColumn( ColumnSchema( "BO" , Table::RANDOM , Table::DEFAULT_LINEAR )); - m_underSaturatedSchema->addColumn( ColumnSchema( "MU" , Table::RANDOM , Table::DEFAULT_LINEAR )); - - - - m_saturatedSchema = std::make_shared( ); - m_saturatedSchema->addColumn( ColumnSchema( "RS" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE )); - m_saturatedSchema->addColumn( ColumnSchema( "P" , Table::RANDOM , Table::DEFAULT_NONE )); - m_saturatedSchema->addColumn( ColumnSchema( "BO" , Table::RANDOM , Table::DEFAULT_LINEAR )); - m_saturatedSchema->addColumn( ColumnSchema( "MU" , Table::RANDOM , Table::DEFAULT_LINEAR )); - - PvtxTable::init(keyword , tableIdx); - } - + PvtoTable(std::shared_ptr< const DeckKeyword > keyword, size_t tableIdx); }; } diff --git a/opm/parser/eclipse/EclipseState/Tables/PvtxTable.cpp b/opm/parser/eclipse/EclipseState/Tables/PvtxTable.cpp index cc56a9ad5..262ad4319 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PvtxTable.cpp +++ b/opm/parser/eclipse/EclipseState/Tables/PvtxTable.cpp @@ -17,7 +17,12 @@ along with OPM. If not, see . */ +#include +#include +#include #include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Tables/PvtxTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PvtxTable.hpp index 2297813d0..d48c3ee6a 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PvtxTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/PvtxTable.hpp @@ -20,11 +20,8 @@ #define OPM_PARSER_PVTX_TABLE_HPP #include -#include -#include #include -#include #include /* @@ -105,16 +102,21 @@ The first row actually corresponds to saturated values. namespace Opm { + + class DeckKeyword; + class SimpleTable; + class TableSchema; + class PvtxTable { public: - static size_t numTables(Opm::DeckKeywordConstPtr keyword); - static std::vector > recordRanges(Opm::DeckKeywordConstPtr keyword); + static size_t numTables(std::shared_ptr< const DeckKeyword > keyword); + static std::vector > recordRanges(std::shared_ptr< const DeckKeyword > keyword); PvtxTable(const std::string& columnName); const SimpleTable& getUnderSaturatedTable(size_t tableNumber) const; - void init(Opm::DeckKeywordConstPtr keyword , size_t tableIdx); + void init(std::shared_ptr< const DeckKeyword > keyword , size_t tableIdx); size_t size() const; double evaluate(const std::string& column, double outerArg, double innerArg) const; double getArgValue(size_t index) const; diff --git a/opm/parser/eclipse/EclipseState/Tables/RocktabTable.hpp b/opm/parser/eclipse/EclipseState/Tables/RocktabTable.hpp index f24d3d602..1c9a56c33 100644 --- a/opm/parser/eclipse/EclipseState/Tables/RocktabTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/RocktabTable.hpp @@ -23,9 +23,12 @@ #include namespace Opm { + + class DeckItem; + class RocktabTable : public SimpleTable { public: - RocktabTable(Opm::DeckItemConstPtr item, + RocktabTable(std::shared_ptr< const DeckItem > item, bool isDirectional, bool hasStressOption) { diff --git a/opm/parser/eclipse/EclipseState/Tables/RsvdTable.hpp b/opm/parser/eclipse/EclipseState/Tables/RsvdTable.hpp index 6d6de984d..923a2d133 100644 --- a/opm/parser/eclipse/EclipseState/Tables/RsvdTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/RsvdTable.hpp @@ -23,9 +23,12 @@ #include namespace Opm { + + class DeckItem; + class RsvdTable : public SimpleTable { public: - RsvdTable(Opm::DeckItemConstPtr item) + RsvdTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared( ); m_schema->addColumn( ColumnSchema( "DEPTH" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE )); diff --git a/opm/parser/eclipse/EclipseState/Tables/RtempvdTable.hpp b/opm/parser/eclipse/EclipseState/Tables/RtempvdTable.hpp index 482ead53f..f7de487a9 100644 --- a/opm/parser/eclipse/EclipseState/Tables/RtempvdTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/RtempvdTable.hpp @@ -24,9 +24,11 @@ namespace Opm { + class DeckItem; + class RtempvdTable : public SimpleTable { public: - RtempvdTable(Opm::DeckItemConstPtr item) + RtempvdTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); m_schema->addColumn( ColumnSchema( "Depth" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE) ); diff --git a/opm/parser/eclipse/EclipseState/Tables/RvvdTable.hpp b/opm/parser/eclipse/EclipseState/Tables/RvvdTable.hpp index 5de0ce89e..52cdd6884 100644 --- a/opm/parser/eclipse/EclipseState/Tables/RvvdTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/RvvdTable.hpp @@ -22,9 +22,12 @@ #include "SimpleTable.hpp" namespace Opm { + + class DeckItem; + class RvvdTable : public SimpleTable { public: - RvvdTable(Opm::DeckItemConstPtr item) + RvvdTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared( ); m_schema->addColumn( ColumnSchema( "DEPTH" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE ) ); diff --git a/opm/parser/eclipse/EclipseState/Tables/SgcwmisTable.hpp b/opm/parser/eclipse/EclipseState/Tables/SgcwmisTable.hpp index 90b1c4f66..2bae52fe2 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SgcwmisTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/SgcwmisTable.hpp @@ -23,9 +23,12 @@ #include "SimpleTable.hpp" namespace Opm { + + class DeckItem; + class SgcwmisTable : public SimpleTable { public: - SgcwmisTable(Opm::DeckItemConstPtr item) + SgcwmisTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); m_schema->addColumn( ColumnSchema( "WaterSaturation" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE) ); diff --git a/opm/parser/eclipse/EclipseState/Tables/SgfnTable.hpp b/opm/parser/eclipse/EclipseState/Tables/SgfnTable.hpp index d325868cd..443cddc99 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SgfnTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/SgfnTable.hpp @@ -20,13 +20,14 @@ #define OPM_PARSER_SGFN_TABLE_HPP #include "SimpleTable.hpp" +#include #include namespace Opm { class SgfnTable : public SimpleTable { public: - SgfnTable(Opm::DeckItemConstPtr item) + SgfnTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); diff --git a/opm/parser/eclipse/EclipseState/Tables/SgofTable.hpp b/opm/parser/eclipse/EclipseState/Tables/SgofTable.hpp index 16518f727..a5285aeae 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SgofTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/SgofTable.hpp @@ -25,10 +25,13 @@ namespace Opm { // forward declaration + + class DeckItem; + class SgofTable : public SimpleTable { public: - SgofTable(Opm::DeckItemConstPtr item) + SgofTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); m_schema->addColumn( ColumnSchema("SG" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE)); diff --git a/opm/parser/eclipse/EclipseState/Tables/SgwfnTable.hpp b/opm/parser/eclipse/EclipseState/Tables/SgwfnTable.hpp index 7adbd2103..b44027471 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SgwfnTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/SgwfnTable.hpp @@ -23,10 +23,13 @@ #include namespace Opm { + + class DeckItem; + class SgwfnTable : public SimpleTable { public: - SgwfnTable(Opm::DeckItemConstPtr item) { + SgwfnTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); m_schema->addColumn( ColumnSchema( "SG" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE ) ); diff --git a/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp b/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp index d5cc5cbcb..1d4083d8d 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp +++ b/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp @@ -20,6 +20,7 @@ #include #include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp b/opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp index 4bdfc7cea..59c30c3d0 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp @@ -19,28 +19,28 @@ #ifndef OPM_PARSER_SIMPLE_TABLE_HPP #define OPM_PARSER_SIMPLE_TABLE_HPP -#include #include -#include #include - #include #include #include #include -#include namespace Opm { + + class DeckItem; + class TableSchema; + class SimpleTable { public: SimpleTable(const SimpleTable&) = default; SimpleTable(); - SimpleTable(std::shared_ptr schema , Opm::DeckItemConstPtr deckItem); + SimpleTable(std::shared_ptr schema , std::shared_ptr< const DeckItem > deckItem); explicit SimpleTable(std::shared_ptr schema); void addColumns(); - void init(Opm::DeckItemConstPtr deckItem); + void init(std::shared_ptr< const DeckItem > deckItem); size_t numColumns() const; size_t numRows() const; void addRow( const std::vector& row); diff --git a/opm/parser/eclipse/EclipseState/Tables/SlgofTable.hpp b/opm/parser/eclipse/EclipseState/Tables/SlgofTable.hpp index 93a038bd8..4c38eb84a 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SlgofTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/SlgofTable.hpp @@ -25,11 +25,13 @@ namespace Opm { + class DeckItem; + class SlgofTable : public SimpleTable { public: - SlgofTable(Opm::DeckItemConstPtr item) + SlgofTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); m_schema->addColumn( ColumnSchema("SL" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE )); diff --git a/opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp b/opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp index 39d7fc209..089c0bab9 100644 --- a/opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp @@ -23,10 +23,13 @@ #include namespace Opm { + + class DeckItem; + class Sof2Table : public SimpleTable { public: - Sof2Table(Opm::DeckItemConstPtr item) + Sof2Table(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared( ); m_schema->addColumn( ColumnSchema( "SO" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE )); diff --git a/opm/parser/eclipse/EclipseState/Tables/Sof3Table.hpp b/opm/parser/eclipse/EclipseState/Tables/Sof3Table.hpp index 46fe4bf27..ba472db47 100644 --- a/opm/parser/eclipse/EclipseState/Tables/Sof3Table.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/Sof3Table.hpp @@ -22,10 +22,13 @@ #include "SimpleTable.hpp" namespace Opm { + + class DeckItem; + class Sof3Table : public SimpleTable { public: - Sof3Table(Opm::DeckItemConstPtr item) + Sof3Table(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); diff --git a/opm/parser/eclipse/EclipseState/Tables/SorwmisTable.hpp b/opm/parser/eclipse/EclipseState/Tables/SorwmisTable.hpp index 6f24a8cd1..0a88d7cc6 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SorwmisTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/SorwmisTable.hpp @@ -24,10 +24,13 @@ #include namespace Opm { + + class DeckItem; + class SorwmisTable : public SimpleTable { public: - SorwmisTable(Opm::DeckItemConstPtr item) + SorwmisTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); diff --git a/opm/parser/eclipse/EclipseState/Tables/SsfnTable.hpp b/opm/parser/eclipse/EclipseState/Tables/SsfnTable.hpp index eb002ed75..6f7b851eb 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SsfnTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/SsfnTable.hpp @@ -23,10 +23,13 @@ #include namespace Opm { + + class DeckItem; + class SsfnTable : public SimpleTable { public: friend class TableManager; - SsfnTable(Opm::DeckItemConstPtr item) + SsfnTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); diff --git a/opm/parser/eclipse/EclipseState/Tables/SwfnTable.hpp b/opm/parser/eclipse/EclipseState/Tables/SwfnTable.hpp index 252461c0d..5b4e19a4f 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SwfnTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/SwfnTable.hpp @@ -26,7 +26,7 @@ namespace Opm { class SwfnTable : public SimpleTable { public: - SwfnTable(Opm::DeckItemConstPtr item) + SwfnTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared(); diff --git a/opm/parser/eclipse/EclipseState/Tables/SwofTable.hpp b/opm/parser/eclipse/EclipseState/Tables/SwofTable.hpp index f0e33e43a..579ea3d6a 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SwofTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/SwofTable.hpp @@ -23,10 +23,13 @@ #include namespace Opm { + + class DeckItem; + class SwofTable : public SimpleTable { public: - SwofTable(Opm::DeckItemConstPtr item) { + SwofTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared( ); m_schema->addColumn( ColumnSchema( "SW" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE) ); diff --git a/opm/parser/eclipse/EclipseState/Tables/TableColumn.cpp b/opm/parser/eclipse/EclipseState/Tables/TableColumn.cpp index 6285a260f..354204626 100644 --- a/opm/parser/eclipse/EclipseState/Tables/TableColumn.cpp +++ b/opm/parser/eclipse/EclipseState/Tables/TableColumn.cpp @@ -19,6 +19,7 @@ #include #include +#include #include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp b/opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp index 9feedf0f4..72b2d66b6 100644 --- a/opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp @@ -25,11 +25,12 @@ #include #include -#include #include namespace Opm { + class ColumnSchema; + class TableColumn { public: explicit TableColumn( const ColumnSchema& schema ); diff --git a/opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp b/opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp index 9231a1ba2..da88bd7d2 100644 --- a/opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp @@ -21,13 +21,13 @@ #define OPM_TABLE_CONTAINER_HPP #include +#include #include -#include - - namespace Opm { + class SimpleTable; + class TableContainer { /* The TableContainer class implements a simple map: diff --git a/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp b/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp index a95f2ea60..820430b88 100644 --- a/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp +++ b/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp @@ -22,6 +22,46 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + namespace Opm { TableManager::TableManager( const Deck& deck ) { diff --git a/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp b/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp index d3e628dc4..9fff20323 100644 --- a/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp @@ -20,11 +20,7 @@ #ifndef OPM_TABLE_MANAGER_HPP #define OPM_TABLE_MANAGER_HPP -#include - -#include -#include -#include +#include #include #include @@ -67,12 +63,18 @@ #include #include +#include +#include +#include - - +#include namespace Opm { + class Tabdims; + class Eqldims; + class Regdims; + class TableManager { public: TableManager( const Deck& deck ); diff --git a/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.cpp b/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.cpp index 46d78adbb..185d30533 100644 --- a/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.cpp +++ b/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.cpp @@ -18,8 +18,8 @@ */ #include - #include +#include //Anonymous namespace diff --git a/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.hpp b/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.hpp index 01e283670..9e307bcd6 100644 --- a/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.hpp @@ -31,6 +31,8 @@ namespace Opm { + class DeckKeyword; + /** * Class for reading data from a VFPINJ (vertical flow performance injection) table */ @@ -77,7 +79,7 @@ public: * Constructor which parses a deck keyword and retrieves the relevant parts for a * VFP table. */ - void init(DeckKeywordConstPtr table, std::shared_ptr deck_unit_system); + void init(std::shared_ptr< const DeckKeyword > table, std::shared_ptr deck_unit_system); /** * Returns the table number diff --git a/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.cpp b/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.cpp index bc4ca1176..adac9131a 100644 --- a/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.cpp +++ b/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.cpp @@ -17,12 +17,11 @@ along with OPM. If not, see . */ -#include -#include #include - - +#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.hpp b/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.hpp index cab28875b..93155bbfd 100644 --- a/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.hpp @@ -20,8 +20,6 @@ #ifndef OPM_PARSER_ECLIPSE_ECLIPSESTATE_TABLES_VFPPRODTABLE_HPP_ #define OPM_PARSER_ECLIPSE_ECLIPSESTATE_TABLES_VFPPRODTABLE_HPP_ -#include - #include #include @@ -31,6 +29,10 @@ namespace Opm { + class DeckItem; + class DeckKeyword; + class UnitSystem; + /** * Class for reading data from a VFPPROD (vertical flow performance production) table */ @@ -120,7 +122,7 @@ public: * Constructor which parses a deck keyword and retrieves the relevant parts for a * VFP table. */ - void init(DeckKeywordConstPtr table, std::shared_ptr deck_unit_system); + void init(std::shared_ptr< const DeckKeyword > table, std::shared_ptr deck_unit_system); /** * Returns the table number diff --git a/opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp b/opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp index 8ed9536b1..3464e378a 100644 --- a/opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp @@ -20,12 +20,14 @@ #define OPM_PARSER_WATVISCT_TABLE_HPP #include "SimpleTable.hpp" +#include #include namespace Opm { + class WatvisctTable : public SimpleTable { public: - WatvisctTable(Opm::DeckItemConstPtr item) + WatvisctTable(std::shared_ptr< const DeckItem > item) { m_schema = std::make_shared( ); diff --git a/opm/parser/eclipse/EclipseState/Tables/tests/TableManagerTests.cpp b/opm/parser/eclipse/EclipseState/Tables/tests/TableManagerTests.cpp index 87d01e95a..4d1bfd4e5 100644 --- a/opm/parser/eclipse/EclipseState/Tables/tests/TableManagerTests.cpp +++ b/opm/parser/eclipse/EclipseState/Tables/tests/TableManagerTests.cpp @@ -36,13 +36,12 @@ #include #include #include +#include #include #include #include -#include - -#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp b/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp index 74e77f0fd..84e4bfb46 100644 --- a/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp +++ b/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp @@ -33,9 +33,15 @@ #include #include +#include +#include #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/opm/parser/eclipse/Generator/KeywordGenerator.cpp b/opm/parser/eclipse/Generator/KeywordGenerator.cpp index 2cb9b4194..a07cae414 100644 --- a/opm/parser/eclipse/Generator/KeywordGenerator.cpp +++ b/opm/parser/eclipse/Generator/KeywordGenerator.cpp @@ -39,6 +39,7 @@ namespace Opm { std::string testHeader() { std::string header = "#define BOOST_TEST_MODULE\n" + "#include \n" "#include \n" "#include \n" "#include \n" diff --git a/opm/parser/eclipse/IntegrationTests/BoxTest.cpp b/opm/parser/eclipse/IntegrationTests/BoxTest.cpp index 9d9781722..e33f754ea 100644 --- a/opm/parser/eclipse/IntegrationTests/BoxTest.cpp +++ b/opm/parser/eclipse/IntegrationTests/BoxTest.cpp @@ -28,6 +28,8 @@ #include #include #include +#include +#include using namespace Opm; diff --git a/opm/parser/eclipse/IntegrationTests/IOConfigIntegrationTest.cpp b/opm/parser/eclipse/IntegrationTests/IOConfigIntegrationTest.cpp index 1045c1833..f36936fa8 100644 --- a/opm/parser/eclipse/IntegrationTests/IOConfigIntegrationTest.cpp +++ b/opm/parser/eclipse/IntegrationTests/IOConfigIntegrationTest.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include using namespace Opm; diff --git a/opm/parser/eclipse/IntegrationTests/ParsePVTO.cpp b/opm/parser/eclipse/IntegrationTests/ParsePVTO.cpp index 73914c92e..1c8ba8a7c 100644 --- a/opm/parser/eclipse/IntegrationTests/ParsePVTO.cpp +++ b/opm/parser/eclipse/IntegrationTests/ParsePVTO.cpp @@ -26,6 +26,7 @@ #include #include +#include #include #include diff --git a/opm/parser/eclipse/IntegrationTests/ParseTOPS.cpp b/opm/parser/eclipse/IntegrationTests/ParseTOPS.cpp index e12cc043d..f70847991 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseTOPS.cpp +++ b/opm/parser/eclipse/IntegrationTests/ParseTOPS.cpp @@ -29,6 +29,7 @@ #include #include #include +#include using namespace Opm; diff --git a/opm/parser/eclipse/IntegrationTests/ParseWellWithWildcards.cpp b/opm/parser/eclipse/IntegrationTests/ParseWellWithWildcards.cpp index 0ecca377b..a9ef81ad1 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseWellWithWildcards.cpp +++ b/opm/parser/eclipse/IntegrationTests/ParseWellWithWildcards.cpp @@ -31,7 +31,10 @@ #include #include +#include +#include #include +#include using namespace Opm; diff --git a/opm/parser/eclipse/IntegrationTests/ResinsightTest.cpp b/opm/parser/eclipse/IntegrationTests/ResinsightTest.cpp index 2be639deb..da38491a6 100644 --- a/opm/parser/eclipse/IntegrationTests/ResinsightTest.cpp +++ b/opm/parser/eclipse/IntegrationTests/ResinsightTest.cpp @@ -26,6 +26,8 @@ #include #include #include +#include +#include using namespace Opm; diff --git a/opm/parser/eclipse/IntegrationTests/ScheduleCreateFromDeck.cpp b/opm/parser/eclipse/IntegrationTests/ScheduleCreateFromDeck.cpp index 5fdf6f5cd..79167928d 100644 --- a/opm/parser/eclipse/IntegrationTests/ScheduleCreateFromDeck.cpp +++ b/opm/parser/eclipse/IntegrationTests/ScheduleCreateFromDeck.cpp @@ -27,7 +27,12 @@ #include #include #include +#include +#include #include +#include +#include +#include #include #include #include diff --git a/opm/parser/eclipse/Parser/Parser.cpp b/opm/parser/eclipse/Parser/Parser.cpp index a023903d6..f373c8f0a 100644 --- a/opm/parser/eclipse/Parser/Parser.cpp +++ b/opm/parser/eclipse/Parser/Parser.cpp @@ -19,6 +19,8 @@ #include +#include + #include #include diff --git a/opm/parser/eclipse/Parser/Parser.hpp b/opm/parser/eclipse/Parser/Parser.hpp index d7e0b2b8d..68a78487d 100644 --- a/opm/parser/eclipse/Parser/Parser.hpp +++ b/opm/parser/eclipse/Parser/Parser.hpp @@ -25,7 +25,6 @@ #include #include -#include #include diff --git a/opm/parser/eclipse/Parser/ParserItem.hpp b/opm/parser/eclipse/Parser/ParserItem.hpp index f9788acec..74265a920 100644 --- a/opm/parser/eclipse/Parser/ParserItem.hpp +++ b/opm/parser/eclipse/Parser/ParserItem.hpp @@ -25,7 +25,6 @@ #include #include -#include #include diff --git a/opm/parser/eclipse/Parser/ParserRecord.cpp b/opm/parser/eclipse/Parser/ParserRecord.cpp index a76f5709d..f25ae2550 100644 --- a/opm/parser/eclipse/Parser/ParserRecord.cpp +++ b/opm/parser/eclipse/Parser/ParserRecord.cpp @@ -21,6 +21,7 @@ #include #include #include +#include namespace Opm { diff --git a/opm/parser/eclipse/Utility/EndscaleWrapper.hpp b/opm/parser/eclipse/Utility/EndscaleWrapper.hpp index a00594f90..2650787e7 100644 --- a/opm/parser/eclipse/Utility/EndscaleWrapper.hpp +++ b/opm/parser/eclipse/Utility/EndscaleWrapper.hpp @@ -20,6 +20,8 @@ #define OPM_PARSER_ENDSCALE_WRAPPER_HPP #include +#include +#include #include #include @@ -31,7 +33,7 @@ namespace Opm { * \brief A wrapper class to provide convenient access to the * data of the 'ENDSCALE' keyword. */ - EndscaleWrapper(Opm::DeckKeywordConstPtr keyword) + EndscaleWrapper(std::shared_ptr< const DeckKeyword > keyword) : m_keyword(keyword) { } @@ -71,7 +73,7 @@ namespace Opm { { return m_keyword->getRecord(0)->getItem(4)->getInt(0); } private: - Opm::DeckKeywordConstPtr m_keyword; + std::shared_ptr< const DeckKeyword > m_keyword; }; } diff --git a/opm/parser/eclipse/Utility/EquilWrapper.hpp b/opm/parser/eclipse/Utility/EquilWrapper.hpp index 8c0650227..fbbbd6495 100644 --- a/opm/parser/eclipse/Utility/EquilWrapper.hpp +++ b/opm/parser/eclipse/Utility/EquilWrapper.hpp @@ -20,9 +20,8 @@ #define OPM_PARSER_EQUIL_WRAPPER_HPP #include - -#include -#include +#include +#include namespace Opm { class EquilWrapper { @@ -31,7 +30,7 @@ namespace Opm { * \brief A wrapper class to provide convenient access to the * data of the 'EQUIL' keyword. */ - EquilWrapper(Opm::DeckKeywordConstPtr keyword) + EquilWrapper(std::shared_ptr< const DeckKeyword > keyword) : m_keyword(keyword) { } @@ -117,7 +116,7 @@ namespace Opm { { return m_keyword->getRecord(regionIdx)->getItem(10)->getInt(0) == 0; } private: - Opm::DeckKeywordConstPtr m_keyword; + std::shared_ptr< const DeckKeyword > m_keyword; }; } diff --git a/opm/parser/eclipse/Utility/GconinjeWrapper.hpp b/opm/parser/eclipse/Utility/GconinjeWrapper.hpp index 6cdfbf2c6..39dfd8761 100644 --- a/opm/parser/eclipse/Utility/GconinjeWrapper.hpp +++ b/opm/parser/eclipse/Utility/GconinjeWrapper.hpp @@ -20,9 +20,8 @@ #define OPM_PARSER_GCONINJE_WRAPPER_HPP #include - -#include -#include +#include +#include namespace Opm { class GconinjeWrapper { @@ -31,7 +30,7 @@ namespace Opm { * \brief A wrapper class to provide convenient access to the * data of the 'GCONINJE' keyword. */ - GconinjeWrapper(Opm::DeckKeywordConstPtr keyword) + GconinjeWrapper(std::shared_ptr< const DeckKeyword > keyword) : m_keyword(keyword) { } @@ -152,7 +151,7 @@ namespace Opm { { return m_keyword->getRecord(wellGroupIdx)->getItem(12)->getSIDouble(0); } private: - Opm::DeckKeywordConstPtr m_keyword; + std::shared_ptr< const DeckKeyword > m_keyword; }; } diff --git a/opm/parser/eclipse/Utility/GruptreeWrapper.hpp b/opm/parser/eclipse/Utility/GruptreeWrapper.hpp index f0fb5944c..d7c0aab1e 100644 --- a/opm/parser/eclipse/Utility/GruptreeWrapper.hpp +++ b/opm/parser/eclipse/Utility/GruptreeWrapper.hpp @@ -20,9 +20,8 @@ #define OPM_PARSER_GRUPTREE_WRAPPER_HPP #include - -#include -#include +#include +#include namespace Opm { class GruptreeWrapper { @@ -31,7 +30,7 @@ namespace Opm { * \brief A wrapper class to provide convenient access to the * data of the 'GRUPTREE' keyword. */ - GruptreeWrapper(Opm::DeckKeywordConstPtr keyword) + GruptreeWrapper(std::shared_ptr< const DeckKeyword > keyword) : m_keyword(keyword) { } @@ -57,7 +56,7 @@ namespace Opm { { return m_keyword->getRecord(wellIdx)->getItem(1)->getString(0); } private: - Opm::DeckKeywordConstPtr m_keyword; + std::shared_ptr< const DeckKeyword > m_keyword; }; } diff --git a/opm/parser/eclipse/Utility/SpecgridWrapper.hpp b/opm/parser/eclipse/Utility/SpecgridWrapper.hpp index cf31e39c7..8c6562b5e 100644 --- a/opm/parser/eclipse/Utility/SpecgridWrapper.hpp +++ b/opm/parser/eclipse/Utility/SpecgridWrapper.hpp @@ -20,9 +20,10 @@ #define OPM_PARSER_SPECGRID_WRAPPER_HPP #include +#include +#include #include -#include namespace Opm { class SpecgridWrapper { diff --git a/opm/parser/eclipse/Utility/StartWrapper.hpp b/opm/parser/eclipse/Utility/StartWrapper.hpp index 3538a0085..09e76b6c1 100644 --- a/opm/parser/eclipse/Utility/StartWrapper.hpp +++ b/opm/parser/eclipse/Utility/StartWrapper.hpp @@ -20,6 +20,8 @@ #define OPM_PARSER_START_WRAPPER_HPP #include +#include +#include #include