make all headers fully autonomous again

This commit is contained in:
Andreas Lauser
2018-03-12 14:31:36 +01:00
parent f071c4c647
commit 5f8fdb2324
4 changed files with 11 additions and 8 deletions

View File

@@ -225,7 +225,7 @@ namespace Ewoms
coords[ 0 ] = gc ; coords[ 0 ] = gc ;
} }
else else
throw std::invalid_argument("cartesianCoordinate not implemented for dimension " << dimension ); throw std::invalid_argument("cartesianCoordinate not implemented for dimension " + std::to_string(dimension) );
} }
template <class GridView> template <class GridView>

View File

@@ -39,6 +39,7 @@
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp> #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
#include <opm/material/common/Exceptions.hpp> #include <opm/material/common/Exceptions.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/common/mcmgmapper.hh> #include <dune/grid/common/mcmgmapper.hh>

View File

@@ -29,6 +29,8 @@
#include "eclwriter.hh" #include "eclwriter.hh"
#include <ewoms/models/blackoil/blackoilproperties.hh>
#include <ewoms/common/propertysystem.hh> #include <ewoms/common/propertysystem.hh>
#include <ewoms/common/parametersystem.hh> #include <ewoms/common/parametersystem.hh>
@@ -44,6 +46,7 @@
#include <opm/output/eclipse/EclipseIO.hpp> #include <opm/output/eclipse/EclipseIO.hpp>
#endif #endif
#include <opm/common/OpmLog/OpmLog.hpp>
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
@@ -649,7 +652,7 @@ public:
} }
void addRftDataToWells(Opm::data::Wells& wellDatas, size_t reportStepNum) void addRftDataToWells(Opm::data::Wells& wellDatas, size_t reportStepNum)
{ {
for ( const auto& well : simulator_.vanguard().schedule().getWells( reportStepNum )) { for ( const auto& well : simulator_.vanguard().schedule().getWells( reportStepNum )) {
// don't bother with wells not on this process // don't bother with wells not on this process

View File

@@ -39,18 +39,14 @@
#include <opm/output/eclipse/EclipseIO.hpp> #include <opm/output/eclipse/EclipseIO.hpp>
#endif #endif
#include <opm/grid/GridHelpers.hpp>
#include <opm/material/common/Valgrind.hpp> #include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Exceptions.hpp> #include <opm/material/common/Exceptions.hpp>
#include <boost/algorithm/string.hpp>
#include <list> #include <list>
#include <utility> #include <utility>
#include <string> #include <string>
#include <limits>
#include <sstream>
#include <fstream>
#include <type_traits>
namespace Ewoms { namespace Ewoms {
namespace Properties { namespace Properties {
@@ -61,6 +57,9 @@ NEW_PROP_TAG(EclOutputDoublePrecision);
template <class TypeTag> template <class TypeTag>
class EclWriter; class EclWriter;
template <class TypeTag>
class EclOutputBlackOilModule;
/*! /*!
* \ingroup EclBlackOilSimulator * \ingroup EclBlackOilSimulator
* *