diff --git a/opm/parser/eclipse/CMakeLists.txt b/opm/parser/eclipse/CMakeLists.txt index f51bba28e..947fd2cb3 100644 --- a/opm/parser/eclipse/CMakeLists.txt +++ b/opm/parser/eclipse/CMakeLists.txt @@ -164,7 +164,6 @@ EclipseState/Tables/PvdoTable.hpp EclipseState/Tables/MultiRecordTable.hpp EclipseState/Tables/PvdgTable.hpp EclipseState/Tables/SingleRecordTable.hpp -EclipseState/Tables/TlmixparTable.hpp EclipseState/Tables/PlymaxTable.hpp EclipseState/Tables/PvtgTable.hpp EclipseState/Tables/PlyrockTable.hpp diff --git a/opm/parser/eclipse/EclipseState/EclipseState.cpp b/opm/parser/eclipse/EclipseState/EclipseState.cpp index 230de794e..cc2f46af8 100644 --- a/opm/parser/eclipse/EclipseState/EclipseState.cpp +++ b/opm/parser/eclipse/EclipseState/EclipseState.cpp @@ -128,10 +128,6 @@ namespace Opm { return m_swofTables; } - const std::vector& EclipseState::getTlmixparTables() const { - return m_tlmixparTables; - } - ScheduleConstPtr EclipseState::getSchedule() const { return schedule; } @@ -163,7 +159,6 @@ namespace Opm { initSimpleTables(deck, parserLog, "RVVD", m_rvvdTables); initSimpleTables(deck, parserLog, "SGOF", m_sgofTables); initSimpleTables(deck, parserLog, "SWOF", m_swofTables); - initSimpleTables(deck, parserLog, "TLMIXPAR", m_tlmixparTables); // the ROCKTAB table comes with additional fun because the number of columns //depends on the presence of the RKTRMDIR keyword... diff --git a/opm/parser/eclipse/EclipseState/EclipseState.hpp b/opm/parser/eclipse/EclipseState/EclipseState.hpp index b9d7ac188..a6586ae4c 100644 --- a/opm/parser/eclipse/EclipseState/EclipseState.hpp +++ b/opm/parser/eclipse/EclipseState/EclipseState.hpp @@ -49,7 +49,6 @@ #include #include #include -#include #include #include @@ -107,7 +106,6 @@ namespace Opm { const std::vector& getRvvdTables() const; const std::vector& getSgofTables() const; const std::vector& getSwofTables() const; - const std::vector& getTlmixparTables() const; // the unit system used by the deck. note that it is rarely needed to convert // units because internally to opm-parser everything is represented by SI @@ -223,7 +221,6 @@ namespace Opm { std::vector m_rvvdTables; std::vector m_sgofTables; std::vector m_swofTables; - std::vector m_tlmixparTables; std::set phases; std::string m_title; diff --git a/opm/parser/eclipse/EclipseState/Tables/TlmixparTable.hpp b/opm/parser/eclipse/EclipseState/Tables/TlmixparTable.hpp deleted file mode 100644 index 241300d4f..000000000 --- a/opm/parser/eclipse/EclipseState/Tables/TlmixparTable.hpp +++ /dev/null @@ -1,78 +0,0 @@ -/* - Copyright (C) 2014 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 . - */ -#ifndef OPM_PARSER_TLMIXPAR_TABLE_HPP -#define OPM_PARSER_TLMIXPAR_TABLE_HPP - -#include "SingleRecordTable.hpp" - -namespace Opm { - // forward declaration - class EclipseState; - - class TlmixparTable : protected SingleRecordTable { - typedef SingleRecordTable ParentType; - - friend class EclipseState; - TlmixparTable() = default; - - /*! - * \brief Read the TLMIXPAR keyword and provide some convenience - * methods for it. - */ - void init(Opm::DeckKeywordConstPtr keyword, int recordIdx) - { - ParentType::init(keyword, - std::vector{"VISC_PARA", "DENS_PARA"}, - recordIdx, - /*firstEntityOffset=*/0); - - // make sure the first column is not defaulted and copy the value from the - // first column to the second one if the second column is defaulted - int nRows = numRows(); - auto& viscColumn = m_columns[0]; - auto& densColumn = m_columns[1]; - auto& viscColumnDefaulted = m_valueDefaulted[0]; - auto& densColumnDefaulted = m_valueDefaulted[1]; - for (int rowIdx = 0; rowIdx < nRows; ++ rowIdx) { - if (viscColumnDefaulted[rowIdx]) - throw std::invalid_argument("The first column of the TLMIXPAR table cannot be defaulted"); - if (densColumnDefaulted[rowIdx]) { - densColumn[rowIdx] = viscColumn[rowIdx]; - densColumnDefaulted[rowIdx] = false; - } - } - } - - public: - using ParentType::numTables; - using ParentType::numRows; - using ParentType::numColumns; - - // this table is not necessarily monotonic, so it cannot be evaluated! - //using ParentType::evaluate; - - const std::vector &getViscosityParameterColumn() const - { return ParentType::getColumn(0); } - - const std::vector &getDensityParameterColumn() const - { return ParentType::getColumn(1); } - }; -} - -#endif