From 408d3389c35817089a3cf5f37baec57926c4fcf1 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Wed, 28 Aug 2013 14:19:12 +0200
Subject: [PATCH] include iostream in the files which use std::cerr or
 std::cout

for some of these files this is needed to make to keep it compiling
after the next patch because the new ErrorMacros.hpp file will no
longer implicitly includes <iostream>. for the remaining files it is
just good style.

While at it, the includes for most of these files have been ordered in
order of decreasing abstraction level.
---
 opm/core/linalg/LinearSolverIstl.cpp                        | 1 +
 opm/core/pressure/IncompTpfa.cpp                            | 1 +
 opm/core/props/rock/RockCompressibility.cpp                 | 2 ++
 opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp     | 2 ++
 opm/core/simulator/initState_impl.hpp                       | 2 ++
 opm/core/tof/TofDiscGalReorder.cpp                          | 2 ++
 opm/core/tof/TofReorder.cpp                                 | 2 ++
 opm/core/transport/reorder/ReorderSolverInterface.cpp       | 1 +
 .../reorder/TransportSolverCompressibleTwophaseReorder.cpp  | 1 +
 .../transport/reorder/TransportSolverTwophaseReorder.cpp    | 1 +
 opm/core/utility/miscUtilities.cpp                          | 1 +
 opm/core/utility/miscUtilitiesBlackoil.cpp                  | 1 +
 opm/core/wells/WellsGroup.cpp                               | 6 ++++--
 opm/core/wells/WellsManager.cpp                             | 1 +
 14 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/opm/core/linalg/LinearSolverIstl.cpp b/opm/core/linalg/LinearSolverIstl.cpp
index 2ff17ad96..167de42da 100644
--- a/opm/core/linalg/LinearSolverIstl.cpp
+++ b/opm/core/linalg/LinearSolverIstl.cpp
@@ -40,6 +40,7 @@
 #include <dune/istl/paamg/kamg.hh>
 
 #include <stdexcept>
+#include <iostream>
 
 
 namespace Opm
diff --git a/opm/core/pressure/IncompTpfa.cpp b/opm/core/pressure/IncompTpfa.cpp
index d9e3aacf0..4d85f1088 100644
--- a/opm/core/pressure/IncompTpfa.cpp
+++ b/opm/core/pressure/IncompTpfa.cpp
@@ -33,6 +33,7 @@
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/wells.h>
+#include <iostream>
 #include <iomanip>
 #include <cmath>
 #include <algorithm>
diff --git a/opm/core/props/rock/RockCompressibility.cpp b/opm/core/props/rock/RockCompressibility.cpp
index fd072798c..c329d102e 100644
--- a/opm/core/props/rock/RockCompressibility.cpp
+++ b/opm/core/props/rock/RockCompressibility.cpp
@@ -25,6 +25,8 @@
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/linearInterpolation.hpp>
 
+#include <iostream>
+
 namespace Opm
 {
 
diff --git a/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp b/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
index a5072118b..887b5c3e9 100644
--- a/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
+++ b/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
@@ -26,6 +26,8 @@
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/core/grid.h>
 
+#include <iostream>
+
 namespace Opm
 {
 
diff --git a/opm/core/simulator/initState_impl.hpp b/opm/core/simulator/initState_impl.hpp
index 3e48845ea..b3ce35250 100644
--- a/opm/core/simulator/initState_impl.hpp
+++ b/opm/core/simulator/initState_impl.hpp
@@ -30,6 +30,8 @@
 #include <opm/core/props/IncompPropertiesInterface.hpp>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
+
+#include <iostream>
 #include <cmath>
 
 namespace Opm
diff --git a/opm/core/tof/TofDiscGalReorder.cpp b/opm/core/tof/TofDiscGalReorder.cpp
index a5578f7e2..3e46bc780 100644
--- a/opm/core/tof/TofDiscGalReorder.cpp
+++ b/opm/core/tof/TofDiscGalReorder.cpp
@@ -28,9 +28,11 @@
 #include <opm/core/utility/VelocityInterpolation.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/linalg/blas_lapack.h>
+
 #include <algorithm>
 #include <cmath>
 #include <numeric>
+#include <iostream>
 
 namespace Opm
 {
diff --git a/opm/core/tof/TofReorder.cpp b/opm/core/tof/TofReorder.cpp
index 8907d3080..984505eab 100644
--- a/opm/core/tof/TofReorder.cpp
+++ b/opm/core/tof/TofReorder.cpp
@@ -22,9 +22,11 @@
 #include <opm/core/grid.h>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/SparseTable.hpp>
+
 #include <algorithm>
 #include <numeric>
 #include <cmath>
+#include <iostream>
 
 namespace Opm
 {
diff --git a/opm/core/transport/reorder/ReorderSolverInterface.cpp b/opm/core/transport/reorder/ReorderSolverInterface.cpp
index a8b196391..d738339df 100644
--- a/opm/core/transport/reorder/ReorderSolverInterface.cpp
+++ b/opm/core/transport/reorder/ReorderSolverInterface.cpp
@@ -25,6 +25,7 @@
 
 #include <vector>
 #include <cassert>
+#include <iostream>
 
 
 void Opm::ReorderSolverInterface::reorderAndTransport(const UnstructuredGrid& grid, const double* darcyflux)
diff --git a/opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp b/opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
index e7ea1a699..6b9bbf597 100644
--- a/opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
+++ b/opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
@@ -28,6 +28,7 @@
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>
 #include <opm/core/pressure/tpfa/trans_tpfa.h>
 
+#include <iostream>
 #include <fstream>
 #include <iterator>
 #include <numeric>
diff --git a/opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp b/opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
index 0409c0062..83827fe0e 100644
--- a/opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
+++ b/opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
@@ -27,6 +27,7 @@
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/pressure/tpfa/trans_tpfa.h>
 
+#include <iostream>
 #include <fstream>
 #include <iterator>
 #include <numeric>
diff --git a/opm/core/utility/miscUtilities.cpp b/opm/core/utility/miscUtilities.cpp
index 468dad6ad..3294f364c 100644
--- a/opm/core/utility/miscUtilities.cpp
+++ b/opm/core/utility/miscUtilities.cpp
@@ -26,6 +26,7 @@
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
+#include <iostream>
 #include <algorithm>
 #include <functional>
 #include <cmath>
diff --git a/opm/core/utility/miscUtilitiesBlackoil.cpp b/opm/core/utility/miscUtilitiesBlackoil.cpp
index 4584e45fe..5344d3579 100644
--- a/opm/core/utility/miscUtilitiesBlackoil.cpp
+++ b/opm/core/utility/miscUtilitiesBlackoil.cpp
@@ -27,6 +27,7 @@
 #include <opm/core/simulator/BlackoilState.hpp>
 #include <opm/core/simulator/WellState.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
+#include <iostream>
 #include <algorithm>
 #include <functional>
 #include <cmath>
diff --git a/opm/core/wells/WellsGroup.cpp b/opm/core/wells/WellsGroup.cpp
index 347aefecd..5cbaadb34 100644
--- a/opm/core/wells/WellsGroup.cpp
+++ b/opm/core/wells/WellsGroup.cpp
@@ -19,11 +19,13 @@
 
 #include "config.h"
 #include <opm/core/wells/WellsGroup.hpp>
-#include <cmath>
-#include <memory>
 #include <opm/core/wells.h>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 
+#include <cmath>
+#include <memory>
+#include <iostream>
+
 namespace Opm
 {
 
diff --git a/opm/core/wells/WellsManager.cpp b/opm/core/wells/WellsManager.cpp
index fe2d7c706..25eea51e2 100644
--- a/opm/core/wells/WellsManager.cpp
+++ b/opm/core/wells/WellsManager.cpp
@@ -35,6 +35,7 @@
 #include <map>
 #include <string>
 #include <utility>
+#include <iostream>
 
 
 // Helper structs and functions for the implementation.