Merge pull request #3361 from akva2/fielddata.hpp_reduce_hotness

FieldPropsManager.hpp: forward FieldData

opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp

@@ -20,16 +20,19 @@
 #define FIELDPROPS_MANAGER_HPP
 
 #include <memory>
-#include <vector>
+#include <string>
 #include <unordered_map>
 #include <opm/input/eclipse/EclipseState/Grid/TranCalculator.hpp>
-#include <opm/input/eclipse/EclipseState/Grid/FieldData.hpp>
+#include <vector>
 
 namespace Opm {
 
 class EclipseGrid;
 class Deck;
 class DeckKeyword;
+namespace Fieldprops {
+template<typename T> struct FieldData;
+}
 class FieldProps;
 class Phases;
 class TableManager;

opm/input/eclipse/EclipseState/Grid/Keywords.hpp

@@ -21,13 +21,10 @@
 #define OPM_KEYWORDS_HPP
 
 #include <optional>
+#include <string>
 
-namespace Opm
-{
-
-namespace Fieldprops
-{
-
+namespace Opm {
+namespace Fieldprops {
 namespace keywords {
 
 template <typename T>
@@ -72,7 +69,9 @@ struct keyword_info {
         return *this;
     }
 };
+
 } // end namespace Keywords
 } // end namespace Fieldprops
 } //end namespace Opm
+
 #endif //OPM_KEYWORDS_HPP