From c1f42aee64ce74d3cbac0ee8a8bb6f26e8494ef0 Mon Sep 17 00:00:00 2001
From: Joakim Hove <joakim.hove@gmail.com>
Date: Thu, 4 Sep 2014 14:09:33 +0200
Subject: [PATCH] Moved OrderMap to EclipseState/Util

---
 opm/parser/eclipse/CMakeLists.txt                            | 3 ++-
 opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp     | 2 +-
 opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp        | 2 +-
 .../eclipse/EclipseState/Schedule/tests/CMakeLists.txt       | 5 -----
 .../eclipse/EclipseState/{Schedule => Util}/OrderedMap.hpp   | 0
 opm/parser/eclipse/EclipseState/Util/tests/CMakeLists.txt    | 5 +++++
 .../{Schedule => Util}/tests/OrderedMapTests.cpp             | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)
 rename opm/parser/eclipse/EclipseState/{Schedule => Util}/OrderedMap.hpp (100%)
 create mode 100644 opm/parser/eclipse/EclipseState/Util/tests/CMakeLists.txt
 rename opm/parser/eclipse/EclipseState/{Schedule => Util}/tests/OrderedMapTests.cpp (97%)

diff --git a/opm/parser/eclipse/CMakeLists.txt b/opm/parser/eclipse/CMakeLists.txt
index c5efda316..45c2f086d 100644
--- a/opm/parser/eclipse/CMakeLists.txt
+++ b/opm/parser/eclipse/CMakeLists.txt
@@ -7,6 +7,7 @@ add_subdirectory(EclipseState/Schedule/tests)
 add_subdirectory(EclipseState/Grid/tests)
 add_subdirectory(Utility/tests)
 add_subdirectory(Units/tests)
+add_subdirectory(EclipseState/Util/tests)
 
 add_subdirectory( Applications )
 
@@ -136,7 +137,7 @@ EclipseState/Schedule/CompletionSet.hpp
 EclipseState/Schedule/ScheduleEnums.hpp
 EclipseState/Schedule/GroupTreeNode.hpp 
 EclipseState/Schedule/GroupTree.hpp 
-EclipseState/Schedule/OrderedMap.hpp 
+EclipseState/Util/OrderedMap.hpp 
 #
 EclipseState/Grid/EclipseGrid.hpp
 EclipseState/Grid/GridProperty.hpp
diff --git a/opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp b/opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp
index f4201e504..a141a50c9 100644
--- a/opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp
+++ b/opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp
@@ -25,7 +25,7 @@
 #include <map>
 
 
-#include <opm/parser/eclipse/EclipseState/Schedule/OrderedMap.hpp>
+#include <opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp>
 
 #include <opm/parser/eclipse/EclipseState/Grid/Fault.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/FaultFace.hpp>
diff --git a/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp b/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
index 6b24ed471..b35f0bd0c 100644
--- a/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
+++ b/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
@@ -24,7 +24,7 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/GroupTree.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Group.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/OrderedMap.hpp>
+#include <opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 
 #include <memory>
diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt b/opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt
index 32b0af3c0..10647014d 100644
--- a/opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt
+++ b/opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt
@@ -28,11 +28,6 @@ target_link_libraries(runGroupTests Parser ${Boost_LIBRARIES})
 add_test(NAME runGroupTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runGroupTests )
 
 
-add_executable(runOrderedMapTests OrderedMapTests.cpp)
-target_link_libraries(runOrderedMapTests Parser ${Boost_LIBRARIES})
-add_test(NAME runOrderedMapTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runOrderedMapTests )
-
-
 add_executable(runScheduleEnumTests ScheduleEnumTests.cpp)
 target_link_libraries(runScheduleEnumTests Parser ${Boost_LIBRARIES})
 add_test(NAME runScheduleEnumTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runScheduleEnumTests )
diff --git a/opm/parser/eclipse/EclipseState/Schedule/OrderedMap.hpp b/opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp
similarity index 100%
rename from opm/parser/eclipse/EclipseState/Schedule/OrderedMap.hpp
rename to opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp
diff --git a/opm/parser/eclipse/EclipseState/Util/tests/CMakeLists.txt b/opm/parser/eclipse/EclipseState/Util/tests/CMakeLists.txt
new file mode 100644
index 000000000..e5224e034
--- /dev/null
+++ b/opm/parser/eclipse/EclipseState/Util/tests/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_executable(runOrderedMapTests OrderedMapTests.cpp)
+target_link_libraries(runOrderedMapTests Parser ${Boost_LIBRARIES})
+add_test(NAME runOrderedMapTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runOrderedMapTests )
+
+
diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/OrderedMapTests.cpp b/opm/parser/eclipse/EclipseState/Util/tests/OrderedMapTests.cpp
similarity index 97%
rename from opm/parser/eclipse/EclipseState/Schedule/tests/OrderedMapTests.cpp
rename to opm/parser/eclipse/EclipseState/Util/tests/OrderedMapTests.cpp
index 1edd50684..b5a12f372 100644
--- a/opm/parser/eclipse/EclipseState/Schedule/tests/OrderedMapTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Util/tests/OrderedMapTests.cpp
@@ -25,7 +25,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
-#include <opm/parser/eclipse/EclipseState/Schedule/OrderedMap.hpp>
+#include <opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp>
 
 
 BOOST_AUTO_TEST_CASE( check_empty) {