diff --git a/opm/input/eclipse/EclipseState/Grid/FieldProps.hpp b/opm/input/eclipse/EclipseState/Grid/FieldProps.hpp index 26efa8dcc..abd9fe5d7 100644 --- a/opm/input/eclipse/EclipseState/Grid/FieldProps.hpp +++ b/opm/input/eclipse/EclipseState/Grid/FieldProps.hpp @@ -509,7 +509,7 @@ public: bool operator==(const FieldProps& other) const; static bool rst_cmp(const FieldProps& full_arg, const FieldProps& rst_arg); - const Fieldprops::TranMap& getTran() const + const std::unordered_map& getTran() const { return tran; } @@ -574,7 +574,7 @@ private: std::unordered_map> int_data; std::unordered_map> double_data; - Fieldprops::TranMap tran; + std::unordered_map tran; }; } diff --git a/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp b/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp index d132efa14..33200e643 100644 --- a/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp +++ b/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp @@ -31,7 +31,6 @@ class Deck; class DeckKeyword; namespace Fieldprops { class TranCalculator; -using TranMap = std::unordered_map; template struct FieldData; } class FieldProps; @@ -234,7 +233,7 @@ public: void apply_numerical_aquifers(const NumericalAquifers& aquifers); - const Fieldprops::TranMap& getTran() const; + const std::unordered_map& getTran() const; private: /* diff --git a/opm/input/eclipse/EclipseState/Grid/TranCalculator.hpp b/opm/input/eclipse/EclipseState/Grid/TranCalculator.hpp index e66911df4..8e8b1861c 100644 --- a/opm/input/eclipse/EclipseState/Grid/TranCalculator.hpp +++ b/opm/input/eclipse/EclipseState/Grid/TranCalculator.hpp @@ -117,8 +117,6 @@ private: std::vector actions; }; -using TranMap = std::unordered_map; - } // namespace Fieldprops } // end namespace Opm #endif // TRAN_CALCULATOR_HPP diff --git a/src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp b/src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp index e5ed8cc62..84df0aaae 100644 --- a/src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp @@ -154,8 +154,8 @@ void FieldPropsManager::apply_numerical_aquifers(const NumericalAquifers& aquife return this->fp->apply_numerical_aquifers(aquifers); } - -const Fieldprops::TranMap& FieldPropsManager::getTran() const +const std::unordered_map& +FieldPropsManager::getTran() const { return this->fp->getTran(); }