Merge pull request #946 from jokva/clean-up-header

Improve includes from opm-parser

examples/mirror_grid.cpp

@@ -23,7 +23,11 @@
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseMode.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 <algorithm>
 #include <iostream>
 #include <fstream>
 

examples/sim_2p_incomp.cpp

@@ -45,6 +45,7 @@
 #include <opm/core/simulator/WellState.hpp>
 #include <opm/core/simulator/SimulatorIncompTwophase.hpp>
 
+#include <opm/parser/eclipse/Parser/ParseMode.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 

opm/core/grid/GridManager.cpp

@@ -25,6 +25,8 @@
 #include <opm/core/grid/cornerpoint_grid.h>
 #include <opm/core/grid/MinpvProcessor.hpp>
 #include <opm/common/ErrorMacros.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/EclipseState.hpp>
 

opm/core/io/eclipse/EclipseGridInspector.cpp

@@ -41,6 +41,9 @@
 #include <opm/common/ErrorMacros.hpp>
 #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 <stdexcept>
 #include <numeric>
 #include <cmath>

opm/core/io/eclipse/EclipseReader.cpp

@@ -28,6 +28,7 @@
 #include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
+#include <opm/parser/eclipse/Units/Dimension.hpp>
 #include <opm/parser/eclipse/Units/UnitSystem.hpp>
 
 #include <algorithm>

opm/core/io/eclipse/EclipseWriter.cpp

@@ -40,6 +40,7 @@
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Utility/SpecgridWrapper.hpp>
 #include <opm/parser/eclipse/Utility/WelspecsWrapper.hpp>
+#include <opm/parser/eclipse/Units/Dimension.hpp>
 #include <opm/parser/eclipse/Units/UnitSystem.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>

opm/core/props/IncompPropertiesSinglePhase.cpp

@@ -25,6 +25,8 @@
 #include <opm/core/utility/Units.hpp>
 #include <opm/common/ErrorMacros.hpp>
 
+#include <opm/parser/eclipse/Deck/DeckItem.hpp>
+#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 
 namespace Opm

opm/core/props/pvt/PvtConstCompr.hpp

@@ -22,6 +22,8 @@
 
 #include <opm/core/props/pvt/PvtInterface.hpp>
 #include <opm/common/ErrorMacros.hpp>
+#include <opm/parser/eclipse/Deck/DeckItem.hpp>
+#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 
 #include <vector>

opm/core/props/pvt/PvtInterface.hpp

@@ -20,6 +20,8 @@
 #ifndef OPM_PVTINTERFACE_HEADER_INCLUDED
 #define OPM_PVTINTERFACE_HEADER_INCLUDED
 
+#include <vector>
+
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 

opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp

@@ -24,6 +24,8 @@
 #include <opm/core/utility/Units.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/parser/eclipse/Deck/DeckItem.hpp>
+#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 
 

tests/test_EclipseWriter.cpp

@@ -34,8 +34,10 @@
 #include <opm/core/simulator/SimulatorTimer.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 
+#include <opm/parser/eclipse/Parser/ParseMode.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
+#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>

tests/test_parser.cpp

@@ -31,6 +31,8 @@
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseMode.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
+#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
+#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 #include <opm/parser/eclipse/Deck/DeckDoubleItem.hpp>
 
 #include <string>

tests/test_pinchprocessor.cpp

@@ -41,6 +41,7 @@
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>
+#include <opm/parser/eclipse/EclipseState/Grid/TransMult.hpp>
 #include <opm/core/pressure/tpfa/TransTpfa.hpp>
 #include <opm/core/grid/PinchProcessor.hpp>
 #include <opm/core/props/rock/RockFromDeck.hpp>

tests/test_timer.cpp

@@ -29,6 +29,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
+#include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseMode.hpp>
 #include <opm/core/simulator/SimulatorTimer.hpp>

tests/test_ug.cpp

@@ -26,7 +26,9 @@
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseMode.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>
 
 using namespace std;
 

tests/test_wellcollection.cpp

@@ -41,9 +41,9 @@ using namespace Opm;
 
 BOOST_AUTO_TEST_CASE(AddWellsAndGroupToCollection) {
     ParserPtr parser(new Parser());
-    boost::filesystem::path scheduleFile("wells_group.data");
+    std::string scheduleFile("wells_group.data");
     ParseMode parseMode;
-    DeckConstPtr deck =  parser->parseFile(scheduleFile.string() , parseMode);
+    DeckConstPtr deck =  parser->parseFile(scheduleFile, parseMode);
     EclipseStateConstPtr eclipseState(new EclipseState(deck, parseMode));
     PhaseUsage pu = phaseUsageFromDeck(eclipseState);
 

tests/test_wellsgroup.cpp

@@ -49,9 +49,9 @@ using namespace Opm;
 
 BOOST_AUTO_TEST_CASE(ConstructGroupFromWell) {
     ParserPtr parser(new Parser());
-    boost::filesystem::path scheduleFile("wells_group.data");
+    std::string scheduleFile("wells_group.data");
     ParseMode parseMode;
-    DeckConstPtr deck =  parser->parseFile(scheduleFile.string() , parseMode);
+    DeckConstPtr deck =  parser->parseFile(scheduleFile, parseMode);
     EclipseStateConstPtr eclipseState(new EclipseState(deck , parseMode));
     PhaseUsage pu = phaseUsageFromDeck(eclipseState);
 
@@ -83,8 +83,8 @@ BOOST_AUTO_TEST_CASE(ConstructGroupFromWell) {
 BOOST_AUTO_TEST_CASE(ConstructGroupFromGroup) {
     ParserPtr parser(new Parser());
     ParseMode parseMode;
-    boost::filesystem::path scheduleFile("wells_group.data");
-    DeckConstPtr deck =  parser->parseFile(scheduleFile.string() , parseMode);
+    std::string scheduleFile("wells_group.data");
+    DeckConstPtr deck =  parser->parseFile(scheduleFile, parseMode);
     EclipseStateConstPtr eclipseState(new EclipseState(deck , parseMode));
     PhaseUsage pu = phaseUsageFromDeck(eclipseState);