From 81a9f0521fcd10afee96d90526ef8011c19e3259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Wed, 7 Sep 2016 13:37:09 +0200 Subject: [PATCH] Use map instead of unordered_map. This is because downstream code can benefit from the ordering guarantee. --- opm/common/data/SimulationDataContainer.cpp | 4 ++-- opm/common/data/SimulationDataContainer.hpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/opm/common/data/SimulationDataContainer.cpp b/opm/common/data/SimulationDataContainer.cpp index 205536557..3aa288baf 100644 --- a/opm/common/data/SimulationDataContainer.cpp +++ b/opm/common/data/SimulationDataContainer.cpp @@ -210,11 +210,11 @@ namespace Opm { } - const std::unordered_map>& SimulationDataContainer::cellData() const { + const std::map>& SimulationDataContainer::cellData() const { return m_cell_data; } - std::unordered_map>& SimulationDataContainer::cellData() { + std::map>& SimulationDataContainer::cellData() { return m_cell_data; } diff --git a/opm/common/data/SimulationDataContainer.hpp b/opm/common/data/SimulationDataContainer.hpp index c3539cbaa..45ddee3b4 100644 --- a/opm/common/data/SimulationDataContainer.hpp +++ b/opm/common/data/SimulationDataContainer.hpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include namespace Opm { @@ -118,8 +118,8 @@ namespace Opm { const std::vector& facepressure() const; const std::vector& faceflux () const; - const std::unordered_map>& cellData() const; - std::unordered_map>& cellData(); + const std::map>& cellData() const; + std::map>& cellData(); private: void addDefaultFields(); @@ -129,8 +129,8 @@ namespace Opm { size_t m_num_faces; size_t m_num_phases; - std::unordered_map< std::string , std::vector > m_cell_data; - std::unordered_map< std::string , std::vector > m_face_data; + std::map< std::string , std::vector > m_cell_data; + std::map< std::string , std::vector > m_face_data; std::vector* pressure_ref_; std::vector* temperature_ref_;