From 73420104b5652d174784b38cee9e97bef10853f6 Mon Sep 17 00:00:00 2001
From: Steinar Foss <steinar@unicus.no>
Date: Mon, 20 Nov 2017 09:39:25 +0100
Subject: [PATCH] variable named map renamed to int_data

---
 opm/output/eclipse/EclipseIO.hpp     |  2 +-
 src/opm/output/eclipse/EclipseIO.cpp |  8 ++++----
 tests/test_EclipseIO.cpp             | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/opm/output/eclipse/EclipseIO.hpp b/opm/output/eclipse/EclipseIO.hpp
index 5b47a71a6..b76e0358e 100644
--- a/opm/output/eclipse/EclipseIO.hpp
+++ b/opm/output/eclipse/EclipseIO.hpp
@@ -107,7 +107,7 @@ public:
   *     are not yet written to disk.
   */
 
-    void writeInitial( data::Solution simProps = data::Solution(), std::map<std::string, std::vector<int> > map = {}, const NNC& nnc = NNC());
+    void writeInitial( data::Solution simProps = data::Solution(), std::map<std::string, std::vector<int> > int_data = {}, const NNC& nnc = NNC());
 
     /**
      * \brief Overwrite the initial OIP values.
diff --git a/src/opm/output/eclipse/EclipseIO.cpp b/src/opm/output/eclipse/EclipseIO.cpp
index ce38a6ddd..fc250b677 100644
--- a/src/opm/output/eclipse/EclipseIO.cpp
+++ b/src/opm/output/eclipse/EclipseIO.cpp
@@ -192,7 +192,7 @@ inline std::string uppercase( std::string x ) {
 class EclipseIO::Impl {
     public:
     Impl( const EclipseState&, EclipseGrid, const Schedule&, const SummaryConfig& );
-        void writeINITFile( const data::Solution& simProps, std::map<std::string, std::vector<int> > map, const NNC& nnc) const;
+        void writeINITFile( const data::Solution& simProps, std::map<std::string, std::vector<int> > int_data, const NNC& nnc) const;
         void writeEGRIDFile( const NNC& nnc ) const;
 
         const EclipseState& es;
@@ -221,7 +221,7 @@ EclipseIO::Impl::Impl( const EclipseState& eclipseState,
 
 
 
-void EclipseIO::Impl::writeINITFile( const data::Solution& simProps, std::map<std::string, std::vector<int> > map, const NNC& nnc) const {
+void EclipseIO::Impl::writeINITFile( const data::Solution& simProps, std::map<std::string, std::vector<int> > int_data, const NNC& nnc) const {
     const auto& units = this->es.getUnits();
     const IOConfig& ioConfig = this->es.cfg().io();
 
@@ -339,9 +339,9 @@ void EclipseIO::Impl::writeINITFile( const data::Solution& simProps, std::map<st
 
     //Write Integer Vector Map
     {
-        std::map<std::string, std::vector<int> >::iterator it = map.begin();
+        std::map<std::string, std::vector<int> >::iterator it = int_data.begin();
 
-        while(it != map.end())  {
+        while(it != int_data.end())  {
             std::string key = it->first;
             if (key.size() > ECL_STRING8_LENGTH)
               throw std::invalid_argument("Keyword is too long.");
diff --git a/tests/test_EclipseIO.cpp b/tests/test_EclipseIO.cpp
index 4a973e149..432e84878 100644
--- a/tests/test_EclipseIO.cpp
+++ b/tests/test_EclipseIO.cpp
@@ -317,19 +317,19 @@ BOOST_AUTO_TEST_CASE(EclipseIOIntegration) {
             { "TRANZ", { measure::transmissibility, tranz, TargetType::INIT } },
         };
 
-        std::map<std::string, std::vector<int> > map;
+        std::map<std::string, std::vector<int> > int_data;
         std::vector<int> u(27); u[2] = 67; u[5] = 89;
-        map["STR_ULONGNAME"] = u;
+        int_data["STR_ULONGNAME"] = u;
 
         std::vector<int> v(27); v[2] = 67; v[26] = 89;
-        map["STR_V"] = v;
+        int_data["STR_V"] = v;
 
         eclWriter.writeInitial( );
 
-        test_assert_throw( eclWriter.writeInitial( eGridProps , map) , std::invalid_argument);
+        test_assert_throw( eclWriter.writeInitial( eGridProps , int_data) , std::invalid_argument);
 
-        map.erase("STR_ULONGNAME");
-        eclWriter.writeInitial( eGridProps , map );
+        int_data.erase("STR_ULONGNAME");
+        eclWriter.writeInitial( eGridProps , int_data );
 
         data::Wells wells;