Revert "added: PolymerConfig class"

This reverts commit a984ca5beb.

CMakeLists_files.cmake

@@ -80,7 +80,6 @@ if(ENABLE_ECL_INPUT)
     src/opm/parser/eclipse/EclipseState/InitConfig/Equil.cpp
     src/opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.cpp
     src/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp
-    src/opm/parser/eclipse/EclipseState/InitConfig/PolymerConfig.cpp
     src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp
     src/opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.cpp
     src/opm/parser/eclipse/EclipseState/Runspec.cpp
@@ -521,7 +520,6 @@ if(ENABLE_ECL_INPUT)
        opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp
        opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp
        opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp
-       opm/parser/eclipse/EclipseState/InitConfig/PolymerConfig.hpp
        opm/parser/eclipse/EclipseState/Util/Value.hpp
        opm/parser/eclipse/EclipseState/Util/IOrderSet.hpp
        opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp

opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp

@@ -24,7 +24,6 @@
 
 #include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp>
 #include <opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp>
-#include <opm/parser/eclipse/EclipseState/InitConfig/PolymerConfig.hpp>
 
 namespace Opm {
 
@@ -36,7 +35,6 @@ namespace Opm {
         InitConfig();
         explicit InitConfig(const Deck& deck);
         InitConfig(const Equil& equil, const FoamConfig& foam,
-                   const PolymerConfig& polymer,
                    bool filleps, bool gravity, bool restartReq, int restartStep,
                    const std::string& restartRootName);
 
@@ -53,8 +51,6 @@ namespace Opm {
         bool hasFoamConfig() const;
         const FoamConfig& getFoamConfig() const;
 
-        const PolymerConfig& getPolymerConfig() const;
-
         bool filleps() const
         {
             return this->m_filleps;
@@ -65,7 +61,6 @@ namespace Opm {
     private:
         Equil equil;
         FoamConfig foamconfig;
-        PolymerConfig polymerconfig;
         bool m_filleps;
         bool m_gravity = true;
 

opm/parser/eclipse/EclipseState/InitConfig/PolymerConfig.hpp

@@ -1,46 +0,0 @@
-/*
-  Copyright 2019 SINTEF Digital, Mathematics and Cybernetics.
-
-  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 <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_POLYMERCONFIG_HPP
-#define OPM_POLYMERCONFIG_HPP
-
-namespace Opm
-{
-
-class Deck;
-class DeckRecord;
-
-class PolymerConfig
-{
-public:
-    PolymerConfig() = default;
-    explicit PolymerConfig(const Deck&);
-    PolymerConfig(bool shrate);
-
-    bool shrate() const;
-
-    bool operator==(const PolymerConfig& data) const;
-
-private:
-    bool has_shrate;
-};
-
-} // end namespace Opm
-
-#endif // OPM_POLYMERCONFIG_HPP

src/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp

@@ -79,12 +79,10 @@ namespace Opm {
     }
 
     InitConfig::InitConfig(const Equil& equils, const FoamConfig& foam,
-                           const PolymerConfig& polymer,
                            bool filleps, bool gravity, bool restartReq, int restartStep,
                            const std::string& restartRootName)
         : equil(equils)
         , foamconfig(foam)
-        , polymerconfig(polymer)
         , m_filleps(filleps)
         , m_gravity(gravity)
         , m_restartRequested(restartReq)
@@ -138,14 +136,9 @@ namespace Opm {
         return this->foamconfig;
     }
 
-    const PolymerConfig& InitConfig::getPolymerConfig() const {
-        return this->polymerconfig;
-    }
-
     bool InitConfig::operator==(const InitConfig& data) const {
         return equil == data.equil &&
                foamconfig == data.foamconfig &&
-               polymerconfig == data.polymerconfig &&
                m_filleps == data.m_filleps &&
                m_gravity == data.m_gravity &&
                m_restartRequested == data.m_restartRequested &&

src/opm/parser/eclipse/EclipseState/InitConfig/PolymerConfig.cpp

@@ -1,51 +0,0 @@
-/*
-  Copyright 2020 SINTEF Digital, Mathematics and Cybernetics.
-
-  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 <http://www.gnu.org/licenses/>.
-*/
-
-#include <opm/parser/eclipse/Deck/Deck.hpp>
-#include <opm/parser/eclipse/Deck/DeckItem.hpp>
-#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
-#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
-#include <opm/parser/eclipse/EclipseState/InitConfig/PolymerConfig.hpp>
-#include <opm/parser/eclipse/Parser/ParserKeywords/S.hpp>
-
-namespace Opm
-{
-
-PolymerConfig::PolymerConfig(const Deck& deck) :
-    has_shrate(deck.hasKeyword<ParserKeywords::SHRATE>())
-{
-}
-
-PolymerConfig::PolymerConfig(bool shrate)
-    : has_shrate(shrate)
-{
-}
-
-bool
-PolymerConfig::shrate() const {
-    return has_shrate;
-}
-
-bool
-PolymerConfig::operator==(const PolymerConfig& data) const
-{
-    return has_shrate == data.has_shrate;
-}
-
-} // namespace Opm