From 8a5062ae279dd361e49e95e92a287c533d0b77eb Mon Sep 17 00:00:00 2001
From: Tor Harald Sandve <tor.harald.sandve@iris.no>
Date: Tue, 23 Jan 2018 15:40:55 +0100
Subject: [PATCH] Pass pointers of region and block data to eclIO

---
 opm/output/eclipse/EclipseIO.hpp     | 8 ++++----
 src/opm/output/eclipse/EclipseIO.cpp | 8 ++++----
 tests/test_EclipseIO.cpp             | 1 +
 tests/test_RFT.cpp                   | 2 ++
 tests/test_writenumwells.cpp         | 5 +++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/opm/output/eclipse/EclipseIO.hpp b/opm/output/eclipse/EclipseIO.hpp
index 6f975ffdb..119996655 100644
--- a/opm/output/eclipse/EclipseIO.hpp
+++ b/opm/output/eclipse/EclipseIO.hpp
@@ -175,10 +175,10 @@ public:
                         double seconds_elapsed,
                         data::Solution,
                         data::Wells,
-                        std::map<std::string, double> single_summary_values,
-                        std::map<std::string, std::vector<double>> region_summary_values,
-                        std::map<std::pair<std::string, int>, double> block_summary_values = {},
-                        std::map<std::string, std::vector<double>> extra_restart = {},
+                        const std::map<std::string, double>& single_summary_values,
+                        const std::map<std::string, std::vector<double>>& region_summary_values,
+                        const std::map<std::pair<std::string, int>, double>& block_summary_values,
+                        const std::map<std::string, std::vector<double>>& extra_restart = {},
                         bool write_double = false);
 
 
diff --git a/src/opm/output/eclipse/EclipseIO.cpp b/src/opm/output/eclipse/EclipseIO.cpp
index 2b6e366c1..a2c2c85de 100644
--- a/src/opm/output/eclipse/EclipseIO.cpp
+++ b/src/opm/output/eclipse/EclipseIO.cpp
@@ -409,10 +409,10 @@ void EclipseIO::writeTimeStep(int report_step,
                               double secs_elapsed,
                               data::Solution cells,
                               data::Wells wells,
-                              std::map<std::string, double> single_summary_values,
-                              std::map<std::string, std::vector<double>> region_summary_values,
-                              std::map<std::pair<std::string, int>, double> block_summary_values,
-                              std::map<std::string, std::vector<double>> extra_restart,
+                              const std::map<std::__cxx11::string, double>& single_summary_values,
+                              const std::map<std::__cxx11::string, std::vector<double> >& region_summary_values,
+                              const std::map<std::pair<std::__cxx11::string, int>, double>& block_summary_values,
+                              const std::map<std::__cxx11::string, std::vector<double>>&extra_restart,
                               bool write_double)
  {
 
diff --git a/tests/test_EclipseIO.cpp b/tests/test_EclipseIO.cpp
index e80cb6216..fc2d2aee9 100644
--- a/tests/test_EclipseIO.cpp
+++ b/tests/test_EclipseIO.cpp
@@ -342,6 +342,7 @@ BOOST_AUTO_TEST_CASE(EclipseIOIntegration) {
 				     first_step - start_time,
 				     sol,
 				     wells,
+                     {},
                      {},
 				     {});
 				     
diff --git a/tests/test_RFT.cpp b/tests/test_RFT.cpp
index 970f4de6b..fe4a0a625 100755
--- a/tests/test_RFT.cpp
+++ b/tests/test_RFT.cpp
@@ -145,6 +145,7 @@ BOOST_AUTO_TEST_CASE(test_RFT) {
                                      step_time - start_time,
                                      createBlackoilState( 2, numCells ),
                                      wells,
+        {},
         {},
 				     {});
     }
@@ -223,6 +224,7 @@ BOOST_AUTO_TEST_CASE(test_RFT2) {
                                              createBlackoilState( 2, numCells ),
                                              wells,
                                              {},
+                                             {},
                                              {});
             }
             verifyRFTFile2("TESTRFT.RFT");
diff --git a/tests/test_writenumwells.cpp b/tests/test_writenumwells.cpp
index 607481d7a..af72af022 100644
--- a/tests/test_writenumwells.cpp
+++ b/tests/test_writenumwells.cpp
@@ -161,8 +161,9 @@ BOOST_AUTO_TEST_CASE(EclipseWriteRestartWellInfo) {
                                      timestep,
                                      solution,
                                      wells ,
-                                      {},
-				     {} );
+                                     {},
+                                     {},
+                                     {} );
     }
 
     verifyWellState(eclipse_restart_filename, grid, schedule);