From 5e7191c79e92fa1a279fda37fe7121b2b3cdb287 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Tue, 26 Jul 2022 15:00:59 +0200
Subject: [PATCH] changed: remove include of Deck.hpp in header

and deal with the consequences
---
 examples/msim.cpp                                            | 2 ++
 msim/include/opm/msim/msim.hpp                               | 5 -----
 opm/input/eclipse/Deck/DeckSection.hpp                       | 4 +++-
 opm/input/eclipse/Schedule/ScheduleDeck.hpp                  | 1 -
 src/opm/input/eclipse/EclipseState/EclipseConfig.cpp         | 2 --
 src/opm/input/eclipse/EclipseState/Grid/FaultCollection.cpp  | 3 ---
 .../input/eclipse/EclipseState/Grid/FieldPropsManager.cpp    | 3 +--
 src/opm/input/eclipse/EclipseState/Grid/TransMult.cpp        | 1 +
 src/opm/input/eclipse/EclipseState/IOConfig/IOConfig.cpp     | 1 +
 .../EclipseState/SimulationConfig/SimulationConfig.cpp       | 2 --
 .../EclipseState/SimulationConfig/ThresholdPressure.cpp      | 1 -
 src/opm/input/eclipse/EclipseState/checkDeck.cpp             | 1 +
 src/opm/input/eclipse/Parser/ParserRecord.cpp                | 4 ++--
 src/opm/input/eclipse/Schedule/Schedule.cpp                  | 1 +
 src/opm/input/eclipse/Schedule/ScheduleDeck.cpp              | 1 +
 tests/msim/test_msim.cpp                                     | 1 +
 tests/msim/test_msim_ACTIONX.cpp                             | 1 +
 tests/msim/test_msim_EXIT.cpp                                | 2 ++
 tests/parser/SectionTests.cpp                                | 1 +
 tests/parser/SimulationConfigTest.cpp                        | 1 +
 20 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/examples/msim.cpp b/examples/msim.cpp
index 733c4a510..af8752732 100644
--- a/examples/msim.cpp
+++ b/examples/msim.cpp
@@ -19,6 +19,8 @@
 
 #include <opm/output/eclipse/EclipseIO.hpp>
 
+#include <opm/input/eclipse/Deck/Deck.hpp>
+
 #include <opm/input/eclipse/Parser/Parser.hpp>
 #include <opm/input/eclipse/Parser/ParseContext.hpp>
 #include <opm/input/eclipse/Parser/ErrorGuard.hpp>
diff --git a/msim/include/opm/msim/msim.hpp b/msim/include/opm/msim/msim.hpp
index f19f8cf08..51886c273 100644
--- a/msim/include/opm/msim/msim.hpp
+++ b/msim/include/opm/msim/msim.hpp
@@ -6,12 +6,8 @@
 #include <map>
 #include <string>
 
-#include <opm/input/eclipse/Parser/ErrorGuard.hpp>
-#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/Schedule/SummaryState.hpp>
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
 #include <opm/input/eclipse/Schedule/Schedule.hpp>
 #include <opm/input/eclipse/Schedule/Action/State.hpp>
 
@@ -27,7 +23,6 @@ class EclipseIO;
 class ParseContext;
 class Parser;
 class Python;
-class SummaryState;
 class UDQState;
 class WellTestState;
 
diff --git a/opm/input/eclipse/Deck/DeckSection.hpp b/opm/input/eclipse/Deck/DeckSection.hpp
index a66a1361d..84b574db2 100644
--- a/opm/input/eclipse/Deck/DeckSection.hpp
+++ b/opm/input/eclipse/Deck/DeckSection.hpp
@@ -22,10 +22,12 @@
 
 #include <string>
 
-#include <opm/input/eclipse/Deck/Deck.hpp>
+#include <opm/input/eclipse/Deck/DeckView.hpp>
 
 namespace Opm {
 
+class Deck;
+
 enum class Section {
     RUNSPEC,
     GRID,
diff --git a/opm/input/eclipse/Schedule/ScheduleDeck.hpp b/opm/input/eclipse/Schedule/ScheduleDeck.hpp
index f0322bc36..dd21e4178 100644
--- a/opm/input/eclipse/Schedule/ScheduleDeck.hpp
+++ b/opm/input/eclipse/Schedule/ScheduleDeck.hpp
@@ -27,7 +27,6 @@
 
 #include <opm/common/OpmLog/KeywordLocation.hpp>
 #include <opm/input/eclipse/Deck/DeckKeyword.hpp>
-#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/common/utility/TimeService.hpp>
 
 #include <opm/io/eclipse/rst/state.hpp>
diff --git a/src/opm/input/eclipse/EclipseState/EclipseConfig.cpp b/src/opm/input/eclipse/EclipseState/EclipseConfig.cpp
index ca6d5356e..9e3a0a079 100644
--- a/src/opm/input/eclipse/EclipseState/EclipseConfig.cpp
+++ b/src/opm/input/eclipse/EclipseState/EclipseConfig.cpp
@@ -19,8 +19,6 @@
 
 #include <memory>
 
-#include <opm/input/eclipse/Deck/Deck.hpp>
-#include <opm/input/eclipse/Deck/DeckSection.hpp>
 #include <opm/input/eclipse/EclipseState/EclipseConfig.hpp>
 #include <opm/input/eclipse/EclipseState/InitConfig/InitConfig.hpp>
 #include <opm/input/eclipse/EclipseState/IOConfig/IOConfig.hpp>
diff --git a/src/opm/input/eclipse/EclipseState/Grid/FaultCollection.cpp b/src/opm/input/eclipse/EclipseState/Grid/FaultCollection.cpp
index b8b210450..4dc37fb76 100644
--- a/src/opm/input/eclipse/EclipseState/Grid/FaultCollection.cpp
+++ b/src/opm/input/eclipse/EclipseState/Grid/FaultCollection.cpp
@@ -25,9 +25,6 @@
 
 #include <opm/common/utility/OpmInputError.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
-#include <opm/input/eclipse/Deck/Deck.hpp>
-#include <opm/input/eclipse/Deck/DeckItem.hpp>
-#include <opm/input/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/input/eclipse/Deck/DeckRecord.hpp>
 #include <opm/input/eclipse/Deck/DeckSection.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/GridDims.hpp>
diff --git a/src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp b/src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp
index 8ad22783c..8a58c0091 100644
--- a/src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp
+++ b/src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp
@@ -16,12 +16,11 @@
   OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
 
-#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/FieldProps.hpp>
-#include <opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
 #include <opm/input/eclipse/EclipseState/Runspec.hpp>
 #include <opm/common/utility/Serializer.hpp>
 #include <opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.hpp>
diff --git a/src/opm/input/eclipse/EclipseState/Grid/TransMult.cpp b/src/opm/input/eclipse/EclipseState/Grid/TransMult.cpp
index 356db72c4..0570f6f9a 100644
--- a/src/opm/input/eclipse/EclipseState/Grid/TransMult.cpp
+++ b/src/opm/input/eclipse/EclipseState/Grid/TransMult.cpp
@@ -25,6 +25,7 @@
 #include <opm/common/utility/OpmInputError.hpp>
 
 #include <opm/common/OpmLog/OpmLog.hpp>
+#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/input/eclipse/Deck/DeckSection.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
diff --git a/src/opm/input/eclipse/EclipseState/IOConfig/IOConfig.cpp b/src/opm/input/eclipse/EclipseState/IOConfig/IOConfig.cpp
index 1f4ca8a4e..a33a862d6 100644
--- a/src/opm/input/eclipse/EclipseState/IOConfig/IOConfig.cpp
+++ b/src/opm/input/eclipse/EclipseState/IOConfig/IOConfig.cpp
@@ -24,6 +24,7 @@
 #include <sstream>
 
 #include <opm/common/OpmLog/OpmLog.hpp>
+#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/Deck/DeckItem.hpp>
 #include <opm/input/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/input/eclipse/Deck/DeckRecord.hpp>
diff --git a/src/opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp b/src/opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp
index 0995b9270..f758e1ab3 100644
--- a/src/opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp
+++ b/src/opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp
@@ -18,8 +18,6 @@
  */
 
 
-#include <opm/input/eclipse/Deck/Deck.hpp>
-#include <opm/input/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/input/eclipse/Deck/DeckSection.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
 #include <opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
diff --git a/src/opm/input/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp b/src/opm/input/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp
index 358e5bece..f5fc67900 100644
--- a/src/opm/input/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp
+++ b/src/opm/input/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp
@@ -18,7 +18,6 @@
  */
 
 #include <opm/common/OpmLog/OpmLog.hpp>
-#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/Deck/DeckSection.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
 #include <opm/input/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
diff --git a/src/opm/input/eclipse/EclipseState/checkDeck.cpp b/src/opm/input/eclipse/EclipseState/checkDeck.cpp
index ca3ea491e..a3999cc7b 100644
--- a/src/opm/input/eclipse/EclipseState/checkDeck.cpp
+++ b/src/opm/input/eclipse/EclipseState/checkDeck.cpp
@@ -21,6 +21,7 @@
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/OpmLog/LogUtil.hpp>
 
+#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/input/eclipse/Deck/DeckSection.hpp>
 #include <opm/input/eclipse/Parser/Parser.hpp>
diff --git a/src/opm/input/eclipse/Parser/ParserRecord.cpp b/src/opm/input/eclipse/Parser/ParserRecord.cpp
index 2f37b2c75..ad603c9b0 100644
--- a/src/opm/input/eclipse/Parser/ParserRecord.cpp
+++ b/src/opm/input/eclipse/Parser/ParserRecord.cpp
@@ -17,12 +17,12 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <opm/input/eclipse/Parser/ParserRecord.hpp>
+
 #include <fmt/format.h>
 
-#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/Deck/DeckRecord.hpp>
 #include <opm/input/eclipse/Parser/ParseContext.hpp>
-#include <opm/input/eclipse/Parser/ParserRecord.hpp>
 #include <opm/input/eclipse/Parser/ParserItem.hpp>
 #include <opm/input/eclipse/Units/UnitSystem.hpp>
 
diff --git a/src/opm/input/eclipse/Schedule/Schedule.cpp b/src/opm/input/eclipse/Schedule/Schedule.cpp
index de0e6f7d5..a42c2a150 100644
--- a/src/opm/input/eclipse/Schedule/Schedule.cpp
+++ b/src/opm/input/eclipse/Schedule/Schedule.cpp
@@ -41,6 +41,7 @@
 #include <opm/io/eclipse/rst/state.hpp>
 
 #include <opm/input/eclipse/Python/Python.hpp>
+#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/Deck/DeckItem.hpp>
 #include <opm/input/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/input/eclipse/Deck/DeckRecord.hpp>
diff --git a/src/opm/input/eclipse/Schedule/ScheduleDeck.cpp b/src/opm/input/eclipse/Schedule/ScheduleDeck.cpp
index 3b2c76cab..1eb2ae6a6 100644
--- a/src/opm/input/eclipse/Schedule/ScheduleDeck.cpp
+++ b/src/opm/input/eclipse/Schedule/ScheduleDeck.cpp
@@ -25,6 +25,7 @@
 #include <opm/common/utility/String.hpp>
 #include <opm/common/utility/TimeService.hpp>
 
+#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/Deck/DeckOutput.hpp>
 #include <opm/input/eclipse/Deck/DeckSection.hpp>
 #include <opm/input/eclipse/EclipseState/Runspec.hpp>
diff --git a/tests/msim/test_msim.cpp b/tests/msim/test_msim.cpp
index 8bce04351..7117bd53b 100644
--- a/tests/msim/test_msim.cpp
+++ b/tests/msim/test_msim.cpp
@@ -38,6 +38,7 @@
 
 #include <opm/output/data/Wells.hpp>
 #include <opm/output/eclipse/EclipseIO.hpp>
+#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/Units/Units.hpp>
 #include <opm/input/eclipse/Parser/Parser.hpp>
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
diff --git a/tests/msim/test_msim_ACTIONX.cpp b/tests/msim/test_msim_ACTIONX.cpp
index 8e217f1ed..f9c0c2d94 100644
--- a/tests/msim/test_msim_ACTIONX.cpp
+++ b/tests/msim/test_msim_ACTIONX.cpp
@@ -29,6 +29,7 @@
 
 #include <opm/input/eclipse/Python/Python.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp>
+#include <opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
 #include <opm/input/eclipse/Schedule/SummaryState.hpp>
 #include <opm/input/eclipse/Schedule/Schedule.hpp>
 #include <opm/input/eclipse/Schedule/Action/ActionAST.hpp>
diff --git a/tests/msim/test_msim_EXIT.cpp b/tests/msim/test_msim_EXIT.cpp
index 8cb8a0e89..d7813d894 100644
--- a/tests/msim/test_msim_EXIT.cpp
+++ b/tests/msim/test_msim_EXIT.cpp
@@ -24,6 +24,8 @@
 #include <stdexcept>
 #include <opm/output/eclipse/EclipseIO.hpp>
 
+#include <opm/input/eclipse/Deck/Deck.hpp>
+
 #include <opm/input/eclipse/Parser/Parser.hpp>
 #include <opm/input/eclipse/Parser/ParseContext.hpp>
 #include <opm/input/eclipse/Parser/ErrorGuard.hpp>
diff --git a/tests/parser/SectionTests.cpp b/tests/parser/SectionTests.cpp
index 90857bb40..7f7c99aa8 100644
--- a/tests/parser/SectionTests.cpp
+++ b/tests/parser/SectionTests.cpp
@@ -26,6 +26,7 @@
 
 #include <boost/test/unit_test.hpp>
 
+#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/input/eclipse/Deck/DeckSection.hpp>
 #include <opm/input/eclipse/Parser/ErrorGuard.hpp>
diff --git a/tests/parser/SimulationConfigTest.cpp b/tests/parser/SimulationConfigTest.cpp
index 3073a83c8..592436fce 100644
--- a/tests/parser/SimulationConfigTest.cpp
+++ b/tests/parser/SimulationConfigTest.cpp
@@ -36,6 +36,7 @@
 #include <opm/input/eclipse/Parser/Parser.hpp>
 #include <opm/input/eclipse/Parser/ParserKeywords/C.hpp>
 
+#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/Deck/DeckSection.hpp>
 
 using namespace Opm;