Merge pull request #1772 from andlaus/ebos_maintainance

ebos: make its core headers self sufficient

ebos/alucartesianindexmapper.hh

@@ -33,7 +33,7 @@
 
 #include <array>
 #include <memory>
-#include <except>
+#include <exception>
 #include <vector>
 #include <cassert>
 

ebos/ebos.hh

@@ -25,6 +25,9 @@
  *
  * \brief The common settings for all ebos variants.
  */
+#ifndef EBOS_HH
+#define EBOS_HH
+
 #include "eclproblem.hh"
 
 #include <opm/autodiff/BlackoilWellModel.hpp>
@@ -133,3 +136,5 @@ public:
     using ParentType::EclProblem;
 };
 }
+
+#endif // EBOS_HH

ebos/ecltracermodel.hh

@@ -30,10 +30,14 @@
 
 #include "tracervdtable.hh"
 
+#include <ewoms/models/blackoil/blackoilmodel.hh>
+
 #include <dune/istl/operators.hh>
 #include <dune/istl/solvers.hh>
 #include <dune/istl/preconditioners.hh>
 
+#include <dune/common/version.hh>
+
 #include <string>
 #include <vector>
 #include <iostream>

ebos/eclwriter.hh

@@ -31,6 +31,7 @@
 #include "collecttoiorank.hh"
 #include "ecloutputblackoilmodule.hh"
 
+#include <ewoms/models/blackoil/blackoilmodel.hh>
 #include <ewoms/disc/ecfv/ecfvdiscretization.hh>
 #include <ewoms/io/baseoutputwriter.hh>
 #include <ewoms/parallel/tasklets.hh>