From 8d1a8126eaaa6f10bd2b583924dbb681c9b6e8ba Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Sat, 15 May 2021 14:41:05 +0200
Subject: [PATCH] changed: move Deck parameter to BlackoilModelParametersEbos

it is used there. now eclbasevanguard.hh includes
BlackoilModelParametersEbos, instead of the other way around.
---
 ebos/eclbasevanguard.hh                             | 5 +----
 opm/simulators/flow/BlackoilModelParametersEbos.hpp | 5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ebos/eclbasevanguard.hh b/ebos/eclbasevanguard.hh
index 4bffd39ab..2b434e765 100644
--- a/ebos/eclbasevanguard.hh
+++ b/ebos/eclbasevanguard.hh
@@ -36,6 +36,7 @@
 #include <opm/grid/common/GridEnums.hpp>
 #include <opm/grid/common/CartesianIndexMapper.hpp>
 #include <opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp>
+#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp>
 
 #include <array>
 #include <optional>
@@ -59,10 +60,6 @@ struct EquilGrid {
     using type = UndefinedProperty;
 };
 template<class TypeTag, class MyTypeTag>
-struct EclDeckFileName {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
 struct EnableOpmRstFile {
     using type = UndefinedProperty;
 };
diff --git a/opm/simulators/flow/BlackoilModelParametersEbos.hpp b/opm/simulators/flow/BlackoilModelParametersEbos.hpp
index a443524ed..3acd69bf3 100644
--- a/opm/simulators/flow/BlackoilModelParametersEbos.hpp
+++ b/opm/simulators/flow/BlackoilModelParametersEbos.hpp
@@ -23,7 +23,6 @@
 #include <opm/models/utils/propertysystem.hh>
 #include <opm/models/utils/parametersystem.hh>
 
-#include <ebos/eclbasevanguard.hh>
 #include <string>
 
 namespace Opm::Properties {
@@ -32,6 +31,10 @@ namespace TTag {
 struct FlowModelParameters {};
 }
 
+template<class TypeTag, class MyTypeTag>
+struct EclDeckFileName {
+    using type = UndefinedProperty;
+};
 template<class TypeTag, class MyTypeTag>
 struct DbhpMaxRel {
     using type = UndefinedProperty;