Clean up

Author: jonjenssen

ApplicationLibCode/FileInterface/RifOpmFlowDeckFile.cpp

@@ -27,6 +27,8 @@
 #include "opm/input/eclipse/Parser/InputErrorAction.hpp"
 #include "opm/input/eclipse/Parser/ParseContext.hpp"
 #include "opm/input/eclipse/Parser/Parser.hpp"
+#include "opm/input/eclipse/Parser/ParserKeywords/A.hpp"
+#include "opm/input/eclipse/Parser/ParserKeywords/B.hpp"
 #include "opm/input/eclipse/Parser/ParserKeywords/C.hpp"
 #include "opm/input/eclipse/Parser/ParserKeywords/D.hpp"
 #include "opm/input/eclipse/Parser/ParserKeywords/E.hpp"
@@ -220,6 +222,11 @@ static std::optional<Opm::FileDeck::Index> findSectionInsertionPoint( std::uniqu
     return insertIdx;
 }
 
+static std::map<std::string, std::string> blockKeywordNames =
+    { { Opm::ParserKeywords::ACTIONX::keywordName, Opm::ParserKeywords::ENDACTIO::keywordName },
+      { Opm::ParserKeywords::BOX::keywordName, Opm::ParserKeywords::ENDBOX::keywordName },
+      { Opm::ParserKeywords::ACTIONW::keywordName, Opm::ParserKeywords::ENDACTIO::keywordName } };
+
 } // namespace internal
 
 //--------------------------------------------------------------------------------------------------
@@ -936,9 +943,6 @@ bool RifOpmFlowDeckFile::replaceKeywordAtIndex( const Opm::FileDeck::Index& inde
 //--------------------------------------------------------------------------------------------------
 int RifOpmFlowDeckFile::removeKeywords( const std::string& keywordName )
 {
-    // special handling of keywords with a potential inner block
-    const std::map<std::string, std::string> blockKeywords = { { "ACTIONX", "ENDACTIO" }, { "BOX", "ENDBOX" }, { "ACTIONW", "ENDACTIO" } };
-
     int nRemoved = 0;
     if ( m_fileDeck.get() == nullptr ) return nRemoved;
 
@@ -950,21 +954,21 @@ int RifOpmFlowDeckFile::removeKeywords( const std::string& keywordName )
         if ( kw.name() == keywordName )
         {
             skipIndices.push_back( it );
-        }
-        if ( blockKeywords.contains( kw.name() ) )
-        {
             // If this is a block keyword, we need to skip all keywords until the corresponding end block
-            const std::string endBlockName = blockKeywords.at( kw.name() );
-            while ( it != m_fileDeck->stop() )
+            if ( internal::blockKeywordNames.contains( keywordName ) )
             {
-                const auto& innerKw = m_fileDeck->operator[]( it );
-                if ( innerKw.name() == endBlockName )
+                const std::string endBlockName = internal::blockKeywordNames.at( keywordName );
+                while ( it != m_fileDeck->stop() )
                 {
+                    const auto& innerKw = m_fileDeck->operator[]( it );
+                    if ( innerKw.name() == endBlockName )
+                    {
+                        skipIndices.push_back( it );
+                        break;
+                    }
                     skipIndices.push_back( it );
-                    break;
+                    it++;
                 }
-                skipIndices.push_back( it );
-                it++;
             }
         }
     }