Avoid include of Parser.hpp and Deck.hpp

examples/grdecl2vtu.cpp

@@ -32,6 +32,7 @@
 #include <opm/grid/CpGrid.hpp>
 
 #include <opm/grid/utility/OpmParserIncludes.hpp>
+#include <opm/parser/eclipse/Parser/Parser.hpp>
 
 using namespace Dune;
 

opm/grid/utility/OpmParserIncludes.hpp

@@ -20,11 +20,7 @@
 #define OPM_GRID_OPMPARSERINCLUDES_HEADER_INCLUDED
 
 #if HAVE_ECL_INPUT
-#include <opm/parser/eclipse/Parser/Parser.hpp>
-#include <opm/parser/eclipse/Deck/Deck.hpp>
-#include <opm/parser/eclipse/Deck/DeckItem.hpp>
-#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
-#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
+#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp>
 #include <opm/common/utility/ActiveGridCells.hpp>
@@ -33,15 +29,13 @@
 namespace Dune {
     namespace cpgrid {
         typedef Opm::Well OpmWellType;
-        typedef Opm::EclipseState OpmEclipseStateType;
     }
 }
 #else // #if HAVE_ECL_INPUT
 
 namespace Dune {
     namespace cpgrid {
         typedef int OpmWellType;
-        typedef int OpmEclipseStateType;
     }
 }
 

tests/test_column_extract.cpp

@@ -9,6 +9,7 @@
 #include <opm/grid/GridManager.hpp>
 
 #include <opm/grid/utility/OpmParserIncludes.hpp>
+#include <opm/parser/eclipse/Parser/Parser.hpp>
 
 #include <cstddef>
 #include <iostream>

tests/test_cpgrid.cpp

@@ -21,7 +21,7 @@ using Dune::referenceElement; //grid check assume usage of Dune::Geometry
 #include <opm/grid/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/grid/utility/OpmParserIncludes.hpp>
-
+#include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <iostream>
 
 template <class GridView>

tests/test_ug.cpp

@@ -25,6 +25,8 @@
 #include <opm/grid/cpgpreprocess/preprocess.h>
 
 #include <opm/grid/utility/OpmParserIncludes.hpp>
+#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/parser/eclipse/Parser/Parser.hpp>
 
 using namespace std;