diff --git a/opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp b/opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp index 36e19bbc6..dfadece89 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp @@ -48,16 +48,12 @@ public: m_flo_type(FLO_INVALID) { } - VFPInjTable(int table_num, double datum_depth, FLO_TYPE flo_type, const std::vector& flo_data, const std::vector& thp_data, const array_type& data); - - VFPInjTable(const DeckKeyword& table, const UnitSystem& deck_unit_system); - void init(int table_num, double datum_depth, FLO_TYPE flo_type, @@ -65,45 +61,46 @@ public: const std::vector& thp_data, const array_type& data); - void init(const DeckKeyword& table, const UnitSystem& deck_unit_system); + VFPInjTable(const DeckKeyword& table, const UnitSystem& deck_unit_system); - inline int getTableNum() const { - return m_table_num; - } + inline int getTableNum() const { + return m_table_num; + } - inline double getDatumDepth() const { - return m_datum_depth; - } + inline double getDatumDepth() const { + return m_datum_depth; + } - inline FLO_TYPE getFloType() const { - return m_flo_type; - } + inline FLO_TYPE getFloType() const { + return m_flo_type; + } - inline const std::vector& getFloAxis() const { - return m_flo_data; - } + inline const std::vector& getFloAxis() const { + return m_flo_data; + } - inline const std::vector& getTHPAxis() const { - return m_thp_data; - } + inline const std::vector& getTHPAxis() const { + return m_thp_data; + } + + /** + * Returns the data of the table itself. The data is ordered so that + * + * table = getTable(); + * bhp = table[thp_idx][flo_idx]; + * + * gives the bottom hole pressure value in the table for the coordinate + * given by + * flo_axis = getFloAxis(); + * thp_axis = getTHPAxis(); + * + * flo_coord = flo_axis(flo_idx); + * thp_coord = thp_axis(thp_idx); + */ + inline const array_type& getTable() const { + return m_data; + } - /** - * Returns the data of the table itself. The data is ordered so that - * - * table = getTable(); - * bhp = table[thp_idx][flo_idx]; - * - * gives the bottom hole pressure value in the table for the coordinate - * given by - * flo_axis = getFloAxis(); - * thp_axis = getTHPAxis(); - * - * flo_coord = flo_axis(flo_idx); - * thp_coord = thp_axis(thp_idx); - */ - inline const array_type& getTable() const { - return m_data; - } private: int m_table_num; diff --git a/opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp b/opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp index 69af609ea..e86b07226 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp @@ -69,44 +69,20 @@ public: ALQ_INVALID }; - inline VFPProdTable() : m_table_num(-1), - m_datum_depth(-1), - m_flo_type(FLO_INVALID), - m_wfr_type(WFR_INVALID), - m_gfr_type(GFR_INVALID), - m_alq_type(ALQ_INVALID) { + VFPProdTable(int table_num, + double datum_depth, + FLO_TYPE flo_type, + WFR_TYPE wfr_type, + GFR_TYPE gfr_type, + ALQ_TYPE alq_type, + const std::vector& flo_data, + const std::vector& thp_data, + const std::vector& wfr_data, + const std::vector& gfr_data, + const std::vector& alq_data, + const array_type& data); - } - - VFPProdTable(int table_num, - double datum_depth, - FLO_TYPE flo_type, - WFR_TYPE wfr_type, - GFR_TYPE gfr_type, - ALQ_TYPE alq_type, - const std::vector& flo_data, - const std::vector& thp_data, - const std::vector& wfr_data, - const std::vector& gfr_data, - const std::vector& alq_data, - const array_type& data); - - VFPProdTable( const DeckKeyword& table, const UnitSystem& deck_unit_system); - - void init(int table_num, - double datum_depth, - FLO_TYPE flo_type, - WFR_TYPE wfr_type, - GFR_TYPE gfr_type, - ALQ_TYPE alq_type, - const std::vector& flo_data, - const std::vector& thp_data, - const std::vector& wfr_data, - const std::vector& gfr_data, - const std::vector& alq_data, - const array_type& data); - - void init( const DeckKeyword& table, const UnitSystem& deck_unit_system); + VFPProdTable( const DeckKeyword& table, const UnitSystem& deck_unit_system); inline int getTableNum() const { return m_table_num; @@ -172,6 +148,7 @@ public: return m_data; } + private: int m_table_num; @@ -187,7 +164,6 @@ private: std::vector m_gfr_data; std::vector m_alq_data; - //The data itself, using the data ordering m_data[thp][wfr][gfr][alq][flo] array_type m_data; void check(const DeckKeyword& table, const double factor);