OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved OrderMap to EclipseState/Util

Browse Source
This commit is contained in:
Joakim Hove
2014-09-04 14:09:33 +02:00
parent fedc3387fd
commit c1f42aee64
7 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
opm/parser/eclipse/CMakeLists.txt
View File

@@ -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

2
opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp
View File

@@ -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>

2
opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
View File

@@ -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>

5
opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt
View File

@@ -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 )

0
opm/parser/eclipse/EclipseState/Schedule/OrderedMap.hpp → opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp
View File

5
opm/parser/eclipse/EclipseState/Util/tests/CMakeLists.txt Normal file
View File

@@ -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 )

2
opm/parser/eclipse/EclipseState/Schedule/tests/OrderedMapTests.cpp → opm/parser/eclipse/EclipseState/Util/tests/OrderedMapTests.cpp
View File

@@ -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) {