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.
This commit is contained in:
Andreas Lauser 2013-08-28 14:19:12 +02:00
parent 1d61208d88
commit d11db08084
29 changed files with 60 additions and 15 deletions

View File

@ -23,14 +23,16 @@
#include <opm/core/grid/GridManager.hpp>
#include <opm/core/grid/cart_grid.h>
#include <opm/core/grid.h>
#include <cstdio>
#include <memory>
#include <opm/core/props/IncompPropertiesBasic.hpp>
#include <opm/core/props/IncompPropertiesFromDeck.hpp>
#include <ert/ecl/ecl_grid.h>
#include <cstdio>
#include <memory>
#include <iostream>
using namespace std;
#if 0

View File

@ -16,6 +16,8 @@
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <iostream>
// Test program for reading Eclipse Polymer keywords.
int main(int argc, char** argv)

View File

@ -15,6 +15,8 @@
#include <ert/ecl/fortio.h>
#endif
#include <iostream>
/*
Small utility to read through an ECLIPSE input deck and replace
occurences of (large) numerical fields like COORD and ZCORN with

View File

@ -37,15 +37,16 @@
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <opm/core/io/eclipse/EclipseGridInspector.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/io/eclipse/SpecialEclipseFields.hpp>
#include <stdexcept>
#include <numeric>
#include <cmath>
#include <cfloat>
#include <algorithm>
#include <opm/core/io/eclipse/EclipseGridInspector.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/io/eclipse/SpecialEclipseFields.hpp>
#include <array>
#include <iostream>
namespace Opm
{

View File

@ -36,13 +36,15 @@
#ifndef OPM_ECLIPSEGRIDPARSERHELPERS_HEADER
#define OPM_ECLIPSEGRIDPARSERHELPERS_HEADER
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/linearInterpolation.hpp>
#include <boost/date_time/gregorian/gregorian.hpp>
#include <limits>
#include <string>
#include <istream>
#include <vector>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/linearInterpolation.hpp>
#include <boost/date_time/gregorian/gregorian.hpp>
#include <iostream>
namespace Opm
{

View File

@ -37,13 +37,15 @@
#ifndef OPM_SPECIALECLIPSEFIELDS_HEADER
#define OPM_SPECIALECLIPSEFIELDS_HEADER
#include <string>
#include <fstream>
#include <limits>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/io/eclipse/EclipseGridParserHelpers.hpp>
#include <opm/core/io/eclipse/EclipseUnits.hpp>
#include <string>
#include <fstream>
#include <iostream>
#include <limits>
namespace Opm
{

View File

@ -40,6 +40,7 @@
#include <dune/istl/paamg/kamg.hh>
#include <stdexcept>
#include <iostream>
namespace Opm

View File

@ -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>

View File

@ -25,6 +25,8 @@
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/linearInterpolation.hpp>
#include <iostream>
namespace Opm
{

View File

@ -26,6 +26,8 @@
#include <opm/core/props/phaseUsageFromDeck.hpp>
#include <opm/core/grid.h>
#include <iostream>
namespace Opm
{

View File

@ -54,6 +54,7 @@
#include <numeric>
#include <fstream>
#include <iostream>
namespace Opm

View File

@ -50,6 +50,7 @@
#include <boost/filesystem.hpp>
#include <memory>
#include <iostream>
#include <numeric>
#include <fstream>

View File

@ -22,6 +22,7 @@
#include <memory>
#include <vector>
#include <iostream>
struct UnstructuredGrid;
struct Wells;

View File

@ -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

View File

@ -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
{

View File

@ -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
{

View File

@ -20,7 +20,11 @@
#include <opm/core/transport/GravityColumnSolver.hpp>
#include <opm/core/linalg/blas_lapack.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <iostream>
#include <sys/time.h>
namespace Opm
{

View File

@ -38,6 +38,8 @@
#include <opm/core/transport/implicit/ImplicitAssembly.hpp>
#include <iostream>
namespace Opm {
namespace ImplicitTransportDetails {
struct NRControl {

View File

@ -34,6 +34,8 @@
#include <opm/core/simulator/TwophaseState.hpp>
#include <opm/core/utility/miscUtilities.hpp>
#include <iostream>
namespace Opm
{

View File

@ -25,6 +25,7 @@
#include <vector>
#include <cassert>
#include <iostream>
void Opm::ReorderSolverInterface::reorderAndTransport(const UnstructuredGrid& grid, const double* darcyflux)

View File

@ -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>

View File

@ -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>

View File

@ -36,12 +36,12 @@
#ifndef OPM_ROOTFINDERS_HEADER
#define OPM_ROOTFINDERS_HEADER
#include <opm/core/utility/ErrorMacros.hpp>
#include <algorithm>
#include <limits>
#include <cmath>
#include <opm/core/utility/ErrorMacros.hpp>
#include <iostream>
namespace Opm
{

View File

@ -22,6 +22,8 @@
#include <opm/core/grid.h>
#include <opm/core/linalg/blas_lapack.h>
#include <iostream>
namespace Opm
{

View File

@ -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>

View File

@ -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>

View File

@ -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
{

View File

@ -35,6 +35,7 @@
#include <map>
#include <string>
#include <utility>
#include <iostream>
// Helper structs and functions for the implementation.

View File

@ -13,6 +13,7 @@
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <cstddef>
#include <iostream>
BOOST_AUTO_TEST_CASE(SingleColumnTest)
{