From dcc467cae1561d42e378081068fdeeb3b4a54d2b Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Mon, 9 Jan 2023 14:23:11 +0100
Subject: [PATCH] Schedule: forward GuideRate(Config|Model)

---
 opm/input/eclipse/Schedule/Schedule.hpp            | 3 ++-
 opm/input/eclipse/Schedule/ScheduleState.hpp       | 9 ++++-----
 src/opm/input/eclipse/Schedule/Group/GuideRate.cpp | 1 +
 src/opm/input/eclipse/Schedule/KeywordHandlers.cpp | 1 +
 src/opm/input/eclipse/Schedule/Schedule.cpp        | 1 +
 src/opm/input/eclipse/Schedule/ScheduleState.cpp   | 1 +
 src/opm/output/eclipse/CreateInteHead.cpp          | 2 ++
 tests/test_Serialization.cpp                       | 1 +
 8 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/opm/input/eclipse/Schedule/Schedule.hpp b/opm/input/eclipse/Schedule/Schedule.hpp
index e2534b7a2..3fc7e41ee 100644
--- a/opm/input/eclipse/Schedule/Schedule.hpp
+++ b/opm/input/eclipse/Schedule/Schedule.hpp
@@ -34,7 +34,6 @@
 #include <opm/input/eclipse/Parser/InputErrorAction.hpp>
 #include <opm/input/eclipse/Schedule/GasLiftOpt.hpp>
 #include <opm/input/eclipse/Schedule/Group/Group.hpp>
-#include <opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp>
 #include <opm/input/eclipse/Schedule/MessageLimits.hpp>
 #include <opm/input/eclipse/Schedule/Network/ExtNetwork.hpp>
 #include <opm/input/eclipse/Schedule/RPTConfig.hpp>
@@ -57,6 +56,8 @@ namespace Opm
     class DeckRecord;
     class EclipseState;
     class FieldPropsManager;
+    class GuideRateConfig;
+    class GuideRateModel;
     class GTNode;
     class ParseContext;
     class Python;
diff --git a/opm/input/eclipse/Schedule/ScheduleState.hpp b/opm/input/eclipse/Schedule/ScheduleState.hpp
index 7962aa4ab..ae9ac85f0 100644
--- a/opm/input/eclipse/Schedule/ScheduleState.hpp
+++ b/opm/input/eclipse/Schedule/ScheduleState.hpp
@@ -49,7 +49,6 @@
 #include <opm/input/eclipse/Schedule/Action/Actions.hpp>
 #include <opm/input/eclipse/Schedule/UDQ/UDQActive.hpp>
 #include <opm/input/eclipse/Schedule/UDQ/UDQConfig.hpp>
-#include <opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp>
 #include <opm/input/eclipse/Schedule/GasLiftOpt.hpp>
 #include <opm/input/eclipse/Schedule/RFTConfig.hpp>
 #include <opm/input/eclipse/Schedule/RSTConfig.hpp>
@@ -66,8 +65,12 @@ namespace {
 }
 
 }
+
 namespace Opm {
 
+    class GuideRateConfig;
+    class WellTestConfig;
+
     /*
       The purpose of the ScheduleState class is to hold the entire Schedule
       information, i.e. wells and groups and so on, at exactly one point in
@@ -75,10 +78,6 @@ namespace Opm {
       is handled by the Schedule instance owning the ScheduleState instance.
     */
 
-    class WellTestConfig;
-
-
-
     class ScheduleState {
     public:
         /*
diff --git a/src/opm/input/eclipse/Schedule/Group/GuideRate.cpp b/src/opm/input/eclipse/Schedule/Group/GuideRate.cpp
index 53d146f5f..adaa84efe 100644
--- a/src/opm/input/eclipse/Schedule/Group/GuideRate.cpp
+++ b/src/opm/input/eclipse/Schedule/Group/GuideRate.cpp
@@ -21,6 +21,7 @@
 
 #include <opm/input/eclipse/EclipseState/Phase.hpp>
 #include <opm/input/eclipse/Schedule/Schedule.hpp>
+#include <opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp>
 
 #include <opm/input/eclipse/Units/Units.hpp>
 
diff --git a/src/opm/input/eclipse/Schedule/KeywordHandlers.cpp b/src/opm/input/eclipse/Schedule/KeywordHandlers.cpp
index cc6fc1e5a..259884576 100644
--- a/src/opm/input/eclipse/Schedule/KeywordHandlers.cpp
+++ b/src/opm/input/eclipse/Schedule/KeywordHandlers.cpp
@@ -62,6 +62,7 @@
 #include <opm/input/eclipse/Schedule/MSW/WellSegments.hpp>
 #include <opm/input/eclipse/Schedule/Group/GConSump.hpp>
 #include <opm/input/eclipse/Schedule/Group/GConSale.hpp>
+#include <opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp>
 
 #include <opm/input/eclipse/Schedule/OilVaporizationProperties.hpp>
 #include <opm/input/eclipse/Schedule/UDQ/UDQConfig.hpp>
diff --git a/src/opm/input/eclipse/Schedule/Schedule.cpp b/src/opm/input/eclipse/Schedule/Schedule.cpp
index 6d10a294e..75a1e07d3 100644
--- a/src/opm/input/eclipse/Schedule/Schedule.cpp
+++ b/src/opm/input/eclipse/Schedule/Schedule.cpp
@@ -39,6 +39,7 @@
 #include <opm/input/eclipse/Schedule/Group/GConSale.hpp>
 #include <opm/input/eclipse/Schedule/Group/GConSump.hpp>
 #include <opm/input/eclipse/Schedule/Group/GTNode.hpp>
+#include <opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp>
 #include <opm/input/eclipse/Schedule/MSW/SICD.hpp>
 #include <opm/input/eclipse/Schedule/MSW/Valve.hpp>
 #include <opm/input/eclipse/Schedule/MSW/WellSegments.hpp>
diff --git a/src/opm/input/eclipse/Schedule/ScheduleState.cpp b/src/opm/input/eclipse/Schedule/ScheduleState.cpp
index 5f5b0e7fc..b0868b8cf 100644
--- a/src/opm/input/eclipse/Schedule/ScheduleState.cpp
+++ b/src/opm/input/eclipse/Schedule/ScheduleState.cpp
@@ -22,6 +22,7 @@
 #include <opm/input/eclipse/Schedule/Well/WellTestConfig.hpp>
 #include <opm/input/eclipse/Schedule/Group/GConSump.hpp>
 #include <opm/input/eclipse/Schedule/Group/GConSale.hpp>
+#include <opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp>
 #include <opm/input/eclipse/Schedule/VFPProdTable.hpp>
 #include <opm/input/eclipse/Schedule/VFPInjTable.hpp>
 
diff --git a/src/opm/output/eclipse/CreateInteHead.cpp b/src/opm/output/eclipse/CreateInteHead.cpp
index afbb05a81..3fe4a8e26 100644
--- a/src/opm/output/eclipse/CreateInteHead.cpp
+++ b/src/opm/output/eclipse/CreateInteHead.cpp
@@ -28,6 +28,8 @@
 #include <opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/input/eclipse/EclipseState/Runspec.hpp>
 #include <opm/input/eclipse/Schedule/ArrayDimChecker.hpp>
+#include <opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp>
+#include <opm/input/eclipse/Schedule/Group/GuideRateModel.hpp>
 #include <opm/input/eclipse/Schedule/Schedule.hpp>
 #include <opm/input/eclipse/Schedule/UDQ/UDQConfig.hpp>
 #include <opm/input/eclipse/Schedule/UDQ/UDQActive.hpp>
diff --git a/tests/test_Serialization.cpp b/tests/test_Serialization.cpp
index 93899d27e..90d1f01ac 100644
--- a/tests/test_Serialization.cpp
+++ b/tests/test_Serialization.cpp
@@ -62,6 +62,7 @@
 #include <opm/input/eclipse/Schedule/Events.hpp>
 #include <opm/input/eclipse/Schedule/Group/GConSale.hpp>
 #include <opm/input/eclipse/Schedule/Group/Group.hpp>
+#include <opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp>
 #include <opm/input/eclipse/Schedule/Group/GuideRateModel.hpp>
 #include <opm/input/eclipse/Schedule/MessageLimits.hpp>
 #include <opm/input/eclipse/Schedule/MSW/icd.hpp>