diff --git a/.travis.yml b/.travis.yml index a41876be4..aa67614cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ before_script: - git clone https://github.com/OPM/opm-common.git - opm-common/travis/clone-opm.sh opm-parser - opm-common/travis/build-prereqs.sh - + script: opm-common/travis/build-and-test.sh opm-parser diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt new file mode 100644 index 000000000..5aaf320d2 --- /dev/null +++ b/applications/CMakeLists.txt @@ -0,0 +1,5 @@ +project(opm-parser-applications CXX) + +add_executable(opmi opmi.cpp) +target_link_libraries(opmi opmparser) +install(TARGETS opmi DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/appveyor.yml b/appveyor.yml index aafa0e547..5fd751e15 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,6 +8,9 @@ configuration: os: Visual Studio 2015 image: Visual Studio 2015 +matrix: + fast_finish: true + platform: - x64 @@ -15,9 +18,8 @@ environment: BOOST_ROOT: C:/Libraries/boost_1_59_0/boost BOOST_INCLUDEDIR: C:/Libraries/boost_1_59_0 BOOST_LIBRARYDIR: C:/Libraries/boost_1_59_0/lib64-msvc-14.0 - BOOST_FLAGS: -DBoost_USE_MULTITHREAD=ON -DBUILD_SHARED_LIBS=OFF -DBoost_USE_STATIC_LIBS=TRUE -DBOOST_ALL_DYN_LINK=OFF + BOOST_FLAGS: -DBoost_USE_MULTITHREAD=ON -DBUILD_SHARED_LIBS=OFF BOOST_OPTIONS: -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% -DBOOST_INCLUDEDIR=%BOOST_INCLUDEDIR% %BOOST_FLAGS% - COMMON_ROOT: "C:/projects/opm-parser/opm-common" DATA_ROOT: "C:/projects/opm-parser/opm-data/" GEN: "Visual Studio 14 2015 Win64" @@ -25,13 +27,16 @@ cache: - opm-data build_script: - - git clone https://github.com/OPM/opm-common.git - git -C opm-data pull || git clone https://github.com/OPM/opm-data.git - git clone https://github.com/statoil/libecl - - cd libecl + - ps: mkdir -p libecl/build + - ps: pushd libecl/build - cmake C:\projects\opm-parser\libecl -G"%GEN%" -DCMAKE_BUILD_TYPE=%configuration% -DERT_BUILD_CXX=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_PYTHON=OFF - cmake --build . --config %configuration% - - cd .. - - cmake C:\projects\opm-parser -G"%GEN%" %BOOST_OPTIONS% -DOPM_DATA_ROOT=%DATA_ROOT% -DOPM_COMMON_ROOT="%COMMON_ROOT%" -DCMAKE_BUILD_TYPE=%configuration% + - ps: popd + - mkdir build + - ps: pushd build + - cmake C:\projects\opm-parser -G"%GEN%" %BOOST_OPTIONS% -DOPM_DATA_ROOT=%DATA_ROOT% -DCMAKE_BUILD_TYPE=%configuration% - cmake --build . --config %configuration% - ctest -C %configuration% --output-on-failure + - ps: popd diff --git a/opm/parser/eclipse/Applications/opmi.cpp b/examples/opmi.cpp similarity index 100% rename from opm/parser/eclipse/Applications/opmi.cpp rename to examples/opmi.cpp diff --git a/external/cjson/CMakeLists.txt b/external/cjson/CMakeLists.txt new file mode 100644 index 000000000..f798f8aba --- /dev/null +++ b/external/cjson/CMakeLists.txt @@ -0,0 +1,8 @@ +project(opm-cjson C) + +add_library(cjson OBJECT cJSON.c) +set_target_properties(cjson PROPERTIES POSITION_INDEPENDENT_CODE TRUE) +target_include_directories(cjson + PUBLIC $ + $ +) diff --git a/opm/json/CMakeLists.txt b/opm/json/CMakeLists.txt deleted file mode 100644 index e48c83dda..000000000 --- a/opm/json/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -set( json_source JsonObject.cpp ) -set( json_headers JsonObject.hpp ) -if (NOT HAVE_CJSON) - list(APPEND json_source ${PROJECT_SOURCE_DIR}/external/cjson/cJSON.c) - set( CJSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/external ) - include_directories(${CJSON_INCLUDE_DIR}) - set(CJSON_LIBRARY "") -endif() -add_library(opmjson ${json_source}) -target_link_libraries( opmjson ${CJSON_LIBRARY} ${Boost_LIBRARIES} ) -set_target_properties(opmjson PROPERTIES VERSION ${opm-parser_VERSION_MAJOR}.${opm-parser_VERSION_MINOR} - SOVERSION ${opm-parser_VERSION_MAJOR}) - -install( TARGETS opmjson DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -foreach ( header ${json_headers} ) - install( FILES ${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/opm/json RENAME ${header}) -endforeach() - -add_subdirectory( tests ) diff --git a/opm/json/tests/CMakeLists.txt b/opm/json/tests/CMakeLists.txt deleted file mode 100644 index 548f7eafb..000000000 --- a/opm/json/tests/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -opm_add_test(runjsonTests SOURCES jsonTests.cpp - LIBRARIES opmjson ${Boost_LIBRARIES}) -if (NOT MSVC) - set_source_files_properties( jsonTests.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-variable") -endif() diff --git a/opm/parser/CMakeLists.txt b/opm/parser/CMakeLists.txt deleted file mode 100644 index 1852a5ea5..000000000 --- a/opm/parser/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory( share ) -add_subdirectory( eclipse ) diff --git a/opm/parser/eclipse/Applications/CMakeLists.txt b/opm/parser/eclipse/Applications/CMakeLists.txt deleted file mode 100644 index 50ccbfa58..000000000 --- a/opm/parser/eclipse/Applications/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_executable(opmi opmi.cpp) -target_link_libraries(opmi opmparser) -install(TARGETS opmi DESTINATION "bin") - diff --git a/opm/parser/eclipse/CMakeLists.txt b/opm/parser/eclipse/CMakeLists.txt deleted file mode 100644 index 1c032c35a..000000000 --- a/opm/parser/eclipse/CMakeLists.txt +++ /dev/null @@ -1,354 +0,0 @@ -include_directories(BEFORE ${PROJECT_BINARY_DIR}/generated-source/include) - -add_subdirectory(Parser/tests) -add_subdirectory(Generator/tests) -add_subdirectory(RawDeck/tests) -add_subdirectory(Deck/tests) -add_subdirectory(Units/tests) -add_subdirectory(EclipseState/tests) -add_subdirectory(EclipseState/Schedule/tests) -add_subdirectory(EclipseState/SimulationConfig/tests) -add_subdirectory(EclipseState/Tables/tests) -add_subdirectory(EclipseState/Grid/tests) -add_subdirectory(EclipseState/Util/tests) -add_subdirectory(EclipseState/IOConfig/tests) -add_subdirectory(EclipseState/InitConfig/tests) -add_subdirectory(EclipseState/SummaryConfig/tests) -add_subdirectory(Utility/tests) - -add_subdirectory(Applications) -add_subdirectory(IntegrationTests) - -set( rawdeck_source -RawDeck/StarToken.cpp -RawDeck/RawKeyword.cpp -RawDeck/RawRecord.cpp ) - -set( unit_source -Units/UnitSystem.cpp -Units/Dimension.cpp) - -set( deck_source -Deck/Deck.cpp -Deck/DeckKeyword.cpp -Deck/DeckRecord.cpp -Deck/DeckItem.cpp -Deck/Section.cpp -) - -set( parser_source -Parser/ParseContext.cpp -Parser/MessageContainer.cpp -Parser/ParserEnums.cpp -Parser/ParserKeyword.cpp -Parser/Parser.cpp -Parser/ParserRecord.cpp -Parser/ParserItem.cpp -) - -set( generator_source -Generator/KeywordGenerator.cpp -Generator/KeywordLoader.cpp ) - -set( utility_source -Utility/Functional.cpp -Utility/Stringview.cpp -) - -set( build_parser_source -Deck/Deck.cpp -Deck/DeckItem.cpp -Deck/DeckKeyword.cpp -Deck/DeckRecord.cpp -Parser/MessageContainer.cpp -Parser/ParseContext.cpp -Parser/ParserItem.cpp -Parser/ParserKeyword.cpp -Parser/ParserRecord.cpp -Parser/ParserEnums.cpp -RawDeck/RawKeyword.cpp -RawDeck/RawRecord.cpp -RawDeck/StarToken.cpp -Units/Dimension.cpp -Units/UnitSystem.cpp -${generator_source} -${utility_source} -) - -set (state_source -EclipseState/EclipseState.cpp -EclipseState/EclipseConfig.cpp -EclipseState/Eclipse3DProperties.cpp -EclipseState/Runspec.cpp -EclipseState/EndpointScaling.cpp -# -EclipseState/checkDeck.cpp -# -EclipseState/Schedule/MessageLimits.cpp -EclipseState/Schedule/OilVaporizationProperties.cpp -EclipseState/Schedule/TimeMap.cpp -EclipseState/Schedule/Schedule.cpp -EclipseState/Schedule/Well.cpp -EclipseState/Schedule/WellProductionProperties.cpp -EclipseState/Schedule/WellInjectionProperties.cpp -EclipseState/Schedule/WellPolymerProperties.cpp -EclipseState/Schedule/WellEconProductionLimits.cpp -EclipseState/Schedule/MSW/Segment.cpp -EclipseState/Schedule/MSW/SegmentSet.cpp -EclipseState/Schedule/MSW/Compsegs.cpp -EclipseState/Schedule/Group.cpp -EclipseState/Schedule/Completion.cpp -EclipseState/Schedule/CompletionSet.cpp -EclipseState/Schedule/ScheduleEnums.cpp -EclipseState/Schedule/GroupTree.cpp -EclipseState/Schedule/Tuning.cpp -EclipseState/Schedule/Events.cpp -# -EclipseState/Tables/JFunc.cpp -EclipseState/Tables/SimpleTable.cpp -EclipseState/Tables/VFPProdTable.cpp -EclipseState/Tables/VFPInjTable.cpp -EclipseState/Tables/TableManager.cpp -EclipseState/Tables/TableContainer.cpp -EclipseState/Tables/TableColumn.cpp -EclipseState/Tables/ColumnSchema.cpp -EclipseState/Tables/TableSchema.cpp -EclipseState/Tables/TableIndex.cpp -EclipseState/Tables/PvtxTable.cpp -EclipseState/Tables/Tables.cpp -# -EclipseState/Grid/SatfuncPropertyInitializers.cpp -EclipseState/Grid/GridDims.cpp -EclipseState/Grid/GridProperty.cpp -EclipseState/Grid/GridProperties.cpp -EclipseState/Grid/Box.cpp -EclipseState/Grid/BoxManager.cpp -EclipseState/Grid/FaceDir.cpp -EclipseState/Grid/TransMult.cpp -EclipseState/Grid/MULTREGTScanner.cpp -EclipseState/Grid/EclipseGrid.cpp -EclipseState/Grid/FaultFace.cpp -EclipseState/Grid/Fault.cpp -EclipseState/Grid/FaultCollection.cpp -EclipseState/Grid/NNC.cpp -EclipseState/Grid/PinchMode.cpp -# -EclipseState/InitConfig/InitConfig.cpp -EclipseState/InitConfig/Equil.cpp -EclipseState/SimulationConfig/SimulationConfig.cpp -EclipseState/SimulationConfig/ThresholdPressure.cpp -EclipseState/SummaryConfig/SummaryConfig.cpp -EclipseState/IOConfig/RestartConfig.cpp -EclipseState/IOConfig/IOConfig.cpp) -# - -set( HEADER_FILES -RawDeck/RawConsts.hpp -RawDeck/RawKeyword.hpp -RawDeck/RawRecord.hpp -RawDeck/StarToken.hpp -RawDeck/RawEnums.hpp -# -Deck/Deck.hpp -Deck/DeckKeyword.hpp -Deck/DeckRecord.hpp -Deck/DeckItem.hpp -Deck/Section.hpp -# -Parser/ParserEnums.hpp -Parser/ParserKeyword.hpp -Parser/Parser.hpp -Parser/ParserRecord.hpp -Parser/ParserItem.hpp -Parser/InputErrorAction.hpp -Parser/ParseContext.hpp -Parser/MessageContainer.hpp -# -Generator/KeywordLoader.hpp -Generator/KeywordGenerator.hpp -# -Units/UnitSystem.hpp -Units/Dimension.hpp -Units/Units.hpp -# -EclipseState/EclipseState.hpp -EclipseState/EclipseConfig.hpp -EclipseState/Eclipse3DProperties.hpp -EclipseState/Runspec.hpp -EclipseState/EndpointScaling.hpp -# -EclipseState/checkDeck.hpp -# -EclipseState/Schedule/MessageLimits.hpp -EclipseState/Schedule/OilVaporizationProperties.hpp -EclipseState/Schedule/TimeMap.hpp -EclipseState/Schedule/Schedule.hpp -EclipseState/Schedule/Well.hpp -EclipseState/Schedule/WellProductionProperties.hpp -EclipseState/Schedule/WellInjectionProperties.hpp -EclipseState/Schedule/WellPolymerProperties.hpp -EclipseState/Schedule/WellEconProductionLimits.hpp -EclipseState/Schedule/MSW/Segment.hpp -EclipseState/Schedule/MSW/SegmentSet.hpp -EclipseState/Schedule/MSW/Compsegs.hpp -EclipseState/Schedule/Group.hpp -EclipseState/Schedule/DynamicState.hpp -EclipseState/Schedule/DynamicVector.hpp -EclipseState/Schedule/Completion.hpp -EclipseState/Schedule/CompletionSet.hpp -EclipseState/Schedule/ScheduleEnums.hpp -EclipseState/Schedule/GroupTree.hpp -EclipseState/Schedule/Tuning.hpp -EclipseState/Schedule/Events.hpp -# -EclipseState/Util/OrderedMap.hpp -EclipseState/Util/Value.hpp -# -EclipseState/Grid/Box.hpp -EclipseState/Grid/BoxManager.hpp -EclipseState/Grid/EclipseGrid.hpp -EclipseState/Grid/FaceDir.hpp -EclipseState/Grid/FaultCollection.hpp -EclipseState/Grid/FaultFace.hpp -EclipseState/Grid/Fault.hpp -EclipseState/Grid/GridDims.hpp -EclipseState/Grid/GridProperties.hpp -EclipseState/Grid/GridProperty.hpp -EclipseState/Grid/MinpvMode.hpp -EclipseState/Grid/MULTREGTScanner.hpp -EclipseState/Grid/NNC.hpp -EclipseState/Grid/PinchMode.hpp -EclipseState/Grid/SatfuncPropertyInitializers.hpp -EclipseState/Grid/TransMult.hpp -# -EclipseState/InitConfig/InitConfig.hpp -EclipseState/InitConfig/Equil.hpp -EclipseState/SimulationConfig/SimulationConfig.hpp -EclipseState/SimulationConfig/ThresholdPressure.hpp -EclipseState/SummaryConfig/SummaryConfig.hpp -EclipseState/IOConfig/RestartConfig.hpp -EclipseState/IOConfig/IOConfig.hpp -# -EclipseState/Tables/FlatTable.hpp -EclipseState/Tables/JFunc.hpp -EclipseState/Tables/Tabdims.hpp -EclipseState/Tables/Eqldims.hpp -EclipseState/Tables/Regdims.hpp -EclipseState/Tables/PlyadsTable.hpp -EclipseState/Tables/PvtoTable.hpp -EclipseState/Tables/RocktabTable.hpp -EclipseState/Tables/PvdoTable.hpp -EclipseState/Tables/PvdgTable.hpp -EclipseState/Tables/PvdsTable.hpp -EclipseState/Tables/SimpleTable.hpp -EclipseState/Tables/PlymaxTable.hpp -EclipseState/Tables/PlyrockTable.hpp -EclipseState/Tables/SwofTable.hpp -EclipseState/Tables/SgwfnTable.hpp -EclipseState/Tables/SwfnTable.hpp -EclipseState/Tables/SgfnTable.hpp -EclipseState/Tables/SsfnTable.hpp -EclipseState/Tables/Sof2Table.hpp -EclipseState/Tables/Sof3Table.hpp -EclipseState/Tables/EnptvdTable.hpp -EclipseState/Tables/PlyviscTable.hpp -EclipseState/Tables/PlydhflfTable.hpp -EclipseState/Tables/PlyshlogTable.hpp -EclipseState/Tables/EnkrvdTable.hpp -EclipseState/Tables/ImkrvdTable.hpp -EclipseState/Tables/SgofTable.hpp -EclipseState/Tables/SlgofTable.hpp -EclipseState/Tables/PvtxTable.hpp -EclipseState/Tables/ImptvdTable.hpp -EclipseState/Tables/RsvdTable.hpp -EclipseState/Tables/RvvdTable.hpp -EclipseState/Tables/RtempvdTable.hpp -EclipseState/Tables/OilvisctTable.hpp -EclipseState/Tables/GasvisctTable.hpp -EclipseState/Tables/WatvisctTable.hpp -EclipseState/Tables/PvtgTable.hpp -EclipseState/Tables/VFPProdTable.hpp -EclipseState/Tables/VFPInjTable.hpp -EclipseState/Tables/TableManager.hpp -EclipseState/Tables/TableContainer.hpp -EclipseState/Tables/SorwmisTable.hpp -EclipseState/Tables/SgcwmisTable.hpp -EclipseState/Tables/MiscTable.hpp -EclipseState/Tables/PmiscTable.hpp -EclipseState/Tables/TlpmixpaTable.hpp -EclipseState/Tables/MsfnTable.hpp -EclipseState/Tables/TableColumn.hpp -EclipseState/Tables/ColumnSchema.hpp -EclipseState/Tables/TableEnums.hpp -EclipseState/Tables/TableSchema.hpp -EclipseState/Tables/TableIndex.hpp -# -Utility/Functional.hpp -Utility/Stringview.hpp -Utility/Typetools.hpp) - -#----------------------------------------------------------------- -# This section manages the generation of C++ code for the default keywords. - -# 1. Create an executable 'createDefaultKeywordList'. - -add_executable(createDefaultKeywordList Parser/createDefaultKeywordList.cpp ${build_parser_source}) -target_link_libraries( createDefaultKeywordList opmjson ${Boost_LIBRARIES} ecl) - -# 2. Run the generated application createDefaultKeywordlist - this -# application will recursively scan through all the json keyword -# files in the source tree. It will maintain a signature of these json files, -# and only update the generated files if the json files have changed. -# -# This target will always run - the dependency "management" is -# implicitly handled in the createDefaultKeywordList application. - -set( generated_source ${PROJECT_BINARY_DIR}/generated-source/ParserKeywords.cpp) -# to tune the number of files addDefaultKeywords is split into, change -# generated_num_files. 4 is a very reasonable estimate. -# TODO: support from command line options? -set( generated_num_files 4 ) -math( EXPR generated_num_files_end "${generated_num_files} - 1" ) -foreach( n RANGE ${generated_num_files_end} ) - list(APPEND generated_source ${PROJECT_BINARY_DIR}/generated-source/ParserKeywords${n}.cpp) - set_source_files_properties(${PROJECT_BINARY_DIR}/generated-source/ParserKeywords${n}.cpp PROPERTIES GENERATED TRUE) -endforeach( n ) - -set_source_files_properties(${PROJECT_BINARY_DIR}/generated-source/ParserKeywords.cpp PROPERTIES GENERATED TRUE) -set_source_files_properties(${PROJECT_BINARY_DIR}/generated-source/inlcude/opm/parser/eclipse/Parser/ParserKeywords.hpp PROPERTIES GENERATED TRUE) -set_source_files_properties(${PROJECT_BINARY_DIR}/generated-source/inlineKeywordTest.cpp PROPERTIES GENERATED TRUE) - -add_custom_target( generatedCode ALL COMMAND createDefaultKeywordList - ${PROJECT_SOURCE_DIR}/opm/parser/share/keywords - ${PROJECT_BINARY_DIR}/generated-source/ParserKeywords.cpp - ${PROJECT_BINARY_DIR}/generated-source/include/ - opm/parser/eclipse/Parser/ParserKeywords - ${PROJECT_BINARY_DIR}/generated-source/inlineKeywordTest.cpp - ${generated_num_files} - ) - -opm_add_test( runInlineKeywordTest SOURCES ${PROJECT_BINARY_DIR}/generated-source/inlineKeywordTest.cpp - LIBRARIES opmparser ${opm-common_LIBRARIES} ${Boost_LIBRARIES} - ecl - DEPENDS generatedCode ) - -#----------------------------------------------------------------- - -add_library(opmparser ${generated_source} ${state_source} ${rawdeck_source} ${parser_source} ${deck_source} ${unit_source} ${generator_source} ${utility_source}) -add_dependencies( opmparser generatedCode ) -target_link_libraries(opmparser opmjson ${opm-common_LIBRARIES} ${Boost_LIBRARIES} ecl) -set_target_properties(opmparser PROPERTIES VERSION ${opm-parser_VERSION_MAJOR}.${opm-parser_VERSION_MINOR} - SOVERSION ${opm-parser_VERSION_MAJOR}) - -include( ${PROJECT_SOURCE_DIR}/cmake/Modules/install_headers.cmake ) -install_headers( "${HEADER_FILES}" "${CMAKE_INSTALL_PREFIX}" ) -install( TARGETS opmparser DESTINATION ${CMAKE_INSTALL_LIBDIR} ) - -install(FILES ${PROJECT_BINARY_DIR}/generated-source/include/opm/parser/eclipse/Parser/ParserKeywords.hpp - DESTINATION include/opm/parser/eclipse/Parser) -install(DIRECTORY ${PROJECT_BINARY_DIR}/generated-source/include/opm/parser/eclipse/Parser/ParserKeywords - DESTINATION include/opm/parser/eclipse/Parser) - -if (ENABLE_PYTHON) - add_subdirectory( python ) -endif() diff --git a/opm/parser/eclipse/Deck/tests/CMakeLists.txt b/opm/parser/eclipse/Deck/tests/CMakeLists.txt deleted file mode 100644 index d8e441b6b..000000000 --- a/opm/parser/eclipse/Deck/tests/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -foreach(tapp DeckRecordTests DeckIntItemTests DeckDoubleItemTests - DeckStringItemTests DeckTests DeckKeywordTests SectionTests) - opm_add_test(run${tapp} SOURCES ${tapp}.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) -endforeach() diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/CMakeLists.txt b/opm/parser/eclipse/EclipseState/Grid/tests/CMakeLists.txt deleted file mode 100644 index 16e423313..000000000 --- a/opm/parser/eclipse/EclipseState/Grid/tests/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -foreach(tapp EclipseGridTests MULTREGTScannerTests GridPropertyTests - FaceDirTests GridPropertiesTests BoxTests PORVTests - BoxManagerTests TransMultTests FaultTests - EqualRegTests MultiRegTests ADDREGTests CopyRegTests - SatfuncPropertyInitializersTests) - opm_add_test(run${tapp} SOURCES ${tapp}.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) -endforeach() diff --git a/opm/parser/eclipse/EclipseState/IOConfig/tests/CMakeLists.txt b/opm/parser/eclipse/EclipseState/IOConfig/tests/CMakeLists.txt deleted file mode 100644 index f43bdb387..000000000 --- a/opm/parser/eclipse/EclipseState/IOConfig/tests/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -opm_add_test(runIOConfigTests SOURCES IOConfigTest.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) - -opm_add_test(runRestartConfigTests SOURCES RestartConfigTests.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) diff --git a/opm/parser/eclipse/EclipseState/InitConfig/tests/CMakeLists.txt b/opm/parser/eclipse/EclipseState/InitConfig/tests/CMakeLists.txt deleted file mode 100644 index 6d416580c..000000000 --- a/opm/parser/eclipse/EclipseState/InitConfig/tests/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -opm_add_test(runInitConfigTests SOURCES InitConfigTest.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt b/opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt deleted file mode 100644 index 434f5e927..000000000 --- a/opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -foreach(tapp TimeMapTest ScheduleTests WellTests WellPropertiesTests GroupTests - ScheduleEnumTests CompletionTests CompletionSetTests - DynamicStateTests GroupTreeTests TuningTests EventTests - WellSolventTests DynamicVectorTests GeomodifierTests - MessageLimitTests) - opm_add_test(run${tapp} SOURCES ${tapp}.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) -endforeach() diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/tests/CMakeLists.txt b/opm/parser/eclipse/EclipseState/SimulationConfig/tests/CMakeLists.txt deleted file mode 100644 index b539652fc..000000000 --- a/opm/parser/eclipse/EclipseState/SimulationConfig/tests/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -foreach(tapp ThresholdPressureTest SimulationConfigTest) - opm_add_test(run${tapp} SOURCES ${tapp}.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) -endforeach() diff --git a/opm/parser/eclipse/EclipseState/SummaryConfig/tests/CMakeLists.txt b/opm/parser/eclipse/EclipseState/SummaryConfig/tests/CMakeLists.txt deleted file mode 100644 index 9e6dfc3c1..000000000 --- a/opm/parser/eclipse/EclipseState/SummaryConfig/tests/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -opm_add_test(runSummaryConfigTests SOURCES SummaryConfigTests.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) diff --git a/opm/parser/eclipse/EclipseState/Tables/tests/CMakeLists.txt b/opm/parser/eclipse/EclipseState/Tables/tests/CMakeLists.txt deleted file mode 100644 index 8bd5842a2..000000000 --- a/opm/parser/eclipse/EclipseState/Tables/tests/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -foreach(tapp TableManagerTests - TabdimsTests - TableContainerTests - SimpleTableTests - ColumnSchemaTests - TableSchemaTests - TableColumnTests - PvtxTableTests) - - opm_add_test(run${tapp} SOURCES ${tapp}.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) - -endforeach() diff --git a/opm/parser/eclipse/EclipseState/Util/tests/CMakeLists.txt b/opm/parser/eclipse/EclipseState/Util/tests/CMakeLists.txt deleted file mode 100644 index 4eb844dc2..000000000 --- a/opm/parser/eclipse/EclipseState/Util/tests/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -foreach(tapp OrderedMapTests ValueTests) - opm_add_test(run${tapp} SOURCES ${tapp}.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) -endforeach() diff --git a/opm/parser/eclipse/EclipseState/tests/CMakeLists.txt b/opm/parser/eclipse/EclipseState/tests/CMakeLists.txt deleted file mode 100644 index 26a8b744c..000000000 --- a/opm/parser/eclipse/EclipseState/tests/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -foreach(tapp EclipseStateTests Eclipse3DPropertiesTests - RunspecTests) - - opm_add_test(run${tapp} SOURCES ${tapp}.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) - -endforeach() diff --git a/opm/parser/eclipse/Generator/tests/CMakeLists.txt b/opm/parser/eclipse/Generator/tests/CMakeLists.txt deleted file mode 100644 index 24fd5d931..000000000 --- a/opm/parser/eclipse/Generator/tests/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -foreach(tapp KeywordLoaderTests) - opm_add_test(run${tapp} SOURCES ${tapp}.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) -endforeach() diff --git a/opm/parser/eclipse/Parser/tests/CMakeLists.txt b/opm/parser/eclipse/Parser/tests/CMakeLists.txt deleted file mode 100644 index 6c1a0cb58..000000000 --- a/opm/parser/eclipse/Parser/tests/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -foreach(tapp ParserTests ParserKeywordTests ParserRecordTests - ParserItemTests ParserEnumTests ParserIncludeTests ParseContextTests MessageContainerTest) - opm_add_test(run${tapp} SOURCES ${tapp}.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) -endforeach() -if (NOT MSVC) - set_property(SOURCE ParserRecordTests.cpp PROPERTY COMPILE_FLAGS "-Wno-error") -endif() - diff --git a/opm/parser/eclipse/RawDeck/tests/CMakeLists.txt b/opm/parser/eclipse/RawDeck/tests/CMakeLists.txt deleted file mode 100644 index 731dbf747..000000000 --- a/opm/parser/eclipse/RawDeck/tests/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -foreach(tapp StarTokenTests RawRecordTests RawKeywordTests) - opm_add_test(run${tapp} SOURCES ${tapp}.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) -endforeach() diff --git a/opm/parser/eclipse/Units/tests/CMakeLists.txt b/opm/parser/eclipse/Units/tests/CMakeLists.txt deleted file mode 100644 index cba904c02..000000000 --- a/opm/parser/eclipse/Units/tests/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -foreach(tapp UnitTests COMPSEGUnits) - opm_add_test( run${tapp} SOURCES ${tapp}.cpp LIBRARIES opmparser ${Boost_LIBRARIES}) -endforeach() diff --git a/opm/parser/eclipse/Utility/tests/CMakeLists.txt b/opm/parser/eclipse/Utility/tests/CMakeLists.txt deleted file mode 100644 index 9148d2761..000000000 --- a/opm/parser/eclipse/Utility/tests/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -foreach(tapp FunctionalTests StringviewTests StringTests ) - - opm_add_test(run${tapp} SOURCES ${tapp}.cpp - LIBRARIES opmparser ${Boost_LIBRARIES}) - -endforeach() diff --git a/opm/json/JsonObject.cpp b/src/opm/json/JsonObject.cpp similarity index 99% rename from opm/json/JsonObject.cpp rename to src/opm/json/JsonObject.cpp index 8ddc82e1e..764d58128 100644 --- a/opm/json/JsonObject.cpp +++ b/src/opm/json/JsonObject.cpp @@ -27,7 +27,7 @@ #include #include -#include "cjson/cJSON.h" +#include namespace Json { diff --git a/src/opm/parser/eclipse/CMakeLists.txt b/src/opm/parser/eclipse/CMakeLists.txt new file mode 100644 index 000000000..3f93f9f28 --- /dev/null +++ b/src/opm/parser/eclipse/CMakeLists.txt @@ -0,0 +1,351 @@ +project(opm-parser-eclipse CXX) + +add_executable(genkw Parser/createDefaultKeywordList.cpp + Deck/Deck.cpp + Deck/DeckItem.cpp + Deck/DeckKeyword.cpp + Deck/DeckRecord.cpp + Generator/KeywordGenerator.cpp + Generator/KeywordLoader.cpp + Parser/MessageContainer.cpp + Parser/ParseContext.cpp + Parser/ParserEnums.cpp + Parser/ParserItem.cpp + Parser/ParserKeyword.cpp + Parser/ParserRecord.cpp + RawDeck/RawKeyword.cpp + RawDeck/RawRecord.cpp + RawDeck/StarToken.cpp + Units/Dimension.cpp + Units/UnitSystem.cpp + Utility/Stringview.cpp +) + +target_link_libraries(genkw opmjson ecl boost_regex) +target_include_directories(genkw PRIVATE include) + +file(GLOB_RECURSE keyword_templates share/keywords/*) +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ParserKeywords.cpp + ${CMAKE_CURRENT_BINARY_DIR}/ParserKeywords0.cpp + ${CMAKE_CURRENT_BINARY_DIR}/ParserKeywords1.cpp + ${CMAKE_CURRENT_BINARY_DIR}/ParserKeywords2.cpp + ${CMAKE_CURRENT_BINARY_DIR}/ParserKeywords3.cpp + ${CMAKE_CURRENT_BINARY_DIR}/inlinekw.cpp + COMMAND genkw ${PROJECT_SOURCE_DIR}/share/keywords + ${CMAKE_CURRENT_BINARY_DIR}/ParserKeywords.cpp + ${CMAKE_CURRENT_BINARY_DIR}/include/ + opm/parser/eclipse/Parser/ParserKeywords + ${CMAKE_CURRENT_BINARY_DIR}/inlinekw.cpp + 4 + DEPENDS genkw +) + +#----------------------------------------------------------------- + +add_library(opmparser ${CMAKE_CURRENT_BINARY_DIR}/ParserKeywords.cpp + ${CMAKE_CURRENT_BINARY_DIR}/ParserKeywords0.cpp + ${CMAKE_CURRENT_BINARY_DIR}/ParserKeywords1.cpp + ${CMAKE_CURRENT_BINARY_DIR}/ParserKeywords2.cpp + ${CMAKE_CURRENT_BINARY_DIR}/ParserKeywords3.cpp + Deck/Deck.cpp + Deck/DeckItem.cpp + Deck/DeckKeyword.cpp + Deck/DeckRecord.cpp + Deck/Section.cpp + EclipseState/checkDeck.cpp + EclipseState/Eclipse3DProperties.cpp + EclipseState/EclipseConfig.cpp + EclipseState/EclipseState.cpp + EclipseState/EndpointScaling.cpp + EclipseState/Grid/Box.cpp + EclipseState/Grid/BoxManager.cpp + EclipseState/Grid/EclipseGrid.cpp + EclipseState/Grid/FaceDir.cpp + EclipseState/Grid/FaultCollection.cpp + EclipseState/Grid/Fault.cpp + EclipseState/Grid/FaultFace.cpp + EclipseState/Grid/GridDims.cpp + EclipseState/Grid/GridProperties.cpp + EclipseState/Grid/GridProperty.cpp + EclipseState/Grid/MULTREGTScanner.cpp + EclipseState/Grid/NNC.cpp + EclipseState/Grid/PinchMode.cpp + EclipseState/Grid/SatfuncPropertyInitializers.cpp + EclipseState/Grid/TransMult.cpp + EclipseState/InitConfig/Equil.cpp + EclipseState/InitConfig/InitConfig.cpp + EclipseState/IOConfig/IOConfig.cpp + EclipseState/IOConfig/RestartConfig.cpp + EclipseState/Runspec.cpp + EclipseState/Schedule/Completion.cpp + EclipseState/Schedule/CompletionSet.cpp + EclipseState/Schedule/Events.cpp + EclipseState/Schedule/Group.cpp + EclipseState/Schedule/GroupTree.cpp + EclipseState/Schedule/MessageLimits.cpp + EclipseState/Schedule/MSW/Compsegs.cpp + EclipseState/Schedule/MSW/Segment.cpp + EclipseState/Schedule/MSW/SegmentSet.cpp + EclipseState/Schedule/OilVaporizationProperties.cpp + EclipseState/Schedule/Schedule.cpp + EclipseState/Schedule/ScheduleEnums.cpp + EclipseState/Schedule/TimeMap.cpp + EclipseState/Schedule/Tuning.cpp + EclipseState/Schedule/Well.cpp + EclipseState/Schedule/WellEconProductionLimits.cpp + EclipseState/Schedule/WellInjectionProperties.cpp + EclipseState/Schedule/WellPolymerProperties.cpp + EclipseState/Schedule/WellProductionProperties.cpp + EclipseState/SimulationConfig/SimulationConfig.cpp + EclipseState/SimulationConfig/ThresholdPressure.cpp + EclipseState/SummaryConfig/SummaryConfig.cpp + EclipseState/Tables/ColumnSchema.cpp + EclipseState/Tables/JFunc.cpp + EclipseState/Tables/PvtxTable.cpp + EclipseState/Tables/SimpleTable.cpp + EclipseState/Tables/TableColumn.cpp + EclipseState/Tables/TableContainer.cpp + EclipseState/Tables/TableIndex.cpp + EclipseState/Tables/TableManager.cpp + EclipseState/Tables/TableSchema.cpp + EclipseState/Tables/Tables.cpp + EclipseState/Tables/VFPInjTable.cpp + EclipseState/Tables/VFPProdTable.cpp + Parser/MessageContainer.cpp + Parser/ParseContext.cpp + Parser/Parser.cpp + Parser/ParserEnums.cpp + Parser/ParserItem.cpp + Parser/ParserKeyword.cpp + Parser/ParserRecord.cpp + RawDeck/RawKeyword.cpp + RawDeck/RawRecord.cpp + RawDeck/StarToken.cpp + Units/Dimension.cpp + Units/UnitSystem.cpp + Utility/Functional.cpp + Utility/Stringview.cpp +) + +target_link_libraries(opmparser PUBLIC opmjson + ecl + boost_filesystem + boost_system + boost_regex + boost_date_time) +target_compile_definitions(opmparser PRIVATE -DOPM_PARSER_DECK_API=1) +target_include_directories(opmparser + PUBLIC $ + $ + $ + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/include +) + +install(TARGETS opmparser + EXPORT opm-parser-config + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +install(DIRECTORY include/ DESTINATION include) +install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ + DESTINATION include + PATTERN *.hpp +) + +set_target_properties(opmparser PROPERTIES + VERSION ${opm-parser_VERSION_MAJOR}.${opm-parser_VERSION_MINOR} + SOVERSION ${opm-parser_VERSION_MAJOR} +) + +if (NOT BUILD_TESTING) + return () +endif () + +set(_testdir ${CMAKE_CURRENT_SOURCE_DIR}/tests/data) + +add_executable(inlinekw ${CMAKE_CURRENT_BINARY_DIR}/inlinekw.cpp) +target_link_libraries(inlinekw opmparser boost_test) +add_test(NAME InlineKeywordTest COMMAND inlinekw) + +add_executable(LoaderTest tests/KeywordLoaderTests.cpp Generator/KeywordLoader.cpp) +target_link_libraries(LoaderTest opmparser boost_test) +add_test(NAME LoaderTest + COMMAND LoaderTest ${_testdir}/parser/keyword-generator/) + +add_executable(ParserTests tests/ParserTests.cpp) +target_link_libraries(ParserTests opmparser boost_test) +add_test(NAME ParserTests COMMAND ParserTests ${_testdir}/) + +add_executable(ParserIncludeTests tests/ParserIncludeTests.cpp) +target_compile_definitions(ParserIncludeTests PRIVATE + -DHAVE_CASE_SENSITIVE_FILESYSTEM=${HAVE_CASE_SENSITIVE_FILESYSTEM} +) +target_link_libraries(ParserIncludeTests opmparser boost_test) +add_test(NAME ParserIncludeTests COMMAND ParserIncludeTests ${_testdir}/parser/) + +add_executable(PvtxTableTests tests/PvtxTableTests.cpp) +target_link_libraries(PvtxTableTests opmparser boost_test) +add_test(NAME PvtxTableTests + COMMAND PvtxTableTests ${_testdir}/integration_tests/) + +add_executable(EclipseStateTests tests/EclipseStateTests.cpp) +target_link_libraries(EclipseStateTests opmparser boost_test) +add_test(NAME EclipseStateTests + COMMAND EclipseStateTests ${_testdir}/integration_tests/) + +foreach(test ADDREGTests + BoxManagerTests + BoxTests + ColumnSchemaTests + CompletionSetTests + CompletionTests + COMPSEGUnits + CopyRegTests + DeckDoubleItemTests + DeckIntItemTests + DeckKeywordTests + DeckRecordTests + DeckStringItemTests + DeckTests + DynamicStateTests + DynamicVectorTests + Eclipse3DPropertiesTests + EclipseGridTests + EqualRegTests + EventTests + FaceDirTests + FaultTests + FunctionalTests + GeomodifierTests + GridPropertiesTests + GridPropertyTests + GroupTests + GroupTreeTests + InitConfigTest + IOConfigTests + MessageContainerTest + MessageLimitTests + MultiRegTests + MULTREGTScannerTests + OrderedMapTests + ParseContextTests + ParserEnumTests + ParserItemTests + ParserKeywordTests + ParserRecordTests + PORVTests + RawKeywordTests + RawRecordTests + RestartConfigTests + RunspecTests + SatfuncPropertyInitializersTests + ScheduleEnumTests + ScheduleTests + SectionTests + SimpleTableTests + SimulationConfigTest + StarTokenTests + StringTests + StringviewTests + SummaryConfigTests + TabdimsTests + TableColumnTests + TableContainerTests + TableManagerTests + TableSchemaTests + ThresholdPressureTest + TimeMapTest + TransMultTests + TuningTests + UnitTests + ValueTests + WellPropertiesTests + WellSolventTests + WellTests +) + add_executable(${test} tests/${test}.cpp) + target_link_libraries(${test} opmparser boost_test) + add_test(NAME ${test} COMMAND ${test}) +endforeach () + +foreach (test BoxTest + CheckDeckValidity + CompletionsFromDeck + EclipseGridCreateFromDeck + IncludeTest + IntegrationTests + IOConfigIntegrationTest + NNCTests + ParseCECON + ParseCOORDSYS + ParseDATAWithDefault + ParseDEBUG + ParseDENSITY + ParseEND + ParseEQUIL + ParseGRUPRIG + ParseLGR + ParseMiscible + ParseMULTREGT + ParseMULTSEGWELL + ParsePLYADSS + ParsePLYDHFLF + ParsePLYSHLOG + ParsePLYVISC + ParsePORO + ParsePRORDER + ParsePVTG + ParsePVTO + ParseRSVD + ParseSGOF + ParseSLGOF + ParseSWOF + ParseTITLE + ParseTOPS + ParseTRACERS + ParseTUNINGDP + ParseTVDP + ParseVFPPROD + ParseWCONHIST + ParseWDFACCOR + ParseWEFAC + ParseWellProbe + ParseWellWithWildcards + ParseWORKLIM + Polymer + ResinsightTest + ScheduleCreateFromDeck + TransMultIntegrationTests +) + add_executable(${test} IntegrationTests/${test}.cpp) + target_link_libraries(${test} opmparser boost_test) + add_test(NAME ${test} COMMAND ${test} ${_testdir}/integration_tests/) +endforeach () + +if (NOT HAVE_OPM_DATA) + return () +endif () + +foreach (deck ${OPM_DATA_ROOT}/norne/NORNE_ATW2013.DATA + ${OPM_DATA_ROOT}/solvent_test_suite/SPE1CASE2_SOLVENT.DATA + ${OPM_DATA_ROOT}/solvent_test_suite/SPE9_CP_SOLVENT_CO2.DATA + ${OPM_DATA_ROOT}/solvent_test_suite/SPE5CASE1.DATA + ${OPM_DATA_ROOT}/polymer_test_suite/simple2D/2D_THREEPHASE_POLY_HETER.DATA + ${OPM_DATA_ROOT}/spe1/SPE1CASE1.DATA + ${OPM_DATA_ROOT}/spe1/SPE1CASE2.DATA + ${OPM_DATA_ROOT}/spe1/SPE1CASE2_FAMII.DATA + ${OPM_DATA_ROOT}/spe1/SPE1CASE2_SLGOF.DATA + ${OPM_DATA_ROOT}/spe3/SPE3CASE1.DATA + ${OPM_DATA_ROOT}/spe3/SPE3CASE2.DATA + ${OPM_DATA_ROOT}/spe9/SPE9_CP.DATA + ${OPM_DATA_ROOT}/spe9/SPE9_CP_GROUP.DATA + ${OPM_DATA_ROOT}/spe9/SPE9.DATA + ${OPM_DATA_ROOT}/spe10model1/SPE10_MODEL1.DATA + ${OPM_DATA_ROOT}/spe10model2/SPE10_MODEL2.DATA + ${OPM_DATA_ROOT}/msw_2d_h/2D_H__.DATA ) + get_filename_component(test_name ${deck} NAME_WE) + add_test(NAME ${test_name} COMMAND opmi ${deck}) +endforeach() +set_property(TEST NORNE_ATW2013 + PROPERTY ENVIRONMENT "OPM_ERRORS_IGNORE=PARSE_RANDOM_SLASH") diff --git a/opm/parser/eclipse/Deck/Deck.cpp b/src/opm/parser/eclipse/Deck/Deck.cpp similarity index 100% rename from opm/parser/eclipse/Deck/Deck.cpp rename to src/opm/parser/eclipse/Deck/Deck.cpp diff --git a/opm/parser/eclipse/Deck/DeckItem.cpp b/src/opm/parser/eclipse/Deck/DeckItem.cpp similarity index 100% rename from opm/parser/eclipse/Deck/DeckItem.cpp rename to src/opm/parser/eclipse/Deck/DeckItem.cpp diff --git a/opm/parser/eclipse/Deck/DeckKeyword.cpp b/src/opm/parser/eclipse/Deck/DeckKeyword.cpp similarity index 95% rename from opm/parser/eclipse/Deck/DeckKeyword.cpp rename to src/opm/parser/eclipse/Deck/DeckKeyword.cpp index eda3d30e2..6a3dbeb82 100644 --- a/opm/parser/eclipse/Deck/DeckKeyword.cpp +++ b/src/opm/parser/eclipse/Deck/DeckKeyword.cpp @@ -17,9 +17,9 @@ along with OPM. If not, see . */ -#include "DeckKeyword.hpp" -#include "DeckRecord.hpp" -#include "DeckItem.hpp" +#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/Deck/DeckRecord.cpp b/src/opm/parser/eclipse/Deck/DeckRecord.cpp similarity index 100% rename from opm/parser/eclipse/Deck/DeckRecord.cpp rename to src/opm/parser/eclipse/Deck/DeckRecord.cpp diff --git a/opm/parser/eclipse/Deck/Section.cpp b/src/opm/parser/eclipse/Deck/Section.cpp similarity index 100% rename from opm/parser/eclipse/Deck/Section.cpp rename to src/opm/parser/eclipse/Deck/Section.cpp diff --git a/opm/parser/eclipse/EclipseState/Eclipse3DProperties.cpp b/src/opm/parser/eclipse/EclipseState/Eclipse3DProperties.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Eclipse3DProperties.cpp rename to src/opm/parser/eclipse/EclipseState/Eclipse3DProperties.cpp diff --git a/opm/parser/eclipse/EclipseState/EclipseConfig.cpp b/src/opm/parser/eclipse/EclipseState/EclipseConfig.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/EclipseConfig.cpp rename to src/opm/parser/eclipse/EclipseState/EclipseConfig.cpp diff --git a/opm/parser/eclipse/EclipseState/EclipseState.cpp b/src/opm/parser/eclipse/EclipseState/EclipseState.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/EclipseState.cpp rename to src/opm/parser/eclipse/EclipseState/EclipseState.cpp diff --git a/opm/parser/eclipse/EclipseState/EndpointScaling.cpp b/src/opm/parser/eclipse/EclipseState/EndpointScaling.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/EndpointScaling.cpp rename to src/opm/parser/eclipse/EclipseState/EndpointScaling.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/Box.cpp b/src/opm/parser/eclipse/EclipseState/Grid/Box.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/Box.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/Box.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/BoxManager.cpp b/src/opm/parser/eclipse/EclipseState/Grid/BoxManager.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/BoxManager.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/BoxManager.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp b/src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/FaceDir.cpp b/src/opm/parser/eclipse/EclipseState/Grid/FaceDir.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/FaceDir.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/FaceDir.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/Fault.cpp b/src/opm/parser/eclipse/EclipseState/Grid/Fault.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/Fault.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/Fault.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp b/src/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/FaultFace.cpp b/src/opm/parser/eclipse/EclipseState/Grid/FaultFace.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/FaultFace.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/FaultFace.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/GridDims.cpp b/src/opm/parser/eclipse/EclipseState/Grid/GridDims.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/GridDims.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/GridDims.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/GridProperties.cpp b/src/opm/parser/eclipse/EclipseState/Grid/GridProperties.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/GridProperties.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/GridProperties.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/GridProperty.cpp b/src/opm/parser/eclipse/EclipseState/Grid/GridProperty.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/GridProperty.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/GridProperty.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp b/src/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/NNC.cpp b/src/opm/parser/eclipse/EclipseState/Grid/NNC.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/NNC.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/NNC.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/PinchMode.cpp b/src/opm/parser/eclipse/EclipseState/Grid/PinchMode.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/PinchMode.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/PinchMode.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp b/src/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp b/src/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/TransMult.cpp rename to src/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp diff --git a/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp b/src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp rename to src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp diff --git a/opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.cpp b/src/opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.cpp rename to src/opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.cpp diff --git a/opm/parser/eclipse/EclipseState/InitConfig/Equil.cpp b/src/opm/parser/eclipse/EclipseState/InitConfig/Equil.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/InitConfig/Equil.cpp rename to src/opm/parser/eclipse/EclipseState/InitConfig/Equil.cpp diff --git a/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp b/src/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp rename to src/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp diff --git a/opm/parser/eclipse/EclipseState/Runspec.cpp b/src/opm/parser/eclipse/EclipseState/Runspec.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Runspec.cpp rename to src/opm/parser/eclipse/EclipseState/Runspec.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Completion.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Completion.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Completion.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Completion.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/CompletionSet.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/CompletionSet.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/CompletionSet.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/CompletionSet.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Events.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Events.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Events.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Events.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Group.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Group.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Group.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/GroupTree.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/GroupTree.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/GroupTree.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/GroupTree.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/MSW/SegmentSet.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/MSW/SegmentSet.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/MSW/SegmentSet.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/MSW/SegmentSet.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/MessageLimits.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/MessageLimits.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/MessageLimits.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/MessageLimits.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Well.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/WellEconProductionLimits.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/WellEconProductionLimits.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/WellEconProductionLimits.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/WellEconProductionLimits.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/WellInjectionProperties.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/WellInjectionProperties.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/WellInjectionProperties.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/WellInjectionProperties.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/WellPolymerProperties.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/WellPolymerProperties.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/WellPolymerProperties.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/WellPolymerProperties.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/WellProductionProperties.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/WellProductionProperties.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/WellProductionProperties.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/WellProductionProperties.cpp diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp b/src/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp rename to src/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp b/src/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp rename to src/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp diff --git a/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp b/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp rename to src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.cpp b/src/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/ColumnSchema.cpp rename to src/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/JFunc.cpp b/src/opm/parser/eclipse/EclipseState/Tables/JFunc.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/JFunc.cpp rename to src/opm/parser/eclipse/EclipseState/Tables/JFunc.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PvtxTable.cpp b/src/opm/parser/eclipse/EclipseState/Tables/PvtxTable.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PvtxTable.cpp rename to src/opm/parser/eclipse/EclipseState/Tables/PvtxTable.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp b/src/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp rename to src/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/TableColumn.cpp b/src/opm/parser/eclipse/EclipseState/Tables/TableColumn.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/TableColumn.cpp rename to src/opm/parser/eclipse/EclipseState/Tables/TableColumn.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/TableContainer.cpp b/src/opm/parser/eclipse/EclipseState/Tables/TableContainer.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/TableContainer.cpp rename to src/opm/parser/eclipse/EclipseState/Tables/TableContainer.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/TableIndex.cpp b/src/opm/parser/eclipse/EclipseState/Tables/TableIndex.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/TableIndex.cpp rename to src/opm/parser/eclipse/EclipseState/Tables/TableIndex.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp b/src/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/TableManager.cpp rename to src/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/TableSchema.cpp b/src/opm/parser/eclipse/EclipseState/Tables/TableSchema.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/TableSchema.cpp rename to src/opm/parser/eclipse/EclipseState/Tables/TableSchema.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/Tables.cpp b/src/opm/parser/eclipse/EclipseState/Tables/Tables.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/Tables.cpp rename to src/opm/parser/eclipse/EclipseState/Tables/Tables.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.cpp b/src/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/VFPInjTable.cpp rename to src/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.cpp b/src/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/VFPProdTable.cpp rename to src/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.cpp diff --git a/opm/parser/eclipse/EclipseState/checkDeck.cpp b/src/opm/parser/eclipse/EclipseState/checkDeck.cpp similarity index 97% rename from opm/parser/eclipse/EclipseState/checkDeck.cpp rename to src/opm/parser/eclipse/EclipseState/checkDeck.cpp index 0807d2a7a..17e5cf3ff 100644 --- a/opm/parser/eclipse/EclipseState/checkDeck.cpp +++ b/src/opm/parser/eclipse/EclipseState/checkDeck.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#include "checkDeck.hpp" +#include #include #include diff --git a/opm/parser/eclipse/Generator/KeywordGenerator.cpp b/src/opm/parser/eclipse/Generator/KeywordGenerator.cpp similarity index 100% rename from opm/parser/eclipse/Generator/KeywordGenerator.cpp rename to src/opm/parser/eclipse/Generator/KeywordGenerator.cpp diff --git a/opm/parser/eclipse/Generator/KeywordLoader.cpp b/src/opm/parser/eclipse/Generator/KeywordLoader.cpp similarity index 100% rename from opm/parser/eclipse/Generator/KeywordLoader.cpp rename to src/opm/parser/eclipse/Generator/KeywordLoader.cpp diff --git a/opm/parser/eclipse/IntegrationTests/BoxTest.cpp b/src/opm/parser/eclipse/IntegrationTests/BoxTest.cpp similarity index 90% rename from opm/parser/eclipse/IntegrationTests/BoxTest.cpp rename to src/opm/parser/eclipse/IntegrationTests/BoxTest.cpp index 86f6f402c..9943044c9 100644 --- a/opm/parser/eclipse/IntegrationTests/BoxTest.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/BoxTest.cpp @@ -35,6 +35,10 @@ using namespace Opm; +inline std::string prefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + inline EclipseState makeState(const std::string& fileName) { Parser parser; boost::filesystem::path boxFile(fileName); @@ -42,10 +46,8 @@ inline EclipseState makeState(const std::string& fileName) { return EclipseState( deck, ParseContext() ); } - - BOOST_AUTO_TEST_CASE( PERMX ) { - EclipseState state = makeState( "testdata/integration_tests/BOX/BOXTEST1" ); + EclipseState state = makeState( prefix() + "BOX/BOXTEST1" ); const auto& permx = state.get3DProperties().getDoubleGridProperty( "PERMX" ); const auto& permy = state.get3DProperties().getDoubleGridProperty( "PERMY" ); const auto& permz = state.get3DProperties().getDoubleGridProperty( "PERMZ" ); @@ -67,7 +69,7 @@ BOOST_AUTO_TEST_CASE( PERMX ) { BOOST_AUTO_TEST_CASE( PARSE_BOX_OK ) { - EclipseState state = makeState( "testdata/integration_tests/BOX/BOXTEST1" ); + EclipseState state = makeState( prefix() + "BOX/BOXTEST1" ); const auto& satnum = state.get3DProperties().getIntGridProperty( "SATNUM" ); { size_t i, j, k; @@ -89,7 +91,7 @@ BOOST_AUTO_TEST_CASE( PARSE_BOX_OK ) { } BOOST_AUTO_TEST_CASE( PARSE_MULTIPLY_COPY ) { - EclipseState state = makeState( "testdata/integration_tests/BOX/BOXTEST1" ); + EclipseState state = makeState( prefix() + "BOX/BOXTEST1" ); const auto& satnum = state.get3DProperties().getIntGridProperty( "SATNUM" ); const auto& fipnum = state.get3DProperties().getIntGridProperty( "FIPNUM" ); size_t i, j, k; @@ -114,11 +116,11 @@ BOOST_AUTO_TEST_CASE( PARSE_MULTIPLY_COPY ) { BOOST_AUTO_TEST_CASE( KEYWORD_BOX_TOO_SMALL) { - BOOST_CHECK_THROW( makeState("testdata/integration_tests/BOX/BOXTEST3") , std::invalid_argument); + BOOST_CHECK_THROW( makeState(prefix() + "BOX/BOXTEST3") , std::invalid_argument); } BOOST_AUTO_TEST_CASE( EQUALS ) { - EclipseState state = makeState( "testdata/integration_tests/BOX/BOXTEST1" ); + EclipseState state = makeState( prefix() + "BOX/BOXTEST1" ); const auto& pvtnum = state.get3DProperties().getIntGridProperty( "PVTNUM" ); const auto& eqlnum = state.get3DProperties().getIntGridProperty( "EQLNUM" ); const auto& poro = state.get3DProperties().getDoubleGridProperty( "PORO" ); @@ -140,7 +142,7 @@ BOOST_AUTO_TEST_CASE( EQUALS ) { BOOST_AUTO_TEST_CASE( OPERATE ) { - EclipseState state = makeState( "testdata/integration_tests/BOX/BOXTEST1" ); + EclipseState state = makeState( prefix() + "BOX/BOXTEST1" ); const auto& ntg = state.get3DProperties().getDoubleGridProperty( "NTG" ); BOOST_CHECK_EQUAL( ntg.iget( 0,0,0) , 8.50 ); // MULTA diff --git a/opm/parser/eclipse/IntegrationTests/CMakeLists.txt b/src/opm/parser/eclipse/IntegrationTests/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/IntegrationTests/CMakeLists.txt rename to src/opm/parser/eclipse/IntegrationTests/CMakeLists.txt diff --git a/opm/parser/eclipse/IntegrationTests/CheckDeckValidity.cpp b/src/opm/parser/eclipse/IntegrationTests/CheckDeckValidity.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/CheckDeckValidity.cpp rename to src/opm/parser/eclipse/IntegrationTests/CheckDeckValidity.cpp diff --git a/opm/parser/eclipse/IntegrationTests/CompletionsFromDeck.cpp b/src/opm/parser/eclipse/IntegrationTests/CompletionsFromDeck.cpp similarity index 96% rename from opm/parser/eclipse/IntegrationTests/CompletionsFromDeck.cpp rename to src/opm/parser/eclipse/IntegrationTests/CompletionsFromDeck.cpp index 88f7a49f9..1c506820e 100644 --- a/opm/parser/eclipse/IntegrationTests/CompletionsFromDeck.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/CompletionsFromDeck.cpp @@ -32,10 +32,14 @@ using namespace Opm; +inline std::string prefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + BOOST_AUTO_TEST_CASE( CreateCompletionsFromKeyword ) { Parser parser; - const auto scheduleFile = "testdata/integration_tests/SCHEDULE/SCHEDULE_COMPDAT1"; + const auto scheduleFile = prefix() + "SCHEDULE/SCHEDULE_COMPDAT1"; auto deck = parser.parseFile(scheduleFile, ParseContext()); EclipseGrid grid(10,10,10); TableManager table ( deck ); diff --git a/opm/parser/eclipse/IntegrationTests/EclipseGridCreateFromDeck.cpp b/src/opm/parser/eclipse/IntegrationTests/EclipseGridCreateFromDeck.cpp similarity index 89% rename from opm/parser/eclipse/IntegrationTests/EclipseGridCreateFromDeck.cpp rename to src/opm/parser/eclipse/IntegrationTests/EclipseGridCreateFromDeck.cpp index 72a5b9d53..2e446e61f 100644 --- a/opm/parser/eclipse/IntegrationTests/EclipseGridCreateFromDeck.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/EclipseGridCreateFromDeck.cpp @@ -35,10 +35,13 @@ using namespace Opm; +inline std::string prefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} BOOST_AUTO_TEST_CASE(CreateCPGrid) { Parser parser; - boost::filesystem::path scheduleFile("testdata/integration_tests/GRID/CORNERPOINT.DATA"); + boost::filesystem::path scheduleFile(prefix() + "GRID/CORNERPOINT.DATA"); auto deck = parser.parseFile(scheduleFile.string(), ParseContext()); EclipseState es(deck, ParseContext()); const auto& grid = es.getInputGrid(); @@ -52,7 +55,7 @@ BOOST_AUTO_TEST_CASE(CreateCPGrid) { BOOST_AUTO_TEST_CASE(CreateCPActnumGrid) { Parser parser; - boost::filesystem::path scheduleFile("testdata/integration_tests/GRID/CORNERPOINT_ACTNUM.DATA"); + boost::filesystem::path scheduleFile(prefix() + "GRID/CORNERPOINT_ACTNUM.DATA"); auto deck = parser.parseFile(scheduleFile.string(), ParseContext()); EclipseState es(deck, ParseContext()); const auto& grid = es.getInputGrid(); @@ -66,7 +69,7 @@ BOOST_AUTO_TEST_CASE(CreateCPActnumGrid) { BOOST_AUTO_TEST_CASE(ExportFromCPGridAllActive) { Parser parser; - boost::filesystem::path scheduleFile("testdata/integration_tests/GRID/CORNERPOINT.DATA"); + boost::filesystem::path scheduleFile(prefix() + "GRID/CORNERPOINT.DATA"); auto deck = parser.parseFile(scheduleFile.string(), ParseContext()); EclipseState es(deck, ParseContext()); const auto& grid = es.getInputGrid(); @@ -83,7 +86,7 @@ BOOST_AUTO_TEST_CASE(ExportFromCPGridAllActive) { BOOST_AUTO_TEST_CASE(ExportFromCPGridACTNUM) { Parser parser; - boost::filesystem::path scheduleFile("testdata/integration_tests/GRID/CORNERPOINT_ACTNUM.DATA"); + boost::filesystem::path scheduleFile(prefix() + "GRID/CORNERPOINT_ACTNUM.DATA"); auto deck = parser.parseFile(scheduleFile.string(), ParseContext()); EclipseState es(deck, ParseContext()); auto& grid = es.getInputGrid(); diff --git a/opm/parser/eclipse/IntegrationTests/IOConfigIntegrationTest.cpp b/src/opm/parser/eclipse/IntegrationTests/IOConfigIntegrationTest.cpp similarity index 98% rename from opm/parser/eclipse/IntegrationTests/IOConfigIntegrationTest.cpp rename to src/opm/parser/eclipse/IntegrationTests/IOConfigIntegrationTest.cpp index 28070ec44..8a94881e5 100644 --- a/opm/parser/eclipse/IntegrationTests/IOConfigIntegrationTest.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/IOConfigIntegrationTest.cpp @@ -36,6 +36,10 @@ using namespace Opm; +inline std::string prefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + inline void verifyRestartConfig( const RestartConfig& rst, std::vector>& rptConfig) { for (auto rptrst : rptConfig) { @@ -296,7 +300,7 @@ BOOST_AUTO_TEST_CASE( NorneRestartConfig ) { rptConfig.push_back( std::make_tuple(241 , true , boost::gregorian::date( 2006,10,10)) ); - auto state = Parser::parse("testdata/integration_tests/IOConfig/RPTRST_DECK.DATA"); + auto state = Parser::parse(prefix() + "IOConfig/RPTRST_DECK.DATA"); verifyRestartConfig(state.cfg().restart(), rptConfig); } @@ -337,7 +341,7 @@ BOOST_AUTO_TEST_CASE( RestartConfig2 ) { ParseContext parseContext; Parser parser; - auto deck = parser.parseFile("testdata/integration_tests/IOConfig/RPT_TEST2.DATA", parseContext); + auto deck = parser.parseFile(prefix() + "IOConfig/RPT_TEST2.DATA", parseContext); EclipseState state( deck , parseContext ); const auto& rstConfig = state.cfg().restart(); verifyRestartConfig( rstConfig, rptConfig ); @@ -350,6 +354,6 @@ BOOST_AUTO_TEST_CASE( RestartConfig2 ) { BOOST_AUTO_TEST_CASE( SPE9END ) { ParseContext parseContext; Parser parser; - auto deck = parser.parseFile("testdata/integration_tests/IOConfig/SPE9_END.DATA", parseContext); + auto deck = parser.parseFile(prefix() + "IOConfig/SPE9_END.DATA", parseContext); BOOST_CHECK_NO_THROW( EclipseState state( deck , parseContext ) ); } diff --git a/opm/parser/eclipse/IntegrationTests/IncludeTest.cpp b/src/opm/parser/eclipse/IntegrationTests/IncludeTest.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/IncludeTest.cpp rename to src/opm/parser/eclipse/IntegrationTests/IncludeTest.cpp diff --git a/opm/parser/eclipse/IntegrationTests/IntegrationTests.cpp b/src/opm/parser/eclipse/IntegrationTests/IntegrationTests.cpp similarity index 91% rename from opm/parser/eclipse/IntegrationTests/IntegrationTests.cpp rename to src/opm/parser/eclipse/IntegrationTests/IntegrationTests.cpp index f1165c71b..f18f72a7b 100644 --- a/opm/parser/eclipse/IntegrationTests/IntegrationTests.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/IntegrationTests.cpp @@ -35,6 +35,10 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + namespace { std::unique_ptr< ParserKeyword > createFixedSized(const std::string& kw , size_t size) { @@ -67,7 +71,7 @@ Parser createWWCTParser() { } BOOST_AUTO_TEST_CASE(parse_fileWithWWCTKeyword_deckReturned) { - boost::filesystem::path singleKeywordFile("testdata/integration_tests/wwct.data"); + boost::filesystem::path singleKeywordFile(pathprefix() + "wwct.data"); auto parser = createWWCTParser(); BOOST_CHECK( parser.isRecognizedKeyword("WWCT")); BOOST_CHECK( parser.isRecognizedKeyword("SUMMARY")); @@ -103,7 +107,7 @@ BOOST_AUTO_TEST_CASE(parse_streamWithWWCTKeyword_deckReturned) { } BOOST_AUTO_TEST_CASE(parse_fileWithWWCTKeyword_deckHasWWCT) { - boost::filesystem::path singleKeywordFile("testdata/integration_tests/wwct.data"); + boost::filesystem::path singleKeywordFile(pathprefix() + "wwct.data"); auto parser = createWWCTParser(); auto deck = parser.parseFile(singleKeywordFile.string(), ParseContext()); BOOST_CHECK(deck.hasKeyword("SUMMARY")); @@ -111,7 +115,7 @@ BOOST_AUTO_TEST_CASE(parse_fileWithWWCTKeyword_deckHasWWCT) { } BOOST_AUTO_TEST_CASE(parse_fileWithWWCTKeyword_dataIsCorrect) { - boost::filesystem::path singleKeywordFile("testdata/integration_tests/wwct.data"); + boost::filesystem::path singleKeywordFile(pathprefix() + "wwct.data"); auto parser = createWWCTParser(); auto deck = parser.parseFile(singleKeywordFile.string(), ParseContext()); BOOST_CHECK_EQUAL("WELL-1", deck.getKeyword("WWCT" , 0).getRecord(0).getItem(0).get< std::string >(0)); @@ -152,14 +156,14 @@ static Parser createBPRParser() { } BOOST_AUTO_TEST_CASE(parse_fileWithBPRKeyword_deckReturned) { - boost::filesystem::path singleKeywordFile("testdata/integration_tests/bpr.data"); + boost::filesystem::path singleKeywordFile(pathprefix() + "bpr.data"); auto parser = createBPRParser(); BOOST_CHECK_NO_THROW(parser.parseFile(singleKeywordFile.string(), ParseContext())); } BOOST_AUTO_TEST_CASE(parse_fileWithBPRKeyword_DeckhasBRP) { - boost::filesystem::path singleKeywordFile("testdata/integration_tests/bpr.data"); + boost::filesystem::path singleKeywordFile(pathprefix() + "bpr.data"); auto parser = createBPRParser(); auto deck = parser.parseFile(singleKeywordFile.string(), ParseContext()); @@ -168,7 +172,7 @@ BOOST_AUTO_TEST_CASE(parse_fileWithBPRKeyword_DeckhasBRP) { } BOOST_AUTO_TEST_CASE(parse_fileWithBPRKeyword_dataiscorrect) { - boost::filesystem::path singleKeywordFile("testdata/integration_tests/bpr.data"); + boost::filesystem::path singleKeywordFile(pathprefix() + "bpr.data"); auto parser = createBPRParser(); auto deck = parser.parseFile(singleKeywordFile.string(), ParseContext()); @@ -193,7 +197,7 @@ BOOST_AUTO_TEST_CASE(parse_fileWithBPRKeyword_dataiscorrect) { /***************** Testing non-recognized keywords ********************/ BOOST_AUTO_TEST_CASE(parse_unknownkeyword_exceptionthrown) { Parser parser; - BOOST_CHECK_THROW( parser.parseFile("testdata/integration_tests/someobscureelements.data", ParseContext()), std::invalid_argument); + BOOST_CHECK_THROW( parser.parseFile(pathprefix() + "someobscureelements.data", ParseContext()), std::invalid_argument); } /*********************Testing truncated (default) records ***************************/ @@ -202,7 +206,7 @@ BOOST_AUTO_TEST_CASE(parse_unknownkeyword_exceptionthrown) { // Datafile contains 3 RADFIN4 keywords. One fully specified, one with 2 out of 11 items, and one with no items. BOOST_AUTO_TEST_CASE(parse_truncatedrecords_deckFilledWithDefaults) { Parser parser; - auto deck = parser.parseFile("testdata/integration_tests/truncated_records.data", ParseContext()); + auto deck = parser.parseFile(pathprefix() + "truncated_records.data", ParseContext()); BOOST_CHECK_EQUAL(3U, deck.size()); const auto& radfin4_0_full= deck.getKeyword("RADFIN4", 0); const auto& radfin4_1_partial= deck.getKeyword("RADFIN4", 1); diff --git a/opm/parser/eclipse/IntegrationTests/NNCTests.cpp b/src/opm/parser/eclipse/IntegrationTests/NNCTests.cpp similarity index 89% rename from opm/parser/eclipse/IntegrationTests/NNCTests.cpp rename to src/opm/parser/eclipse/IntegrationTests/NNCTests.cpp index 8debe5daa..883df27db 100644 --- a/opm/parser/eclipse/IntegrationTests/NNCTests.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/NNCTests.cpp @@ -1,18 +1,18 @@ /* Copyright 2015 IRIS - + This file is part of the Open Porous Media project (OPM). - + OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + OPM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with OPM. If not, see . */ @@ -31,9 +31,13 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + BOOST_AUTO_TEST_CASE(noNNC) { - auto eclipseState = Parser::parse("testdata/integration_tests/NNC/noNNC.DATA"); + auto eclipseState = Parser::parse(pathprefix() + "NNC/noNNC.DATA"); const auto& nnc = eclipseState.getInputNNC(); BOOST_CHECK(!eclipseState.hasInputNNC()); BOOST_CHECK(!nnc.hasNNC()); @@ -41,7 +45,7 @@ BOOST_AUTO_TEST_CASE(noNNC) BOOST_AUTO_TEST_CASE(readDeck) { - auto eclipseState = Parser::parse("testdata/integration_tests/NNC/NNC.DATA"); + auto eclipseState = Parser::parse(pathprefix() + "NNC/NNC.DATA"); const auto& nnc = eclipseState.getInputNNC(); BOOST_CHECK(nnc.hasNNC()); const std::vector& nncdata = nnc.nncdata(); @@ -59,7 +63,7 @@ BOOST_AUTO_TEST_CASE(readDeck) BOOST_AUTO_TEST_CASE(addNNCfromDeck) { - auto eclipseState = Parser::parse("testdata/integration_tests/NNC/NNC.DATA"); + auto eclipseState = Parser::parse(pathprefix() + "NNC/NNC.DATA"); auto nnc = eclipseState.getInputNNC(); BOOST_CHECK(nnc.hasNNC()); const std::vector& nncdata = nnc.nncdata(); diff --git a/opm/parser/eclipse/IntegrationTests/ParseCECON.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseCECON.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseCECON.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseCECON.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseCOORDSYS.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseCOORDSYS.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseCOORDSYS.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseCOORDSYS.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseDATAWithDefault.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseDATAWithDefault.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseDATAWithDefault.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseDATAWithDefault.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseDEBUG.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseDEBUG.cpp similarity index 84% rename from opm/parser/eclipse/IntegrationTests/ParseDEBUG.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseDEBUG.cpp index 31ab2c237..58450d6fd 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseDEBUG.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParseDEBUG.cpp @@ -24,6 +24,10 @@ using namespace Opm; -BOOST_AUTO_TEST_CASE( parse_DEBUG ) { - Parser().parseFile( "testdata/integration_tests/DEBUG/DEBUG.DATA" ); +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + +BOOST_AUTO_TEST_CASE( parse_DEBUG ) { + Parser().parseFile( pathprefix() + "DEBUG/DEBUG.DATA" ); } diff --git a/opm/parser/eclipse/IntegrationTests/ParseDENSITY.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseDENSITY.cpp similarity index 92% rename from opm/parser/eclipse/IntegrationTests/ParseDENSITY.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseDENSITY.cpp index c9d55876f..b6b3f41ba 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseDENSITY.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParseDENSITY.cpp @@ -36,10 +36,13 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} BOOST_AUTO_TEST_CASE(ParseDENSITY) { Parser parser; - std::string file("testdata/integration_tests/DENSITY/DENSITY1"); + std::string file(pathprefix() + "DENSITY/DENSITY1"); auto deck = parser.parseFile(file, ParseContext()); const auto& densityKw = deck.getKeyword("DENSITY" , 0); diff --git a/opm/parser/eclipse/IntegrationTests/ParseEND.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseEND.cpp similarity index 88% rename from opm/parser/eclipse/IntegrationTests/ParseEND.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseEND.cpp index 8a43cf50c..62ff5477a 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseEND.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParseEND.cpp @@ -32,12 +32,13 @@ using namespace Opm; - - +inline std::string prefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} BOOST_AUTO_TEST_CASE( parse_END_OK ) { Parser parser; - std::string fileWithTitleKeyword("testdata/integration_tests/END/END1.txt"); + std::string fileWithTitleKeyword(prefix() + "END/END1.txt"); auto deck = parser.parseFile(fileWithTitleKeyword, ParseContext()); BOOST_CHECK_EQUAL(size_t(1), deck.size()); @@ -48,7 +49,7 @@ BOOST_AUTO_TEST_CASE( parse_END_OK ) { BOOST_AUTO_TEST_CASE( parse_ENDINC_OK ) { Parser parser; - std::string fileWithTitleKeyword("testdata/integration_tests/END/ENDINC1.txt"); + std::string fileWithTitleKeyword(prefix() + "END/ENDINC1.txt"); auto deck = parser.parseFile(fileWithTitleKeyword, ParseContext()); BOOST_CHECK_EQUAL(size_t(1), deck.size()); diff --git a/opm/parser/eclipse/IntegrationTests/ParseEQUIL.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseEQUIL.cpp similarity index 94% rename from opm/parser/eclipse/IntegrationTests/ParseEQUIL.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseEQUIL.cpp index 93dfc3922..714f8d0eb 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseEQUIL.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParseEQUIL.cpp @@ -34,7 +34,9 @@ using namespace Opm; - +inline std::string prefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} BOOST_AUTO_TEST_CASE( parse_EQUIL_MISSING_DIMS ) { Parser parser; @@ -58,7 +60,7 @@ BOOST_AUTO_TEST_CASE( parse_EQUIL_MISSING_DIMS ) { BOOST_AUTO_TEST_CASE( parse_EQUIL_OK ) { Parser parser; - std::string pvtgFile("testdata/integration_tests/EQUIL/EQUIL1"); + std::string pvtgFile(prefix() + "EQUIL/EQUIL1"); auto deck = parser.parseFile(pvtgFile, ParseContext()); const auto& kw1 = deck.getKeyword("EQUIL" , 0); BOOST_CHECK_EQUAL( 3U , kw1.size() ); diff --git a/opm/parser/eclipse/IntegrationTests/ParseGRUPRIG.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseGRUPRIG.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseGRUPRIG.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseGRUPRIG.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseLGR.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseLGR.cpp similarity index 84% rename from opm/parser/eclipse/IntegrationTests/ParseLGR.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseLGR.cpp index 209b18d68..1410b78ed 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseLGR.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParseLGR.cpp @@ -24,6 +24,10 @@ using namespace Opm; -BOOST_AUTO_TEST_CASE( parse_LGR ) { - Parser().parseFile( "testdata/integration_tests/LGR/LGR.DATA" ); +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + +BOOST_AUTO_TEST_CASE( parse_LGR ) { + Parser().parseFile( pathprefix() + "LGR/LGR.DATA" ); } diff --git a/opm/parser/eclipse/IntegrationTests/ParseMULTREGT.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseMULTREGT.cpp similarity index 94% rename from opm/parser/eclipse/IntegrationTests/ParseMULTREGT.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseMULTREGT.cpp index 72fee41f2..f8b43b3b4 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseMULTREGT.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParseMULTREGT.cpp @@ -35,11 +35,14 @@ using namespace Opm; +inline std::string prefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} BOOST_AUTO_TEST_CASE( parse_MULTREGT_OK ) { Parser parser; - auto deck = parser.parseFile("testdata/integration_tests/MULTREGT/MULTREGT", ParseContext()); + auto deck = parser.parseFile(prefix() + "MULTREGT/MULTREGT", ParseContext()); BOOST_CHECK_NO_THROW( deck.getKeyword("MULTREGT" , 0); ); } @@ -48,7 +51,7 @@ BOOST_AUTO_TEST_CASE( parse_MULTREGT_OK ) { BOOST_AUTO_TEST_CASE( MULTREGT_ECLIPSE_STATE ) { ParseContext parseContext; Parser parser; - auto deck = parser.parseFile("testdata/integration_tests/MULTREGT/MULTREGT.DATA", parseContext); + auto deck = parser.parseFile(prefix() + "MULTREGT/MULTREGT.DATA", parseContext); EclipseState state(deck , parseContext); const auto& transMult = state.getTransMult(); diff --git a/opm/parser/eclipse/IntegrationTests/ParseMULTSEGWELL.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseMULTSEGWELL.cpp similarity index 97% rename from opm/parser/eclipse/IntegrationTests/ParseMULTSEGWELL.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseMULTSEGWELL.cpp index e9c6fe17b..b6f2193ad 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseMULTSEGWELL.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParseMULTSEGWELL.cpp @@ -33,10 +33,14 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + BOOST_AUTO_TEST_CASE( PARSE_MULTISEGMENT_ABS ) { Parser parser; - std::string deckFile("testdata/integration_tests/SCHEDULE/SCHEDULE_MULTISEGMENT_WELL"); + std::string deckFile(pathprefix() + "SCHEDULE/SCHEDULE_MULTISEGMENT_WELL"); auto deck = parser.parseFile(deckFile, ParseContext()); // for WELSEGS keyword const auto& kw = deck.getKeyword("WELSEGS"); diff --git a/opm/parser/eclipse/IntegrationTests/ParseMiscible.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseMiscible.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseMiscible.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseMiscible.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParsePLYADS.cpp b/src/opm/parser/eclipse/IntegrationTests/ParsePLYADS.cpp similarity index 90% rename from opm/parser/eclipse/IntegrationTests/ParsePLYADS.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParsePLYADS.cpp index dc0da8073..82519d91f 100644 --- a/opm/parser/eclipse/IntegrationTests/ParsePLYADS.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParsePLYADS.cpp @@ -32,10 +32,13 @@ using namespace Opm; +inline std::string prefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} BOOST_AUTO_TEST_CASE( PARSE_PLYADS_OK) { ParserPtr parser(new Parser()); - std::string deckFile("testdata/integration_tests/POLYMER/plyads.data"); + std::string deckFile(prefix() + "POLYMER/plyads.data"); DeckPtr deck = parser->parseFile(deckFile); const auto& = deck->getKeyword("PLYADS"); const auto& rec = kw.getRecord(0); diff --git a/opm/parser/eclipse/IntegrationTests/ParsePLYADSS.cpp b/src/opm/parser/eclipse/IntegrationTests/ParsePLYADSS.cpp similarity index 88% rename from opm/parser/eclipse/IntegrationTests/ParsePLYADSS.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParsePLYADSS.cpp index 44a16344c..243ffa5a6 100644 --- a/opm/parser/eclipse/IntegrationTests/ParsePLYADSS.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParsePLYADSS.cpp @@ -27,9 +27,13 @@ using namespace Opm; +inline std::string prefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + BOOST_AUTO_TEST_CASE( PARSE_PLYADSS_OK) { Parser parser; - std::string deckFile("testdata/integration_tests/POLYMER/plyadss.data"); + std::string deckFile(prefix() + "POLYMER/plyadss.data"); auto deck = parser.parseFile(deckFile, ParseContext()); const auto& kw = deck.getKeyword("PLYADSS"); diff --git a/opm/parser/eclipse/IntegrationTests/ParsePLYDHFLF.cpp b/src/opm/parser/eclipse/IntegrationTests/ParsePLYDHFLF.cpp similarity index 89% rename from opm/parser/eclipse/IntegrationTests/ParsePLYDHFLF.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParsePLYDHFLF.cpp index a28ca57b7..a26b8f7bb 100644 --- a/opm/parser/eclipse/IntegrationTests/ParsePLYDHFLF.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParsePLYDHFLF.cpp @@ -29,9 +29,13 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + BOOST_AUTO_TEST_CASE( PARSE_PLYDHFLF_OK) { Parser parser; - std::string deckFile("testdata/integration_tests/POLYMER/plydhflf.data"); + std::string deckFile(pathprefix() + "POLYMER/plydhflf.data"); auto deck = parser.parseFile(deckFile, ParseContext()); const auto& kw = deck.getKeyword("PLYDHFLF"); const auto& rec = kw.getRecord(0); diff --git a/opm/parser/eclipse/IntegrationTests/ParsePLYSHLOG.cpp b/src/opm/parser/eclipse/IntegrationTests/ParsePLYSHLOG.cpp similarity index 93% rename from opm/parser/eclipse/IntegrationTests/ParsePLYSHLOG.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParsePLYSHLOG.cpp index c80274ab0..fcbb5143d 100644 --- a/opm/parser/eclipse/IntegrationTests/ParsePLYSHLOG.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParsePLYSHLOG.cpp @@ -29,11 +29,13 @@ using namespace Opm; - +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} BOOST_AUTO_TEST_CASE( PARSE_PLYSHLOG_OK) { Parser parser; - std::string deckFile("testdata/integration_tests/POLYMER/plyshlog.data"); + std::string deckFile(pathprefix() + "POLYMER/plyshlog.data"); auto deck = parser.parseFile(deckFile, ParseContext()); const auto& kw = deck.getKeyword("PLYSHLOG"); const auto& rec1 = kw.getRecord(0); // reference conditions diff --git a/opm/parser/eclipse/IntegrationTests/ParsePLYVISC.cpp b/src/opm/parser/eclipse/IntegrationTests/ParsePLYVISC.cpp similarity index 89% rename from opm/parser/eclipse/IntegrationTests/ParsePLYVISC.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParsePLYVISC.cpp index 8e74a2d42..b6d61df31 100644 --- a/opm/parser/eclipse/IntegrationTests/ParsePLYVISC.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParsePLYVISC.cpp @@ -29,9 +29,13 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + BOOST_AUTO_TEST_CASE( PARSE_PLYVISC_OK) { Parser parser; - std::string deckFile("testdata/integration_tests/POLYMER/plyvisc.data"); + std::string deckFile(pathprefix() + "POLYMER/plyvisc.data"); auto deck = parser.parseFile(deckFile, ParseContext()); const auto& kw = deck.getKeyword("PLYVISC"); const auto& rec = kw.getRecord(0); diff --git a/opm/parser/eclipse/IntegrationTests/ParsePORO.cpp b/src/opm/parser/eclipse/IntegrationTests/ParsePORO.cpp similarity index 93% rename from opm/parser/eclipse/IntegrationTests/ParsePORO.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParsePORO.cpp index 48993f2c9..a4218fd00 100644 --- a/opm/parser/eclipse/IntegrationTests/ParsePORO.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParsePORO.cpp @@ -33,10 +33,13 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} BOOST_AUTO_TEST_CASE(ParsePOROandPERMX) { Parser parser; - std::string poroFile("testdata/integration_tests/PORO/PORO1"); + std::string poroFile(pathprefix() + "PORO/PORO1"); auto deck = parser.parseFile(poroFile, ParseContext()); const auto& kw1 = deck.getKeyword("PORO" , 0); const auto& kw2 = deck.getKeyword("PERMX" , 0); diff --git a/opm/parser/eclipse/IntegrationTests/ParsePRORDER.cpp b/src/opm/parser/eclipse/IntegrationTests/ParsePRORDER.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParsePRORDER.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParsePRORDER.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParsePVTG.cpp b/src/opm/parser/eclipse/IntegrationTests/ParsePVTG.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParsePVTG.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParsePVTG.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParsePVTO.cpp b/src/opm/parser/eclipse/IntegrationTests/ParsePVTO.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParsePVTO.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParsePVTO.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseRSVD.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseRSVD.cpp similarity index 90% rename from opm/parser/eclipse/IntegrationTests/ParseRSVD.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseRSVD.cpp index 79c8d9b8e..58ee59d91 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseRSVD.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParseRSVD.cpp @@ -28,9 +28,13 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + BOOST_AUTO_TEST_CASE( parse_EQUIL_OK ) { Parser parser; - std::string pvtgFile("testdata/integration_tests/RSVD/RSVD.txt"); + std::string pvtgFile(pathprefix() + "RSVD/RSVD.txt"); auto deck = parser.parseFile(pvtgFile, ParseContext()); const auto& kw1 = deck.getKeyword("RSVD" , 0); BOOST_CHECK_EQUAL( 6U , kw1.size() ); diff --git a/opm/parser/eclipse/IntegrationTests/ParseSGOF.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseSGOF.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseSGOF.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseSGOF.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseSLGOF.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseSLGOF.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseSLGOF.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseSLGOF.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseSWOF.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseSWOF.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseSWOF.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseSWOF.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseTITLE.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseTITLE.cpp similarity index 90% rename from opm/parser/eclipse/IntegrationTests/ParseTITLE.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseTITLE.cpp index f7d3504d1..4e58cfbf2 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseTITLE.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParseTITLE.cpp @@ -31,11 +31,13 @@ using namespace Opm; - +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} BOOST_AUTO_TEST_CASE( parse_TITLE_OK ) { Parser parser; - std::string fileWithTitleKeyword("testdata/integration_tests/TITLE/TITLE1.txt"); + std::string fileWithTitleKeyword(pathprefix() + "TITLE/TITLE1.txt"); auto deck = parser.parseFile(fileWithTitleKeyword, ParseContext()); diff --git a/opm/parser/eclipse/IntegrationTests/ParseTOPS.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseTOPS.cpp similarity index 92% rename from opm/parser/eclipse/IntegrationTests/ParseTOPS.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseTOPS.cpp index 79e6861cb..c92611f4a 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseTOPS.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParseTOPS.cpp @@ -28,11 +28,13 @@ using namespace Opm; - +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} BOOST_AUTO_TEST_CASE( PARSE_TOPS_OK) { Parser parser; - std::string deckFile("testdata/integration_tests/GRID/TOPS.DATA"); + std::string deckFile(pathprefix() + "GRID/TOPS.DATA"); ParseContext parseContext; auto deck = parser.parseFile(deckFile, parseContext); EclipseState state(deck, parseContext); diff --git a/opm/parser/eclipse/IntegrationTests/ParseTRACERS.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseTRACERS.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseTRACERS.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseTRACERS.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseTUNINGDP.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseTUNINGDP.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseTUNINGDP.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseTUNINGDP.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseTVDP.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseTVDP.cpp similarity index 88% rename from opm/parser/eclipse/IntegrationTests/ParseTVDP.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseTVDP.cpp index 6559732c6..3486654d7 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseTVDP.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParseTVDP.cpp @@ -26,10 +26,13 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} BOOST_AUTO_TEST_CASE(ParseTVDP) { Parser parser; - std::string poroFile("testdata/integration_tests/TVDP/TVDP1"); + std::string poroFile(pathprefix() + "TVDP/TVDP1"); auto deck = parser.parseFile(poroFile, ParseContext()); BOOST_CHECK(!deck.hasKeyword("TVDP*")); diff --git a/opm/parser/eclipse/IntegrationTests/ParseTVPD.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseTVPD.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseTVPD.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseTVPD.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseVFPPROD.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseVFPPROD.cpp similarity index 97% rename from opm/parser/eclipse/IntegrationTests/ParseVFPPROD.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseVFPPROD.cpp index f2a7d0ff8..63b52f393 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseVFPPROD.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParseVFPPROD.cpp @@ -28,9 +28,13 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + BOOST_AUTO_TEST_CASE( parse_VFPPROD_OK ) { Parser parser; - std::string file("testdata/integration_tests/VFPPROD/VFPPROD1"); + std::string file(pathprefix() + "VFPPROD/VFPPROD1"); BOOST_CHECK( parser.isRecognizedKeyword("VFPPROD")); auto deck = parser.parseFile(file, ParseContext()); diff --git a/opm/parser/eclipse/IntegrationTests/ParseWCONHIST.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseWCONHIST.cpp similarity index 92% rename from opm/parser/eclipse/IntegrationTests/ParseWCONHIST.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseWCONHIST.cpp index 01ec466c4..b9723ee53 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseWCONHIST.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParseWCONHIST.cpp @@ -30,9 +30,13 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + BOOST_AUTO_TEST_CASE( parse_WCHONHIST_OK ) { Parser parser; - std::string wconhistFile("testdata/integration_tests/WCONHIST/WCONHIST1"); + std::string wconhistFile(pathprefix() + "WCONHIST/WCONHIST1"); auto deck = parser.parseFile(wconhistFile, ParseContext()); const auto& kw1 = deck.getKeyword("WCONHIST" , 0); BOOST_CHECK_EQUAL( 3U , kw1.size() ); diff --git a/opm/parser/eclipse/IntegrationTests/ParseWDFACCOR.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseWDFACCOR.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseWDFACCOR.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseWDFACCOR.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseWEFAC.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseWEFAC.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseWEFAC.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseWEFAC.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseWORKLIM.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseWORKLIM.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseWORKLIM.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseWORKLIM.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseWellProbe.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseWellProbe.cpp similarity index 100% rename from opm/parser/eclipse/IntegrationTests/ParseWellProbe.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseWellProbe.cpp diff --git a/opm/parser/eclipse/IntegrationTests/ParseWellWithWildcards.cpp b/src/opm/parser/eclipse/IntegrationTests/ParseWellWithWildcards.cpp similarity index 93% rename from opm/parser/eclipse/IntegrationTests/ParseWellWithWildcards.cpp rename to src/opm/parser/eclipse/IntegrationTests/ParseWellWithWildcards.cpp index f23d49a02..a63da5735 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseWellWithWildcards.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ParseWellWithWildcards.cpp @@ -32,10 +32,13 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} BOOST_AUTO_TEST_CASE( parse_WCONPROD_OK ) { Parser parser; - std::string wconprodFile("testdata/integration_tests/WellWithWildcards/WCONPROD1"); + std::string wconprodFile(pathprefix() + "WellWithWildcards/WCONPROD1"); auto deck = parser.parseFile(wconprodFile, ParseContext()); EclipseGrid grid(30,30,30); TableManager table ( deck ); @@ -72,7 +75,7 @@ BOOST_AUTO_TEST_CASE( parse_WCONPROD_OK ) { BOOST_AUTO_TEST_CASE( parse_WCONINJE_OK ) { ParseContext parseContext; Parser parser; - std::string wconprodFile("testdata/integration_tests/WellWithWildcards/WCONINJE1"); + std::string wconprodFile(pathprefix() + "WellWithWildcards/WCONINJE1"); auto deck = parser.parseFile(wconprodFile, parseContext); EclipseGrid grid(30,30,30); TableManager table ( deck ); diff --git a/opm/parser/eclipse/IntegrationTests/Polymer.cpp b/src/opm/parser/eclipse/IntegrationTests/Polymer.cpp similarity index 94% rename from opm/parser/eclipse/IntegrationTests/Polymer.cpp rename to src/opm/parser/eclipse/IntegrationTests/Polymer.cpp index 1639fc10f..226e8f642 100644 --- a/opm/parser/eclipse/IntegrationTests/Polymer.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/Polymer.cpp @@ -31,9 +31,13 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + BOOST_AUTO_TEST_CASE( parse_polymer_tables ) { Parser parser; - auto deck = parser.parseFile("testdata/integration_tests/POLYMER/POLY.inc", ParseContext()); + auto deck = parser.parseFile(pathprefix() + "POLYMER/POLY.inc", ParseContext()); Opm::TableManager tables( deck ); const TableContainer& plymax = tables.getPlymaxTables(); const TableContainer& plyrock = tables.getPlyrockTables(); diff --git a/opm/parser/eclipse/IntegrationTests/ResinsightTest.cpp b/src/opm/parser/eclipse/IntegrationTests/ResinsightTest.cpp similarity index 90% rename from opm/parser/eclipse/IntegrationTests/ResinsightTest.cpp rename to src/opm/parser/eclipse/IntegrationTests/ResinsightTest.cpp index 1421efeff..39e8a3535 100644 --- a/opm/parser/eclipse/IntegrationTests/ResinsightTest.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ResinsightTest.cpp @@ -30,9 +30,12 @@ #include #include - using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + BOOST_AUTO_TEST_CASE( test_parse ) { Parser parser(false); ParseContext parseContext; @@ -44,7 +47,7 @@ BOOST_AUTO_TEST_CASE( test_parse ) { parser.addKeyword(); parser.addKeyword(); - auto deck = parser.parseFile("testdata/integration_tests/Resinsight/DECK1.DATA" , parseContext); + auto deck = parser.parseFile(pathprefix() + "Resinsight/DECK1.DATA" , parseContext); BOOST_CHECK( deck.hasKeyword() ); BOOST_CHECK( deck.hasKeyword() ); @@ -65,7 +68,7 @@ BOOST_AUTO_TEST_CASE( test_state ) { parser.addKeyword(); parser.addKeyword(); parser.addKeyword(); - auto deck = parser.parseFile("testdata/integration_tests/Resinsight/DECK1.DATA" , parseContext); + auto deck = parser.parseFile(pathprefix() + "Resinsight/DECK1.DATA" , parseContext); GridDims grid(deck); GRIDSection gsec(deck); diff --git a/opm/parser/eclipse/IntegrationTests/ScheduleCreateFromDeck.cpp b/src/opm/parser/eclipse/IntegrationTests/ScheduleCreateFromDeck.cpp similarity index 94% rename from opm/parser/eclipse/IntegrationTests/ScheduleCreateFromDeck.cpp rename to src/opm/parser/eclipse/IntegrationTests/ScheduleCreateFromDeck.cpp index 78743c143..f907a6188 100644 --- a/opm/parser/eclipse/IntegrationTests/ScheduleCreateFromDeck.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/ScheduleCreateFromDeck.cpp @@ -40,10 +40,14 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + BOOST_AUTO_TEST_CASE(CreateSchedule) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE1"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE1"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(10,10,10); TableManager table ( deck ); @@ -59,7 +63,7 @@ BOOST_AUTO_TEST_CASE(CreateSchedule) { BOOST_AUTO_TEST_CASE(CreateSchedule_Comments_After_Keywords) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_COMMENTS_AFTER_KEYWORDS"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_COMMENTS_AFTER_KEYWORDS"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(10,10,10); TableManager table ( deck ); @@ -74,7 +78,7 @@ BOOST_AUTO_TEST_CASE(CreateSchedule_Comments_After_Keywords) { BOOST_AUTO_TEST_CASE(WCONPROD_MissingCmode) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_MISSING_CMODE"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_MISSING_CMODE"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(10,10,3); TableManager table ( deck ); @@ -86,7 +90,7 @@ BOOST_AUTO_TEST_CASE(WCONPROD_MissingCmode) { BOOST_AUTO_TEST_CASE(WCONPROD_Missing_DATA) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_CMODE_MISSING_DATA"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_CMODE_MISSING_DATA"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(10,10,3); TableManager table ( deck ); @@ -98,7 +102,7 @@ BOOST_AUTO_TEST_CASE(WCONPROD_Missing_DATA) { BOOST_AUTO_TEST_CASE(WellTestRefDepth) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_WELLS2"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_WELLS2"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(40,60,30); TableManager table ( deck ); @@ -119,7 +123,7 @@ BOOST_AUTO_TEST_CASE(WellTestRefDepth) { BOOST_AUTO_TEST_CASE(WellTestOpen) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_WELLS2"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_WELLS2"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(40,60,30); TableManager table ( deck ); @@ -161,7 +165,7 @@ BOOST_AUTO_TEST_CASE(WellTestOpen) { BOOST_AUTO_TEST_CASE(WellTesting) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_WELLS2"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_WELLS2"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(40,60,30); TableManager table ( deck ); @@ -279,7 +283,7 @@ BOOST_AUTO_TEST_CASE(WellTesting) { BOOST_AUTO_TEST_CASE(WellTestCOMPDAT_DEFAULTED_ITEMS) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_COMPDAT1"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_COMPDAT1"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(40,60,30); TableManager table ( deck ); @@ -291,7 +295,7 @@ BOOST_AUTO_TEST_CASE(WellTestCOMPDAT_DEFAULTED_ITEMS) { BOOST_AUTO_TEST_CASE(WellTestCOMPDAT) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_WELLS2"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_WELLS2"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(40,60,30); TableManager table ( deck ); @@ -323,7 +327,7 @@ BOOST_AUTO_TEST_CASE(WellTestCOMPDAT) { BOOST_AUTO_TEST_CASE(GroupTreeTest_GRUPTREE_with_explicit_L0_parenting) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_GRUPTREE_EXPLICIT_PARENTING"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_GRUPTREE_EXPLICIT_PARENTING"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(10,10,3); TableManager table ( deck ); @@ -349,7 +353,7 @@ BOOST_AUTO_TEST_CASE(GroupTreeTest_GRUPTREE_with_explicit_L0_parenting) { BOOST_AUTO_TEST_CASE(GroupTreeTest_GRUPTREE_correct) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_WELSPECS_GRUPTREE"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_WELSPECS_GRUPTREE"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(10,10,3); TableManager table ( deck ); @@ -370,7 +374,7 @@ BOOST_AUTO_TEST_CASE(GroupTreeTest_GRUPTREE_correct) { BOOST_AUTO_TEST_CASE(GroupTreeTest_WELSPECS_AND_GRUPTREE_correct_size ) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_WELSPECS_GROUPS"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_WELSPECS_GROUPS"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(10,10,3); TableManager table ( deck ); @@ -387,7 +391,7 @@ BOOST_AUTO_TEST_CASE(GroupTreeTest_WELSPECS_AND_GRUPTREE_correct_size ) { BOOST_AUTO_TEST_CASE(GroupTreeTest_WELSPECS_AND_GRUPTREE_correct_tree) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_WELSPECS_GROUPS"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_WELSPECS_GROUPS"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(10,10,3); TableManager table ( deck ); @@ -420,7 +424,7 @@ BOOST_AUTO_TEST_CASE(GroupTreeTest_WELSPECS_AND_GRUPTREE_correct_tree) { BOOST_AUTO_TEST_CASE(GroupTreeTest_GRUPTREE_WITH_REPARENT_correct_tree) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_GROUPS_REPARENT"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_GROUPS_REPARENT"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(10,10,3); TableManager table ( deck ); @@ -441,7 +445,7 @@ BOOST_AUTO_TEST_CASE(GroupTreeTest_GRUPTREE_WITH_REPARENT_correct_tree) { BOOST_AUTO_TEST_CASE( WellTestGroups ) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_GROUPS"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_GROUPS"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(10,10,3); TableManager table ( deck ); @@ -485,7 +489,7 @@ BOOST_AUTO_TEST_CASE( WellTestGroups ) { BOOST_AUTO_TEST_CASE( WellTestGroupAndWellRelation ) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_WELLS_AND_GROUPS"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_WELLS_AND_GROUPS"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(10,10,3); TableManager table ( deck ); @@ -514,7 +518,7 @@ BOOST_AUTO_TEST_CASE( WellTestGroupAndWellRelation ) { BOOST_AUTO_TEST_CASE(WellTestWELSPECSDataLoaded) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_WELLS2"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_WELLS2"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(40,60,30); TableManager table ( deck ); @@ -549,7 +553,7 @@ BOOST_AUTO_TEST_CASE(WellTestWELSPECSDataLoaded) { /* BOOST_AUTO_TEST_CASE(WellTestWELOPEN_ConfigWithIndexes_Throws) { Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_WELOPEN_INVALID"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_WELOPEN_INVALID"); auto deck = parser.parseFile(scheduleFile); std::shared_ptr grid = std::make_shared(10,10,3); BOOST_CHECK_THROW(Schedule(grid , deck), std::logic_error); @@ -558,7 +562,7 @@ BOOST_AUTO_TEST_CASE(WellTestWELOPEN_ConfigWithIndexes_Throws) { BOOST_AUTO_TEST_CASE(WellTestWELOPENControlsSet) { Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_WELOPEN"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_WELOPEN"); auto deck = parser.parseFile(scheduleFile); std::shared_ptr grid = std::make_shared( 10,10,10 ); Schedule sched(grid , deck); @@ -578,7 +582,7 @@ BOOST_AUTO_TEST_CASE(WellTestWELOPENControlsSet) { BOOST_AUTO_TEST_CASE(WellTestWGRUPCONWellPropertiesSet) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_WGRUPCON"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_WGRUPCON"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(10,10,10); TableManager table ( deck ); @@ -639,7 +643,7 @@ COMPDAT \n\ BOOST_AUTO_TEST_CASE(OpmCode) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/wells_group.data"); + std::string scheduleFile(pathprefix() + "SCHEDULE/wells_group.data"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(10,10,3); TableManager table ( deck ); @@ -652,7 +656,7 @@ BOOST_AUTO_TEST_CASE(OpmCode) { BOOST_AUTO_TEST_CASE(WELLS_SHUT) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_SHUT_WELL"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_SHUT_WELL"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(20,40,1); TableManager table ( deck ); @@ -678,7 +682,7 @@ BOOST_AUTO_TEST_CASE(WELLS_SHUT) { BOOST_AUTO_TEST_CASE(WellTestWPOLYMER) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_POLYMER"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_POLYMER"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(30,30,30); TableManager table ( deck ); @@ -728,7 +732,7 @@ BOOST_AUTO_TEST_CASE(WellTestWPOLYMER) { BOOST_AUTO_TEST_CASE(WellTestWECON) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_WECON"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_WECON"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(30,30,30); TableManager table ( deck ); @@ -839,7 +843,7 @@ BOOST_AUTO_TEST_CASE(WellTestWECON) { BOOST_AUTO_TEST_CASE(TestEvents) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_EVENTS"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_EVENTS"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(40,40,30); @@ -873,7 +877,7 @@ BOOST_AUTO_TEST_CASE(TestEvents) { BOOST_AUTO_TEST_CASE(TestWellEvents) { ParseContext parseContext; Parser parser; - std::string scheduleFile("testdata/integration_tests/SCHEDULE/SCHEDULE_EVENTS"); + std::string scheduleFile(pathprefix() + "SCHEDULE/SCHEDULE_EVENTS"); auto deck = parser.parseFile(scheduleFile, parseContext); EclipseGrid grid(40,40,30); diff --git a/opm/parser/eclipse/IntegrationTests/TransMultIntegrationTests.cpp b/src/opm/parser/eclipse/IntegrationTests/TransMultIntegrationTests.cpp similarity index 92% rename from opm/parser/eclipse/IntegrationTests/TransMultIntegrationTests.cpp rename to src/opm/parser/eclipse/IntegrationTests/TransMultIntegrationTests.cpp index 8c3653198..1a62ca509 100644 --- a/opm/parser/eclipse/IntegrationTests/TransMultIntegrationTests.cpp +++ b/src/opm/parser/eclipse/IntegrationTests/TransMultIntegrationTests.cpp @@ -28,10 +28,13 @@ using namespace Opm; +inline std::string pathprefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} BOOST_AUTO_TEST_CASE(MULTFLT_IN_SCHEDULE) { Parser parser; - std::string scheduleFile("testdata/integration_tests/TRANS/Deck1"); + std::string scheduleFile(pathprefix() + "TRANS/Deck1"); ParseContext parseContext; auto deck = parser.parseFile(scheduleFile, parseContext); EclipseState state(deck, parseContext); diff --git a/opm/parser/eclipse/Parser/MessageContainer.cpp b/src/opm/parser/eclipse/Parser/MessageContainer.cpp similarity index 100% rename from opm/parser/eclipse/Parser/MessageContainer.cpp rename to src/opm/parser/eclipse/Parser/MessageContainer.cpp diff --git a/opm/parser/eclipse/Parser/ParseContext.cpp b/src/opm/parser/eclipse/Parser/ParseContext.cpp similarity index 100% rename from opm/parser/eclipse/Parser/ParseContext.cpp rename to src/opm/parser/eclipse/Parser/ParseContext.cpp diff --git a/opm/parser/eclipse/Parser/Parser.cpp b/src/opm/parser/eclipse/Parser/Parser.cpp similarity index 100% rename from opm/parser/eclipse/Parser/Parser.cpp rename to src/opm/parser/eclipse/Parser/Parser.cpp diff --git a/opm/parser/eclipse/Parser/ParserEnums.cpp b/src/opm/parser/eclipse/Parser/ParserEnums.cpp similarity index 100% rename from opm/parser/eclipse/Parser/ParserEnums.cpp rename to src/opm/parser/eclipse/Parser/ParserEnums.cpp diff --git a/opm/parser/eclipse/Parser/ParserItem.cpp b/src/opm/parser/eclipse/Parser/ParserItem.cpp similarity index 100% rename from opm/parser/eclipse/Parser/ParserItem.cpp rename to src/opm/parser/eclipse/Parser/ParserItem.cpp diff --git a/opm/parser/eclipse/Parser/ParserKeyword.cpp b/src/opm/parser/eclipse/Parser/ParserKeyword.cpp similarity index 100% rename from opm/parser/eclipse/Parser/ParserKeyword.cpp rename to src/opm/parser/eclipse/Parser/ParserKeyword.cpp diff --git a/opm/parser/eclipse/Parser/ParserRecord.cpp b/src/opm/parser/eclipse/Parser/ParserRecord.cpp similarity index 100% rename from opm/parser/eclipse/Parser/ParserRecord.cpp rename to src/opm/parser/eclipse/Parser/ParserRecord.cpp diff --git a/opm/parser/eclipse/Parser/createDefaultKeywordList.cpp b/src/opm/parser/eclipse/Parser/createDefaultKeywordList.cpp similarity index 100% rename from opm/parser/eclipse/Parser/createDefaultKeywordList.cpp rename to src/opm/parser/eclipse/Parser/createDefaultKeywordList.cpp diff --git a/opm/parser/eclipse/RawDeck/RawKeyword.cpp b/src/opm/parser/eclipse/RawDeck/RawKeyword.cpp similarity index 100% rename from opm/parser/eclipse/RawDeck/RawKeyword.cpp rename to src/opm/parser/eclipse/RawDeck/RawKeyword.cpp diff --git a/opm/parser/eclipse/RawDeck/RawRecord.cpp b/src/opm/parser/eclipse/RawDeck/RawRecord.cpp similarity index 100% rename from opm/parser/eclipse/RawDeck/RawRecord.cpp rename to src/opm/parser/eclipse/RawDeck/RawRecord.cpp diff --git a/opm/parser/eclipse/RawDeck/StarToken.cpp b/src/opm/parser/eclipse/RawDeck/StarToken.cpp similarity index 100% rename from opm/parser/eclipse/RawDeck/StarToken.cpp rename to src/opm/parser/eclipse/RawDeck/StarToken.cpp diff --git a/opm/parser/eclipse/Units/Dimension.cpp b/src/opm/parser/eclipse/Units/Dimension.cpp similarity index 100% rename from opm/parser/eclipse/Units/Dimension.cpp rename to src/opm/parser/eclipse/Units/Dimension.cpp diff --git a/opm/parser/eclipse/Units/UnitSystem.cpp b/src/opm/parser/eclipse/Units/UnitSystem.cpp similarity index 100% rename from opm/parser/eclipse/Units/UnitSystem.cpp rename to src/opm/parser/eclipse/Units/UnitSystem.cpp diff --git a/opm/parser/eclipse/Utility/Functional.cpp b/src/opm/parser/eclipse/Utility/Functional.cpp similarity index 100% rename from opm/parser/eclipse/Utility/Functional.cpp rename to src/opm/parser/eclipse/Utility/Functional.cpp diff --git a/opm/parser/eclipse/Utility/Stringview.cpp b/src/opm/parser/eclipse/Utility/Stringview.cpp similarity index 100% rename from opm/parser/eclipse/Utility/Stringview.cpp rename to src/opm/parser/eclipse/Utility/Stringview.cpp diff --git a/opm/parser/eclipse/python/CMakeLists.txt b/src/opm/parser/eclipse/python/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/CMakeLists.txt rename to src/opm/parser/eclipse/python/CMakeLists.txt diff --git a/opm/parser/eclipse/python/c_inter/CMakeLists.txt b/src/opm/parser/eclipse/python/c_inter/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/c_inter/CMakeLists.txt rename to src/opm/parser/eclipse/python/c_inter/CMakeLists.txt diff --git a/opm/parser/eclipse/python/c_inter/cdeck.cc b/src/opm/parser/eclipse/python/c_inter/cdeck.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/cdeck.cc rename to src/opm/parser/eclipse/python/c_inter/cdeck.cc diff --git a/opm/parser/eclipse/python/c_inter/cdeck_item.cc b/src/opm/parser/eclipse/python/c_inter/cdeck_item.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/cdeck_item.cc rename to src/opm/parser/eclipse/python/c_inter/cdeck_item.cc diff --git a/opm/parser/eclipse/python/c_inter/cdeck_keyword.cc b/src/opm/parser/eclipse/python/c_inter/cdeck_keyword.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/cdeck_keyword.cc rename to src/opm/parser/eclipse/python/c_inter/cdeck_keyword.cc diff --git a/opm/parser/eclipse/python/c_inter/cdeck_record.cc b/src/opm/parser/eclipse/python/c_inter/cdeck_record.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/cdeck_record.cc rename to src/opm/parser/eclipse/python/c_inter/cdeck_record.cc diff --git a/opm/parser/eclipse/python/c_inter/cecl_props.cc b/src/opm/parser/eclipse/python/c_inter/cecl_props.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/cecl_props.cc rename to src/opm/parser/eclipse/python/c_inter/cecl_props.cc diff --git a/opm/parser/eclipse/python/c_inter/ceclipse_grid.cc b/src/opm/parser/eclipse/python/c_inter/ceclipse_grid.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/ceclipse_grid.cc rename to src/opm/parser/eclipse/python/c_inter/ceclipse_grid.cc diff --git a/opm/parser/eclipse/python/c_inter/cparse_context.cc b/src/opm/parser/eclipse/python/c_inter/cparse_context.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/cparse_context.cc rename to src/opm/parser/eclipse/python/c_inter/cparse_context.cc diff --git a/opm/parser/eclipse/python/c_inter/cparser.cc b/src/opm/parser/eclipse/python/c_inter/cparser.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/cparser.cc rename to src/opm/parser/eclipse/python/c_inter/cparser.cc diff --git a/opm/parser/eclipse/python/c_inter/cschedule.cc b/src/opm/parser/eclipse/python/c_inter/cschedule.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/cschedule.cc rename to src/opm/parser/eclipse/python/c_inter/cschedule.cc diff --git a/opm/parser/eclipse/python/c_inter/ctable.cc b/src/opm/parser/eclipse/python/c_inter/ctable.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/ctable.cc rename to src/opm/parser/eclipse/python/c_inter/ctable.cc diff --git a/opm/parser/eclipse/python/c_inter/ctable_index.cc b/src/opm/parser/eclipse/python/c_inter/ctable_index.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/ctable_index.cc rename to src/opm/parser/eclipse/python/c_inter/ctable_index.cc diff --git a/opm/parser/eclipse/python/c_inter/ctable_manager.cc b/src/opm/parser/eclipse/python/c_inter/ctable_manager.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/ctable_manager.cc rename to src/opm/parser/eclipse/python/c_inter/ctable_manager.cc diff --git a/opm/parser/eclipse/python/c_inter/parser-c.cc b/src/opm/parser/eclipse/python/c_inter/parser-c.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/parser-c.cc rename to src/opm/parser/eclipse/python/c_inter/parser-c.cc diff --git a/opm/parser/eclipse/python/c_inter/parser.cc b/src/opm/parser/eclipse/python/c_inter/parser.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/parser.cc rename to src/opm/parser/eclipse/python/c_inter/parser.cc diff --git a/opm/parser/eclipse/python/c_inter/parser_c.cc b/src/opm/parser/eclipse/python/c_inter/parser_c.cc similarity index 100% rename from opm/parser/eclipse/python/c_inter/parser_c.cc rename to src/opm/parser/eclipse/python/c_inter/parser_c.cc diff --git a/opm/parser/eclipse/python/cmake/cmake_pyc b/src/opm/parser/eclipse/python/cmake/cmake_pyc similarity index 100% rename from opm/parser/eclipse/python/cmake/cmake_pyc rename to src/opm/parser/eclipse/python/cmake/cmake_pyc diff --git a/opm/parser/eclipse/python/cmake/ctest_run b/src/opm/parser/eclipse/python/cmake/ctest_run similarity index 100% rename from opm/parser/eclipse/python/cmake/ctest_run rename to src/opm/parser/eclipse/python/cmake/ctest_run diff --git a/opm/parser/eclipse/python/cmake/ctest_run_python b/src/opm/parser/eclipse/python/cmake/ctest_run_python similarity index 100% rename from opm/parser/eclipse/python/cmake/ctest_run_python rename to src/opm/parser/eclipse/python/cmake/ctest_run_python diff --git a/opm/parser/eclipse/python/cmake/python.cmake b/src/opm/parser/eclipse/python/cmake/python.cmake similarity index 100% rename from opm/parser/eclipse/python/cmake/python.cmake rename to src/opm/parser/eclipse/python/cmake/python.cmake diff --git a/opm/parser/eclipse/python/doc/index.rst b/src/opm/parser/eclipse/python/doc/index.rst similarity index 100% rename from opm/parser/eclipse/python/doc/index.rst rename to src/opm/parser/eclipse/python/doc/index.rst diff --git a/opm/parser/eclipse/python/python/CMakeLists.txt b/src/opm/parser/eclipse/python/python/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/python/CMakeLists.txt rename to src/opm/parser/eclipse/python/python/CMakeLists.txt diff --git a/opm/parser/eclipse/python/python/opm/CMakeLists.txt b/src/opm/parser/eclipse/python/python/opm/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/python/opm/CMakeLists.txt rename to src/opm/parser/eclipse/python/python/opm/CMakeLists.txt diff --git a/opm/parser/eclipse/python/python/opm/__init__.py b/src/opm/parser/eclipse/python/python/opm/__init__.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/__init__.py rename to src/opm/parser/eclipse/python/python/opm/__init__.py diff --git a/opm/parser/eclipse/python/python/opm/deck/CMakeLists.txt b/src/opm/parser/eclipse/python/python/opm/deck/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/python/opm/deck/CMakeLists.txt rename to src/opm/parser/eclipse/python/python/opm/deck/CMakeLists.txt diff --git a/opm/parser/eclipse/python/python/opm/deck/__init__.py b/src/opm/parser/eclipse/python/python/opm/deck/__init__.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/deck/__init__.py rename to src/opm/parser/eclipse/python/python/opm/deck/__init__.py diff --git a/opm/parser/eclipse/python/python/opm/deck/deck.py b/src/opm/parser/eclipse/python/python/opm/deck/deck.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/deck/deck.py rename to src/opm/parser/eclipse/python/python/opm/deck/deck.py diff --git a/opm/parser/eclipse/python/python/opm/deck/deck_item.py b/src/opm/parser/eclipse/python/python/opm/deck/deck_item.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/deck/deck_item.py rename to src/opm/parser/eclipse/python/python/opm/deck/deck_item.py diff --git a/opm/parser/eclipse/python/python/opm/deck/deck_keyword.py b/src/opm/parser/eclipse/python/python/opm/deck/deck_keyword.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/deck/deck_keyword.py rename to src/opm/parser/eclipse/python/python/opm/deck/deck_keyword.py diff --git a/opm/parser/eclipse/python/python/opm/deck/deck_record.py b/src/opm/parser/eclipse/python/python/opm/deck/deck_record.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/deck/deck_record.py rename to src/opm/parser/eclipse/python/python/opm/deck/deck_record.py diff --git a/opm/parser/eclipse/python/python/opm/deck/item_type_enum.py b/src/opm/parser/eclipse/python/python/opm/deck/item_type_enum.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/deck/item_type_enum.py rename to src/opm/parser/eclipse/python/python/opm/deck/item_type_enum.py diff --git a/opm/parser/eclipse/python/python/opm/ecl_state/CMakeLists.txt b/src/opm/parser/eclipse/python/python/opm/ecl_state/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/python/opm/ecl_state/CMakeLists.txt rename to src/opm/parser/eclipse/python/python/opm/ecl_state/CMakeLists.txt diff --git a/opm/parser/eclipse/python/python/opm/ecl_state/__init__.py b/src/opm/parser/eclipse/python/python/opm/ecl_state/__init__.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/ecl_state/__init__.py rename to src/opm/parser/eclipse/python/python/opm/ecl_state/__init__.py diff --git a/opm/parser/eclipse/python/python/opm/ecl_state/grid/CMakeLists.txt b/src/opm/parser/eclipse/python/python/opm/ecl_state/grid/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/python/opm/ecl_state/grid/CMakeLists.txt rename to src/opm/parser/eclipse/python/python/opm/ecl_state/grid/CMakeLists.txt diff --git a/opm/parser/eclipse/python/python/opm/ecl_state/grid/__init__.py b/src/opm/parser/eclipse/python/python/opm/ecl_state/grid/__init__.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/ecl_state/grid/__init__.py rename to src/opm/parser/eclipse/python/python/opm/ecl_state/grid/__init__.py diff --git a/opm/parser/eclipse/python/python/opm/ecl_state/grid/ecl_props.py b/src/opm/parser/eclipse/python/python/opm/ecl_state/grid/ecl_props.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/ecl_state/grid/ecl_props.py rename to src/opm/parser/eclipse/python/python/opm/ecl_state/grid/ecl_props.py diff --git a/opm/parser/eclipse/python/python/opm/ecl_state/grid/eclipse_grid.py b/src/opm/parser/eclipse/python/python/opm/ecl_state/grid/eclipse_grid.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/ecl_state/grid/eclipse_grid.py rename to src/opm/parser/eclipse/python/python/opm/ecl_state/grid/eclipse_grid.py diff --git a/opm/parser/eclipse/python/python/opm/ecl_state/schedule/CMakeLists.txt b/src/opm/parser/eclipse/python/python/opm/ecl_state/schedule/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/python/opm/ecl_state/schedule/CMakeLists.txt rename to src/opm/parser/eclipse/python/python/opm/ecl_state/schedule/CMakeLists.txt diff --git a/opm/parser/eclipse/python/python/opm/ecl_state/schedule/__init__.py b/src/opm/parser/eclipse/python/python/opm/ecl_state/schedule/__init__.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/ecl_state/schedule/__init__.py rename to src/opm/parser/eclipse/python/python/opm/ecl_state/schedule/__init__.py diff --git a/opm/parser/eclipse/python/python/opm/ecl_state/schedule/schedule.py b/src/opm/parser/eclipse/python/python/opm/ecl_state/schedule/schedule.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/ecl_state/schedule/schedule.py rename to src/opm/parser/eclipse/python/python/opm/ecl_state/schedule/schedule.py diff --git a/opm/parser/eclipse/python/python/opm/ecl_state/tables/CMakeLists.txt b/src/opm/parser/eclipse/python/python/opm/ecl_state/tables/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/python/opm/ecl_state/tables/CMakeLists.txt rename to src/opm/parser/eclipse/python/python/opm/ecl_state/tables/CMakeLists.txt diff --git a/opm/parser/eclipse/python/python/opm/ecl_state/tables/__init__.py b/src/opm/parser/eclipse/python/python/opm/ecl_state/tables/__init__.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/ecl_state/tables/__init__.py rename to src/opm/parser/eclipse/python/python/opm/ecl_state/tables/__init__.py diff --git a/opm/parser/eclipse/python/python/opm/ecl_state/tables/table.py b/src/opm/parser/eclipse/python/python/opm/ecl_state/tables/table.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/ecl_state/tables/table.py rename to src/opm/parser/eclipse/python/python/opm/ecl_state/tables/table.py diff --git a/opm/parser/eclipse/python/python/opm/ecl_state/tables/table_index.py b/src/opm/parser/eclipse/python/python/opm/ecl_state/tables/table_index.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/ecl_state/tables/table_index.py rename to src/opm/parser/eclipse/python/python/opm/ecl_state/tables/table_index.py diff --git a/opm/parser/eclipse/python/python/opm/ecl_state/tables/table_manager.py b/src/opm/parser/eclipse/python/python/opm/ecl_state/tables/table_manager.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/ecl_state/tables/table_manager.py rename to src/opm/parser/eclipse/python/python/opm/ecl_state/tables/table_manager.py diff --git a/opm/parser/eclipse/python/python/opm/opm_lib_info_build.py.in b/src/opm/parser/eclipse/python/python/opm/opm_lib_info_build.py.in similarity index 100% rename from opm/parser/eclipse/python/python/opm/opm_lib_info_build.py.in rename to src/opm/parser/eclipse/python/python/opm/opm_lib_info_build.py.in diff --git a/opm/parser/eclipse/python/python/opm/opm_lib_info_install.py.in b/src/opm/parser/eclipse/python/python/opm/opm_lib_info_install.py.in similarity index 100% rename from opm/parser/eclipse/python/python/opm/opm_lib_info_install.py.in rename to src/opm/parser/eclipse/python/python/opm/opm_lib_info_install.py.in diff --git a/opm/parser/eclipse/python/python/opm/parser/CMakeLists.txt b/src/opm/parser/eclipse/python/python/opm/parser/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/python/opm/parser/CMakeLists.txt rename to src/opm/parser/eclipse/python/python/opm/parser/CMakeLists.txt diff --git a/opm/parser/eclipse/python/python/opm/parser/__init__.py b/src/opm/parser/eclipse/python/python/opm/parser/__init__.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/parser/__init__.py rename to src/opm/parser/eclipse/python/python/opm/parser/__init__.py diff --git a/opm/parser/eclipse/python/python/opm/parser/error_action.py b/src/opm/parser/eclipse/python/python/opm/parser/error_action.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/parser/error_action.py rename to src/opm/parser/eclipse/python/python/opm/parser/error_action.py diff --git a/opm/parser/eclipse/python/python/opm/parser/parse_context.py b/src/opm/parser/eclipse/python/python/opm/parser/parse_context.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/parser/parse_context.py rename to src/opm/parser/eclipse/python/python/opm/parser/parse_context.py diff --git a/opm/parser/eclipse/python/python/opm/parser/parser.py b/src/opm/parser/eclipse/python/python/opm/parser/parser.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/parser/parser.py rename to src/opm/parser/eclipse/python/python/opm/parser/parser.py diff --git a/opm/parser/eclipse/python/python/opm/parser/test.py b/src/opm/parser/eclipse/python/python/opm/parser/test.py similarity index 100% rename from opm/parser/eclipse/python/python/opm/parser/test.py rename to src/opm/parser/eclipse/python/python/opm/parser/test.py diff --git a/opm/parser/eclipse/python/python/opm_test.py b/src/opm/parser/eclipse/python/python/opm_test.py similarity index 100% rename from opm/parser/eclipse/python/python/opm_test.py rename to src/opm/parser/eclipse/python/python/opm_test.py diff --git a/opm/parser/eclipse/python/test.py b/src/opm/parser/eclipse/python/test.py similarity index 100% rename from opm/parser/eclipse/python/test.py rename to src/opm/parser/eclipse/python/test.py diff --git a/opm/parser/eclipse/python/tests/CMakeLists.txt b/src/opm/parser/eclipse/python/tests/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/tests/CMakeLists.txt rename to src/opm/parser/eclipse/python/tests/CMakeLists.txt diff --git a/opm/parser/eclipse/python/tests/__init__.py b/src/opm/parser/eclipse/python/tests/__init__.py similarity index 100% rename from opm/parser/eclipse/python/tests/__init__.py rename to src/opm/parser/eclipse/python/tests/__init__.py diff --git a/opm/parser/eclipse/python/tests/deck/CMakeLists.txt b/src/opm/parser/eclipse/python/tests/deck/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/tests/deck/CMakeLists.txt rename to src/opm/parser/eclipse/python/tests/deck/CMakeLists.txt diff --git a/opm/parser/eclipse/python/tests/deck/__init__.py b/src/opm/parser/eclipse/python/tests/deck/__init__.py similarity index 100% rename from opm/parser/eclipse/python/tests/deck/__init__.py rename to src/opm/parser/eclipse/python/tests/deck/__init__.py diff --git a/opm/parser/eclipse/python/tests/deck/test_deck.py b/src/opm/parser/eclipse/python/tests/deck/test_deck.py similarity index 100% rename from opm/parser/eclipse/python/tests/deck/test_deck.py rename to src/opm/parser/eclipse/python/tests/deck/test_deck.py diff --git a/opm/parser/eclipse/python/tests/deck/test_deck_item.py b/src/opm/parser/eclipse/python/tests/deck/test_deck_item.py similarity index 100% rename from opm/parser/eclipse/python/tests/deck/test_deck_item.py rename to src/opm/parser/eclipse/python/tests/deck/test_deck_item.py diff --git a/opm/parser/eclipse/python/tests/deck/test_deck_keyword.py b/src/opm/parser/eclipse/python/tests/deck/test_deck_keyword.py similarity index 100% rename from opm/parser/eclipse/python/tests/deck/test_deck_keyword.py rename to src/opm/parser/eclipse/python/tests/deck/test_deck_keyword.py diff --git a/opm/parser/eclipse/python/tests/deck/test_deck_record.py b/src/opm/parser/eclipse/python/tests/deck/test_deck_record.py similarity index 100% rename from opm/parser/eclipse/python/tests/deck/test_deck_record.py rename to src/opm/parser/eclipse/python/tests/deck/test_deck_record.py diff --git a/opm/parser/eclipse/python/tests/ecl_state/CMakeLists.txt b/src/opm/parser/eclipse/python/tests/ecl_state/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/tests/ecl_state/CMakeLists.txt rename to src/opm/parser/eclipse/python/tests/ecl_state/CMakeLists.txt diff --git a/opm/parser/eclipse/python/tests/ecl_state/__init__.py b/src/opm/parser/eclipse/python/tests/ecl_state/__init__.py similarity index 100% rename from opm/parser/eclipse/python/tests/ecl_state/__init__.py rename to src/opm/parser/eclipse/python/tests/ecl_state/__init__.py diff --git a/opm/parser/eclipse/python/tests/ecl_state/grid/CMakeLists.txt b/src/opm/parser/eclipse/python/tests/ecl_state/grid/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/tests/ecl_state/grid/CMakeLists.txt rename to src/opm/parser/eclipse/python/tests/ecl_state/grid/CMakeLists.txt diff --git a/opm/parser/eclipse/python/tests/ecl_state/grid/__init__.py b/src/opm/parser/eclipse/python/tests/ecl_state/grid/__init__.py similarity index 100% rename from opm/parser/eclipse/python/tests/ecl_state/grid/__init__.py rename to src/opm/parser/eclipse/python/tests/ecl_state/grid/__init__.py diff --git a/opm/parser/eclipse/python/tests/ecl_state/grid/test_grid.py b/src/opm/parser/eclipse/python/tests/ecl_state/grid/test_grid.py similarity index 100% rename from opm/parser/eclipse/python/tests/ecl_state/grid/test_grid.py rename to src/opm/parser/eclipse/python/tests/ecl_state/grid/test_grid.py diff --git a/opm/parser/eclipse/python/tests/ecl_state/grid/test_props.py b/src/opm/parser/eclipse/python/tests/ecl_state/grid/test_props.py similarity index 100% rename from opm/parser/eclipse/python/tests/ecl_state/grid/test_props.py rename to src/opm/parser/eclipse/python/tests/ecl_state/grid/test_props.py diff --git a/opm/parser/eclipse/python/tests/ecl_state/schedule/CMakeLists.txt b/src/opm/parser/eclipse/python/tests/ecl_state/schedule/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/tests/ecl_state/schedule/CMakeLists.txt rename to src/opm/parser/eclipse/python/tests/ecl_state/schedule/CMakeLists.txt diff --git a/opm/parser/eclipse/python/tests/ecl_state/schedule/__init__.py b/src/opm/parser/eclipse/python/tests/ecl_state/schedule/__init__.py similarity index 100% rename from opm/parser/eclipse/python/tests/ecl_state/schedule/__init__.py rename to src/opm/parser/eclipse/python/tests/ecl_state/schedule/__init__.py diff --git a/opm/parser/eclipse/python/tests/ecl_state/schedule/test_schedule.py b/src/opm/parser/eclipse/python/tests/ecl_state/schedule/test_schedule.py similarity index 100% rename from opm/parser/eclipse/python/tests/ecl_state/schedule/test_schedule.py rename to src/opm/parser/eclipse/python/tests/ecl_state/schedule/test_schedule.py diff --git a/opm/parser/eclipse/python/tests/ecl_state/table/CMakeLists.txt b/src/opm/parser/eclipse/python/tests/ecl_state/table/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/tests/ecl_state/table/CMakeLists.txt rename to src/opm/parser/eclipse/python/tests/ecl_state/table/CMakeLists.txt diff --git a/opm/parser/eclipse/python/tests/ecl_state/table/__init__.py b/src/opm/parser/eclipse/python/tests/ecl_state/table/__init__.py similarity index 100% rename from opm/parser/eclipse/python/tests/ecl_state/table/__init__.py rename to src/opm/parser/eclipse/python/tests/ecl_state/table/__init__.py diff --git a/opm/parser/eclipse/python/tests/ecl_state/table/test_table_manager.py b/src/opm/parser/eclipse/python/tests/ecl_state/table/test_table_manager.py similarity index 100% rename from opm/parser/eclipse/python/tests/ecl_state/table/test_table_manager.py rename to src/opm/parser/eclipse/python/tests/ecl_state/table/test_table_manager.py diff --git a/opm/parser/eclipse/python/tests/parse_context/CMakeLists.txt b/src/opm/parser/eclipse/python/tests/parse_context/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/tests/parse_context/CMakeLists.txt rename to src/opm/parser/eclipse/python/tests/parse_context/CMakeLists.txt diff --git a/opm/parser/eclipse/python/tests/parse_context/__init__.py b/src/opm/parser/eclipse/python/tests/parse_context/__init__.py similarity index 100% rename from opm/parser/eclipse/python/tests/parse_context/__init__.py rename to src/opm/parser/eclipse/python/tests/parse_context/__init__.py diff --git a/opm/parser/eclipse/python/tests/parse_context/test_parse_context.py b/src/opm/parser/eclipse/python/tests/parse_context/test_parse_context.py similarity index 100% rename from opm/parser/eclipse/python/tests/parse_context/test_parse_context.py rename to src/opm/parser/eclipse/python/tests/parse_context/test_parse_context.py diff --git a/opm/parser/eclipse/python/tests/parser/CMakeLists.txt b/src/opm/parser/eclipse/python/tests/parser/CMakeLists.txt similarity index 100% rename from opm/parser/eclipse/python/tests/parser/CMakeLists.txt rename to src/opm/parser/eclipse/python/tests/parser/CMakeLists.txt diff --git a/opm/parser/eclipse/python/tests/parser/__init__.py b/src/opm/parser/eclipse/python/tests/parser/__init__.py similarity index 100% rename from opm/parser/eclipse/python/tests/parser/__init__.py rename to src/opm/parser/eclipse/python/tests/parser/__init__.py diff --git a/opm/parser/eclipse/python/tests/parser/test_parser.py b/src/opm/parser/eclipse/python/tests/parser/test_parser.py similarity index 100% rename from opm/parser/eclipse/python/tests/parser/test_parser.py rename to src/opm/parser/eclipse/python/tests/parser/test_parser.py diff --git a/opm/parser/share/CMakeLists.txt b/src/opm/parser/eclipse/share/CMakeLists.txt similarity index 100% rename from opm/parser/share/CMakeLists.txt rename to src/opm/parser/eclipse/share/CMakeLists.txt diff --git a/opm/parser/share/keywords/000_Eclipse100/A/ACTDIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTDIMS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/ACTDIMS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTDIMS diff --git a/opm/parser/share/keywords/000_Eclipse100/A/ACTNUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTNUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/ACTNUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTNUM diff --git a/opm/parser/share/keywords/000_Eclipse100/A/ADD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/ADD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADD diff --git a/opm/parser/share/keywords/000_Eclipse100/A/ADDREG b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADDREG similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/ADDREG rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADDREG diff --git a/opm/parser/share/keywords/000_Eclipse100/A/ADSALNOD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADSALNOD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/ADSALNOD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADSALNOD diff --git a/opm/parser/share/keywords/000_Eclipse100/A/AITS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AITS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/AITS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AITS diff --git a/opm/parser/share/keywords/000_Eclipse100/A/ALL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/ALL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALL diff --git a/opm/parser/share/keywords/000_Eclipse100/A/API b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/API similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/API rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/API diff --git a/opm/parser/share/keywords/000_Eclipse100/A/AQUANCON b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUANCON similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/AQUANCON rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUANCON diff --git a/opm/parser/share/keywords/000_Eclipse100/A/AQUCON b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUCON similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/AQUCON rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUCON diff --git a/opm/parser/share/keywords/000_Eclipse100/A/AQUDIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUDIMS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/AQUDIMS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUDIMS diff --git a/opm/parser/share/keywords/000_Eclipse100/A/AQUFETP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUFETP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/AQUFETP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUFETP diff --git a/opm/parser/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_ANALYTIC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_ANALYTIC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_ANALYTIC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_ANALYTIC diff --git a/opm/parser/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_NUMERIC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_NUMERIC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_NUMERIC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_NUMERIC diff --git a/opm/parser/share/keywords/000_Eclipse100/A/AQUNUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUNUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/A/AQUNUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUNUM diff --git a/opm/parser/share/keywords/000_Eclipse100/B/BLOCK_PROBE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BLOCK_PROBE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/B/BLOCK_PROBE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BLOCK_PROBE diff --git a/opm/parser/share/keywords/000_Eclipse100/B/BOX b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BOX similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/B/BOX rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BOX diff --git a/opm/parser/share/keywords/000_Eclipse100/C/CECON b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CECON similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/C/CECON rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CECON diff --git a/opm/parser/share/keywords/000_Eclipse100/C/COMPDAT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPDAT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/C/COMPDAT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPDAT diff --git a/opm/parser/share/keywords/000_Eclipse100/C/COMPIMB b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPIMB similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/C/COMPIMB rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPIMB diff --git a/opm/parser/share/keywords/000_Eclipse100/C/COMPLUMP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPLUMP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/C/COMPLUMP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPLUMP diff --git a/opm/parser/share/keywords/000_Eclipse100/C/COMPORD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPORD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/C/COMPORD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPORD diff --git a/opm/parser/share/keywords/000_Eclipse100/C/COMPSEGS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPSEGS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/C/COMPSEGS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPSEGS diff --git a/opm/parser/share/keywords/000_Eclipse100/C/CONNECTION_PROBE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CONNECTION_PROBE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/C/CONNECTION_PROBE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CONNECTION_PROBE diff --git a/opm/parser/share/keywords/000_Eclipse100/C/COORD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COORD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/C/COORD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COORD diff --git a/opm/parser/share/keywords/000_Eclipse100/C/COORDSYS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COORDSYS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/C/COORDSYS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COORDSYS diff --git a/opm/parser/share/keywords/000_Eclipse100/C/COPY b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COPY similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/C/COPY rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COPY diff --git a/opm/parser/share/keywords/000_Eclipse100/C/COPYREG b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COPYREG similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/C/COPYREG rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COPYREG diff --git a/opm/parser/share/keywords/000_Eclipse100/C/CPR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CPR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/C/CPR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CPR diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DATE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DATE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATE diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DATES b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATES similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DATES rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATES diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DATUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DATUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATUM diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DEBUG b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEBUG similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DEBUG rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEBUG diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DENSITY b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DENSITY similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DENSITY rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DENSITY diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DEPTH b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEPTH similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DEPTH rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEPTH diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DEPTHZ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEPTHZ similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DEPTHZ rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEPTHZ diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DIMENS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIMENS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DIMENS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIMENS diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DISGAS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DISGAS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DISGAS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DISGAS diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DRSDT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRSDT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DRSDT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRSDT diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DRVDT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRVDT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DRVDT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRVDT diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DUMPFLUX b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUMPFLUX similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DUMPFLUX rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUMPFLUX diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DX b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DX similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DX rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DX diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DXV b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DXV similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DXV rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DXV diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DY b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DY similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DY rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DY diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DYV b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DYV similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DYV rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DYV diff --git a/opm/parser/share/keywords/000_Eclipse100/D/DZ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZ similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/D/DZ rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZ diff --git a/opm/parser/share/keywords/000_Eclipse100/E/ECHO b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ECHO similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/ECHO rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ECHO diff --git a/opm/parser/share/keywords/000_Eclipse100/E/EDIT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EDIT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/EDIT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EDIT diff --git a/opm/parser/share/keywords/000_Eclipse100/E/EDITNNC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EDITNNC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/EDITNNC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EDITNNC diff --git a/opm/parser/share/keywords/000_Eclipse100/E/EHYSTR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EHYSTR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/EHYSTR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EHYSTR diff --git a/opm/parser/share/keywords/000_Eclipse100/E/END b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/END similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/END rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/END diff --git a/opm/parser/share/keywords/000_Eclipse100/E/ENDBOX b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDBOX similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/ENDBOX rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDBOX diff --git a/opm/parser/share/keywords/000_Eclipse100/E/ENDINC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDINC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/ENDINC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDINC diff --git a/opm/parser/share/keywords/000_Eclipse100/E/ENDNUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDNUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/ENDNUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDNUM diff --git a/opm/parser/share/keywords/000_Eclipse100/E/ENDPOINT_SPECIFIERS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDPOINT_SPECIFIERS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/ENDPOINT_SPECIFIERS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDPOINT_SPECIFIERS diff --git a/opm/parser/share/keywords/000_Eclipse100/E/ENDSCALE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDSCALE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/ENDSCALE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDSCALE diff --git a/opm/parser/share/keywords/000_Eclipse100/E/ENDSKIP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDSKIP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/ENDSKIP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDSKIP diff --git a/opm/parser/share/keywords/000_Eclipse100/E/ENKRVD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENKRVD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/ENKRVD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENKRVD diff --git a/opm/parser/share/keywords/000_Eclipse100/E/ENPTVD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENPTVD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/ENPTVD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENPTVD diff --git a/opm/parser/share/keywords/000_Eclipse100/E/EQLDIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQLDIMS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/EQLDIMS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQLDIMS diff --git a/opm/parser/share/keywords/000_Eclipse100/E/EQLNUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQLNUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/EQLNUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQLNUM diff --git a/opm/parser/share/keywords/000_Eclipse100/E/EQLOPTS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQLOPTS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/EQLOPTS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQLOPTS diff --git a/opm/parser/share/keywords/000_Eclipse100/E/EQUALREG b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQUALREG similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/EQUALREG rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQUALREG diff --git a/opm/parser/share/keywords/000_Eclipse100/E/EQUALS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQUALS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/EQUALS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQUALS diff --git a/opm/parser/share/keywords/000_Eclipse100/E/EQUIL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQUIL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/EQUIL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQUIL diff --git a/opm/parser/share/keywords/000_Eclipse100/E/EXCEL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXCEL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/EXCEL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXCEL diff --git a/opm/parser/share/keywords/000_Eclipse100/E/EXTRAPMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXTRAPMS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/E/EXTRAPMS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXTRAPMS diff --git a/opm/parser/share/keywords/000_Eclipse100/F/FAULTDIM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FAULTDIM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/F/FAULTDIM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FAULTDIM diff --git a/opm/parser/share/keywords/000_Eclipse100/F/FAULTS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FAULTS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/F/FAULTS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FAULTS diff --git a/opm/parser/share/keywords/000_Eclipse100/F/FIELD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIELD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/F/FIELD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIELD diff --git a/opm/parser/share/keywords/000_Eclipse100/F/FIELD_PROBE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIELD_PROBE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/F/FIELD_PROBE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIELD_PROBE diff --git a/opm/parser/share/keywords/000_Eclipse100/F/FILLEPS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FILLEPS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/F/FILLEPS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FILLEPS diff --git a/opm/parser/share/keywords/000_Eclipse100/F/FIPOWG b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIPOWG similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/F/FIPOWG rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIPOWG diff --git a/opm/parser/share/keywords/000_Eclipse100/F/FIP_PROBE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIP_PROBE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/F/FIP_PROBE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIP_PROBE diff --git a/opm/parser/share/keywords/000_Eclipse100/F/FLUXNUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FLUXNUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/F/FLUXNUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FLUXNUM diff --git a/opm/parser/share/keywords/000_Eclipse100/F/FMTIN b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FMTIN similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/F/FMTIN rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FMTIN diff --git a/opm/parser/share/keywords/000_Eclipse100/F/FMTOUT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FMTOUT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/F/FMTOUT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FMTOUT diff --git a/opm/parser/share/keywords/000_Eclipse100/F/FMWSET b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FMWSET similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/F/FMWSET rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FMWSET diff --git a/opm/parser/share/keywords/000_Eclipse100/F/FULLIMP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FULLIMP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/F/FULLIMP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FULLIMP diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GAS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GAS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GAS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GAS diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GCONINJE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONINJE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GCONINJE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONINJE diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GCONPROD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONPROD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GCONPROD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONPROD diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GDORIENT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GDORIENT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GDORIENT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GDORIENT diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GECON b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GECON similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GECON rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GECON diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GEFAC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GEFAC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GEFAC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GEFAC diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GMWSET b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GMWSET similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GMWSET rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GMWSET diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GRAVITY b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRAVITY similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GRAVITY rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRAVITY diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GRID b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRID similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GRID rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRID diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GRIDFILE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRIDFILE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GRIDFILE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRIDFILE diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GRIDOPTS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRIDOPTS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GRIDOPTS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRIDOPTS diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GRIDUNIT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRIDUNIT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GRIDUNIT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRIDUNIT diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GROUP_PROBE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GROUP_PROBE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GROUP_PROBE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GROUP_PROBE diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GRUPNET b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPNET similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GRUPNET rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPNET diff --git a/opm/parser/share/keywords/000_Eclipse100/G/GRUPTREE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPTREE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/G/GRUPTREE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPTREE diff --git a/opm/parser/share/keywords/000_Eclipse100/I/IMBNUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMBNUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/IMBNUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMBNUM diff --git a/opm/parser/share/keywords/000_Eclipse100/I/IMKRVD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMKRVD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/IMKRVD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMKRVD diff --git a/opm/parser/share/keywords/000_Eclipse100/I/IMPES b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMPES similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/IMPES rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMPES diff --git a/opm/parser/share/keywords/000_Eclipse100/I/IMPTVD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMPTVD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/IMPTVD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMPTVD diff --git a/opm/parser/share/keywords/000_Eclipse100/I/INCLUDE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/INCLUDE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/INCLUDE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/INCLUDE diff --git a/opm/parser/share/keywords/000_Eclipse100/I/INIT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/INIT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/INIT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/INIT diff --git a/opm/parser/share/keywords/000_Eclipse100/I/IPCG b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IPCG similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/IPCG rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IPCG diff --git a/opm/parser/share/keywords/000_Eclipse100/I/IPCW b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IPCW similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/IPCW rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IPCW diff --git a/opm/parser/share/keywords/000_Eclipse100/I/ISGCR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISGCR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/ISGCR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISGCR diff --git a/opm/parser/share/keywords/000_Eclipse100/I/ISGL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISGL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/ISGL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISGL diff --git a/opm/parser/share/keywords/000_Eclipse100/I/ISGU b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISGU similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/ISGU rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISGU diff --git a/opm/parser/share/keywords/000_Eclipse100/I/ISOGCR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISOGCR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/ISOGCR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISOGCR diff --git a/opm/parser/share/keywords/000_Eclipse100/I/ISOWCR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISOWCR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/ISOWCR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISOWCR diff --git a/opm/parser/share/keywords/000_Eclipse100/I/ISWCR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISWCR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/ISWCR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISWCR diff --git a/opm/parser/share/keywords/000_Eclipse100/I/ISWL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISWL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/ISWL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISWL diff --git a/opm/parser/share/keywords/000_Eclipse100/I/ISWU b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISWU similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/I/ISWU rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISWU diff --git a/opm/parser/share/keywords/000_Eclipse100/J/JFUNC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/J/JFUNC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/J/JFUNC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/J/JFUNC diff --git a/opm/parser/share/keywords/000_Eclipse100/L/LGR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LGR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/L/LGR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LGR diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MAPAXES b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MAPAXES similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MAPAXES rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MAPAXES diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MAPUNITS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MAPUNITS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MAPUNITS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MAPUNITS diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MAXVALUE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MAXVALUE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MAXVALUE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MAXVALUE diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MEMORY b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MEMORY similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MEMORY rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MEMORY diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MESSAGES b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MESSAGES similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MESSAGES rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MESSAGES diff --git a/opm/parser/share/keywords/000_Eclipse100/M/METRIC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/METRIC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/METRIC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/METRIC diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MINPV b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINPV similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MINPV rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINPV diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MINVALUE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINVALUE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MINVALUE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINVALUE diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MISC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MISC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MISC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MISC diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MISCIBLE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MISCIBLE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MISCIBLE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MISCIBLE diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MISCNUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MISCNUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MISCNUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MISCNUM diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MONITOR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MONITOR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MONITOR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MONITOR diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MSFN b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MSFN similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MSFN rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MSFN diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MSGFILE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MSGFILE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MSGFILE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MSGFILE diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MULTFLT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTFLT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MULTFLT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTFLT diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MULTIPLY b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTIPLY similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MULTIPLY rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTIPLY diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MULTIREG b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTIREG similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MULTIREG rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTIREG diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MULTNUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTNUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MULTNUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTNUM diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MULTPV b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTPV similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MULTPV rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTPV diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MULTREGP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTREGP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MULTREGP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTREGP diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MULTREGT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTREGT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MULTREGT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTREGT diff --git a/opm/parser/share/keywords/000_Eclipse100/M/MULT_XYZ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULT_XYZ similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/M/MULT_XYZ rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULT_XYZ diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NETBALAN b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NETBALAN similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NETBALAN rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NETBALAN diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NEWTRAN b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NEWTRAN similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NEWTRAN rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NEWTRAN diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NEXTSTEP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NEXTSTEP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NEXTSTEP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NEXTSTEP diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NNC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NNC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NNC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NNC diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NOCASC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOCASC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NOCASC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOCASC diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NOECHO b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOECHO similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NOECHO rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOECHO diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NOGGF b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOGGF similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NOGGF rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOGGF diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NOINSPEC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOINSPEC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NOINSPEC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOINSPEC diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NOMONITO b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOMONITO similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NOMONITO rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOMONITO diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NONNC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NONNC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NONNC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NONNC diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NORSSPEC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NORSSPEC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NORSSPEC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NORSSPEC diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NOSIM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOSIM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NOSIM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOSIM diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NSTACK b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NSTACK similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NSTACK rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NSTACK diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NTG b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NTG similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NTG rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NTG diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NUMRES b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NUMRES similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NUMRES rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NUMRES diff --git a/opm/parser/share/keywords/000_Eclipse100/N/NUPCOL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NUPCOL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/N/NUPCOL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NUPCOL diff --git a/opm/parser/share/keywords/000_Eclipse100/O/OIL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OIL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/O/OIL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OIL diff --git a/opm/parser/share/keywords/000_Eclipse100/O/OILVISCT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OILVISCT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/O/OILVISCT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OILVISCT diff --git a/opm/parser/share/keywords/000_Eclipse100/O/OLDTRAN b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OLDTRAN similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/O/OLDTRAN rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OLDTRAN diff --git a/opm/parser/share/keywords/000_Eclipse100/O/OPERATE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OPERATE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/O/OPERATE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OPERATE diff --git a/opm/parser/share/keywords/000_Eclipse100/O/OPERNUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OPERNUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/O/OPERNUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OPERNUM diff --git a/opm/parser/share/keywords/000_Eclipse100/O/OPTIONS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OPTIONS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/O/OPTIONS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OPTIONS diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PARALLEL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PARALLEL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PARALLEL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PARALLEL diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PATHS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PATHS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PATHS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PATHS diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PBVD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PBVD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PBVD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PBVD diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PCG b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PCG similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PCG rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PCG diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PERFORMANCE_PROBE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERFORMANCE_PROBE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PERFORMANCE_PROBE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERFORMANCE_PROBE diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PERMX b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMX similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PERMX rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMX diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PERMXY b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMXY similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PERMXY rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMXY diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PERMY b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMY similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PERMY rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMY diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PERMYZ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMYZ similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PERMYZ rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMYZ diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PERMZ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMZ similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PERMZ rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMZ diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PERMZX b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMZX similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PERMZX rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMZX diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PIMTDIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PIMTDIMS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PIMTDIMS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PIMTDIMS diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PIMULTAB b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PIMULTAB similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PIMULTAB rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PIMULTAB diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PINCH b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PINCH similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PINCH rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PINCH diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PLMIXPAR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLMIXPAR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PLMIXPAR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLMIXPAR diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PLYADS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYADS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PLYADS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYADS diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PLYADSS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYADSS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PLYADSS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYADSS diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PLYDHFLF b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYDHFLF similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PLYDHFLF rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYDHFLF diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PLYMAX b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYMAX similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PLYMAX rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYMAX diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PLYROCK b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYROCK similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PLYROCK rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYROCK diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PLYSHEAR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYSHEAR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PLYSHEAR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYSHEAR diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PLYSHLOG b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYSHLOG similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PLYSHLOG rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYSHLOG diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PLYVISC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYVISC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PLYVISC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYVISC diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PMISC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PMISC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PMISC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PMISC diff --git a/opm/parser/share/keywords/000_Eclipse100/P/POLYMER b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/POLYMER similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/POLYMER rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/POLYMER diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PORO b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PORO similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PORO rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PORO diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PORV b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PORV similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PORV rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PORV diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PRESSURE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PRESSURE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PRESSURE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PRESSURE diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PROPS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PROPS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PROPS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PROPS diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PRORDER b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PRORDER similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PRORDER rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PRORDER diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PVCDO b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVCDO similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PVCDO rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVCDO diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PVDG b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVDG similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PVDG rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVDG diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PVDO b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVDO similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PVDO rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVDO diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PVDS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVDS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PVDS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVDS diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PVTG b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTG similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PVTG rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTG diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PVTNUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTNUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PVTNUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTNUM diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PVTO b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTO similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PVTO rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTO diff --git a/opm/parser/share/keywords/000_Eclipse100/P/PVTW b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTW similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/P/PVTW rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTW diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RADFIN4 b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RADFIN4 similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RADFIN4 rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RADFIN4 diff --git a/opm/parser/share/keywords/000_Eclipse100/R/REGDIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REGDIMS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/REGDIMS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REGDIMS diff --git a/opm/parser/share/keywords/000_Eclipse100/R/REGIONS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REGIONS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/REGIONS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REGIONS diff --git a/opm/parser/share/keywords/000_Eclipse100/R/REGION_PROBE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REGION_PROBE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/REGION_PROBE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REGION_PROBE diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RESTART b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RESTART similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RESTART rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RESTART diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RKTRMDIR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RKTRMDIR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RKTRMDIR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RKTRMDIR diff --git a/opm/parser/share/keywords/000_Eclipse100/R/ROCK b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCK similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/ROCK rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCK diff --git a/opm/parser/share/keywords/000_Eclipse100/R/ROCKCOMP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKCOMP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/ROCKCOMP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKCOMP diff --git a/opm/parser/share/keywords/000_Eclipse100/R/ROCKNUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKNUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/ROCKNUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKNUM diff --git a/opm/parser/share/keywords/000_Eclipse100/R/ROCKOPTS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKOPTS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/ROCKOPTS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKOPTS diff --git a/opm/parser/share/keywords/000_Eclipse100/R/ROCKTAB b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKTAB similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/ROCKTAB rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKTAB diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RPTGRID b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTGRID similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RPTGRID rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTGRID diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RPTONLY b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTONLY similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RPTONLY rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTONLY diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RPTONLYO b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTONLYO similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RPTONLYO rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTONLYO diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RPTPROPS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTPROPS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RPTPROPS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTPROPS diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RPTREGS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTREGS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RPTREGS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTREGS diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RPTRST b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTRST similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RPTRST rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTRST diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RPTRUNSP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTRUNSP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RPTRUNSP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTRUNSP diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RPTSCHED b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTSCHED similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RPTSCHED rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTSCHED diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RPTSOL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTSOL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RPTSOL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTSOL diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RS diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RSVD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RSVD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RSVD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RSVD diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RTEMPVD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RTEMPVD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RTEMPVD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RTEMPVD diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RUNSPEC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RUNSPEC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RUNSPEC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RUNSPEC diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RUNSUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RUNSUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RUNSUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RUNSUM diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RV b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RV similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RV rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RV diff --git a/opm/parser/share/keywords/000_Eclipse100/R/RVVD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RVVD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/R/RVVD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RVVD diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SATNUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SATNUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SATNUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SATNUM diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SATOPTS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SATOPTS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SATOPTS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SATOPTS diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SAVE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SAVE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SAVE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SAVE diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SCALECRS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCALECRS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SCALECRS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCALECRS diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SCHEDULE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCHEDULE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SCHEDULE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCHEDULE diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SDENSITY b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SDENSITY similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SDENSITY rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SDENSITY diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SEPARATE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SEPARATE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SEPARATE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SEPARATE diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SGAS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGAS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SGAS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGAS diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SGCR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGCR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SGCR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGCR diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SGCWMIS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGCWMIS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SGCWMIS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGCWMIS diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SGFN b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGFN similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SGFN rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGFN diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SGL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SGL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGL diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SGOF b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGOF similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SGOF rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGOF diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SGU b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGU similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SGU rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGU diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SGWFN b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGWFN similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SGWFN rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGWFN diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SHRATE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SHRATE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SHRATE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SHRATE diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SKIP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SKIP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIP diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SKIP100 b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIP100 similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SKIP100 rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIP100 diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SKIP300 b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIP300 similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SKIP300 rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIP300 diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SKIPREST b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIPREST similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SKIPREST rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIPREST diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SLGOF b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SLGOF similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SLGOF rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SLGOF diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SMRYDIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SMRYDIMS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SMRYDIMS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SMRYDIMS diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SOF2 b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOF2 similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SOF2 rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOF2 diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SOF3 b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOF3 similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SOF3 rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOF3 diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SOGCR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOGCR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SOGCR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOGCR diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SOIL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOIL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SOIL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOIL diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SOLUTION b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLUTION similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SOLUTION rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLUTION diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SOLVENT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLVENT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SOLVENT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLVENT diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SORWMIS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SORWMIS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SORWMIS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SORWMIS diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SOWCR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOWCR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SOWCR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOWCR diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SPECGRID b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SPECGRID similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SPECGRID rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SPECGRID diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SPECHEAT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SPECHEAT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SPECHEAT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SPECHEAT diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SPECROCK b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SPECROCK similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SPECROCK rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SPECROCK diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SSFN b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSFN similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SSFN rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSFN diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SSOL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSOL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SSOL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSOL diff --git a/opm/parser/share/keywords/000_Eclipse100/S/START b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/START similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/START rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/START diff --git a/opm/parser/share/keywords/000_Eclipse100/S/STONE1 b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STONE1 similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/STONE1 rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STONE1 diff --git a/opm/parser/share/keywords/000_Eclipse100/S/STONE1EX b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STONE1EX similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/STONE1EX rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STONE1EX diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SUMMARY b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SUMMARY similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SUMMARY rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SUMMARY diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SUMTHIN b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SUMTHIN similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SUMTHIN rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SUMTHIN diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SWAT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWAT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SWAT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWAT diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SWATINIT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWATINIT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SWATINIT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWATINIT diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SWCR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWCR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SWCR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWCR diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SWFN b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWFN similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SWFN rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWFN diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SWL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SWL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWL diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SWOF b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWOF similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SWOF rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWOF diff --git a/opm/parser/share/keywords/000_Eclipse100/S/SWU b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWU similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/S/SWU rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWU diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TABDIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TABDIMS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TABDIMS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TABDIMS diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TEMP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TEMP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TEMP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TEMP diff --git a/opm/parser/share/keywords/000_Eclipse100/T/THCONR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/THCONR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/THCONR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/THCONR diff --git a/opm/parser/share/keywords/000_Eclipse100/T/THPRES b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/THPRES similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/THPRES rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/THPRES diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TITLE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TITLE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TITLE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TITLE diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TLMIXPAR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TLMIXPAR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TLMIXPAR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TLMIXPAR diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TNUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TNUM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TNUM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TNUM diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TOPS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TOPS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TOPS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TOPS diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TRACER b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACER similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TRACER rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACER diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TRACERS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACERS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TRACERS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACERS diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TRANX b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANX similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TRANX rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANX diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TRANY b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANY similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TRANY rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANY diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TRANZ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANZ similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TRANZ rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANZ diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TSTEP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TSTEP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TSTEP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TSTEP diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TUNING b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TUNING similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TUNING rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TUNING diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TUNINGDP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TUNINGDP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TUNINGDP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TUNINGDP diff --git a/opm/parser/share/keywords/000_Eclipse100/T/TVDP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TVDP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/T/TVDP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TVDP diff --git a/opm/parser/share/keywords/000_Eclipse100/U/UDADIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDADIMS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/U/UDADIMS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDADIMS diff --git a/opm/parser/share/keywords/000_Eclipse100/U/UDQDIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDQDIMS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/U/UDQDIMS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDQDIMS diff --git a/opm/parser/share/keywords/000_Eclipse100/U/UNIFIN b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UNIFIN similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/U/UNIFIN rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UNIFIN diff --git a/opm/parser/share/keywords/000_Eclipse100/U/UNIFOUT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UNIFOUT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/U/UNIFOUT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UNIFOUT diff --git a/opm/parser/share/keywords/000_Eclipse100/V/VAPOIL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VAPOIL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/V/VAPOIL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VAPOIL diff --git a/opm/parser/share/keywords/000_Eclipse100/V/VAPPARS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VAPPARS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/V/VAPPARS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VAPPARS diff --git a/opm/parser/share/keywords/000_Eclipse100/V/VFPIDIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPIDIMS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/V/VFPIDIMS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPIDIMS diff --git a/opm/parser/share/keywords/000_Eclipse100/V/VFPINJ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPINJ similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/V/VFPINJ rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPINJ diff --git a/opm/parser/share/keywords/000_Eclipse100/V/VFPPDIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPPDIMS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/V/VFPPDIMS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPPDIMS diff --git a/opm/parser/share/keywords/000_Eclipse100/V/VFPPROD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPPROD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/V/VFPPROD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPPROD diff --git a/opm/parser/share/keywords/000_Eclipse100/V/VISCREF b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VISCREF similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/V/VISCREF rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VISCREF diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WATER b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WATER similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WATER rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WATER diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WATVISCT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WATVISCT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WATVISCT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WATVISCT diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WCONHIST b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONHIST similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WCONHIST rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONHIST diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WCONINJ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONINJ similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WCONINJ rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONINJ diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WCONINJE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONINJE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WCONINJE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONINJE diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WCONINJH b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONINJH similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WCONINJH rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONINJH diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WCONPROD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONPROD similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WCONPROD rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONPROD diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WDFACCOR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WDFACCOR similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WDFACCOR rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WDFACCOR diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WDRILTIM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WDRILTIM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WDRILTIM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WDRILTIM diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WECON b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WECON similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WECON rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WECON diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WEFAC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WEFAC similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WEFAC rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WEFAC diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WELLDIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELLDIMS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WELLDIMS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELLDIMS diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WELL_PROBE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELL_PROBE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WELL_PROBE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELL_PROBE diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WELOPEN b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELOPEN similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WELOPEN rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELOPEN diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WELSEGS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELSEGS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WELSEGS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELSEGS diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WELSPECS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELSPECS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WELSPECS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELSPECS diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WELTARG b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELTARG similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WELTARG rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELTARG diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WGRUPCON b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WGRUPCON similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WGRUPCON rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WGRUPCON diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WHISTCTL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WHISTCTL similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WHISTCTL rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WHISTCTL diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WLIFT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WLIFT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WLIFT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WLIFT diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WORKLIM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WORKLIM similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WORKLIM rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WORKLIM diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WPAVE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPAVE similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WPAVE rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPAVE diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WPAVEDEP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPAVEDEP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WPAVEDEP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPAVEDEP diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WPIMULT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPIMULT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WPIMULT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPIMULT diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WPITAB b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPITAB similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WPITAB rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPITAB diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WPOLYMER b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPOLYMER similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WPOLYMER rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPOLYMER diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WRFT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WRFT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WRFT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WRFT diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WRFTPLT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WRFTPLT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WRFTPLT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WRFTPLT diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WSEGDIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGDIMS similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WSEGDIMS rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGDIMS diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WSEGITER b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGITER similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WSEGITER rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGITER diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WSOLVENT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSOLVENT similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WSOLVENT rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSOLVENT diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WTEMP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTEMP similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WTEMP rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTEMP diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WTEST b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTEST similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WTEST rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTEST diff --git a/opm/parser/share/keywords/000_Eclipse100/W/WTRACER b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTRACER similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/W/WTRACER rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTRACER diff --git a/opm/parser/share/keywords/000_Eclipse100/Z/ZCORN b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/Z/ZCORN similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/Z/ZCORN rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/Z/ZCORN diff --git a/opm/parser/share/keywords/000_Eclipse100/Z/ZIPPY2 b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/Z/ZIPPY2 similarity index 100% rename from opm/parser/share/keywords/000_Eclipse100/Z/ZIPPY2 rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/Z/ZIPPY2 diff --git a/opm/parser/share/keywords/001_Eclipse300/B/BLOCK_PROBE300 b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/B/BLOCK_PROBE300 similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/B/BLOCK_PROBE300 rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/B/BLOCK_PROBE300 diff --git a/opm/parser/share/keywords/001_Eclipse300/C/COMPS b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/COMPS similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/C/COMPS rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/COMPS diff --git a/opm/parser/share/keywords/001_Eclipse300/C/CREF b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/CREF similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/C/CREF rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/CREF diff --git a/opm/parser/share/keywords/001_Eclipse300/C/CREFS b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/CREFS similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/C/CREFS rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/CREFS diff --git a/opm/parser/share/keywords/001_Eclipse300/D/DREF b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/D/DREF similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/D/DREF rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/D/DREF diff --git a/opm/parser/share/keywords/001_Eclipse300/D/DREFS b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/D/DREFS similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/D/DREFS rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/D/DREFS diff --git a/opm/parser/share/keywords/001_Eclipse300/D/DZV b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/D/DZV similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/D/DZV rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/D/DZV diff --git a/opm/parser/share/keywords/001_Eclipse300/G/GASVISCT b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/G/GASVISCT similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/G/GASVISCT rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/G/GASVISCT diff --git a/opm/parser/share/keywords/001_Eclipse300/G/GCONPROD b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/G/GCONPROD similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/G/GCONPROD rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/G/GCONPROD diff --git a/opm/parser/share/keywords/001_Eclipse300/M/MW b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/M/MW similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/M/MW rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/M/MW diff --git a/opm/parser/share/keywords/001_Eclipse300/M/MWS b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/M/MWS similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/M/MWS rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/M/MWS diff --git a/opm/parser/share/keywords/001_Eclipse300/O/OILCOMPR b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/O/OILCOMPR similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/O/OILCOMPR rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/O/OILCOMPR diff --git a/opm/parser/share/keywords/001_Eclipse300/O/OILMW b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/O/OILMW similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/O/OILMW rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/O/OILMW diff --git a/opm/parser/share/keywords/001_Eclipse300/O/OILVTIM b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/O/OILVTIM similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/O/OILVTIM rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/O/OILVTIM diff --git a/opm/parser/share/keywords/001_Eclipse300/P/PREF b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/P/PREF similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/P/PREF rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/P/PREF diff --git a/opm/parser/share/keywords/001_Eclipse300/P/PREFS b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/P/PREFS similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/P/PREFS rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/P/PREFS diff --git a/opm/parser/share/keywords/001_Eclipse300/S/STCOND b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/S/STCOND similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/S/STCOND rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/S/STCOND diff --git a/opm/parser/share/keywords/001_Eclipse300/T/TEMPI b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TEMPI similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/T/TEMPI rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TEMPI diff --git a/opm/parser/share/keywords/001_Eclipse300/T/TEMPVD b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TEMPVD similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/T/TEMPVD rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TEMPVD diff --git a/opm/parser/share/keywords/001_Eclipse300/T/THERMAL b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THERMAL similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/T/THERMAL rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THERMAL diff --git a/opm/parser/share/keywords/001_Eclipse300/T/THERMEX1 b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THERMEX1 similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/T/THERMEX1 rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THERMEX1 diff --git a/opm/parser/share/keywords/001_Eclipse300/T/TREF b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TREF similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/T/TREF rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TREF diff --git a/opm/parser/share/keywords/001_Eclipse300/T/TREFS b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TREFS similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/T/TREFS rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TREFS diff --git a/opm/parser/share/keywords/001_Eclipse300/W/WATDENT b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/W/WATDENT similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/W/WATDENT rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/W/WATDENT diff --git a/opm/parser/share/keywords/001_Eclipse300/Z/ZFACT1 b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACT1 similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/Z/ZFACT1 rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACT1 diff --git a/opm/parser/share/keywords/001_Eclipse300/Z/ZFACT1S b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACT1S similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/Z/ZFACT1S rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACT1S diff --git a/opm/parser/share/keywords/001_Eclipse300/Z/ZFACTOR b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACTOR similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/Z/ZFACTOR rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACTOR diff --git a/opm/parser/share/keywords/001_Eclipse300/Z/ZFACTORS b/src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACTORS similarity index 100% rename from opm/parser/share/keywords/001_Eclipse300/Z/ZFACTORS rename to src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACTORS diff --git a/opm/parser/share/keywords/002_Frontsim/N/NOGRAV b/src/opm/parser/eclipse/share/keywords/002_Frontsim/N/NOGRAV similarity index 100% rename from opm/parser/share/keywords/002_Frontsim/N/NOGRAV rename to src/opm/parser/eclipse/share/keywords/002_Frontsim/N/NOGRAV diff --git a/opm/parser/share/keywords/900_OPM/G/GCOMPIDX b/src/opm/parser/eclipse/share/keywords/900_OPM/G/GCOMPIDX similarity index 100% rename from opm/parser/share/keywords/900_OPM/G/GCOMPIDX rename to src/opm/parser/eclipse/share/keywords/900_OPM/G/GCOMPIDX diff --git a/opm/parser/share/keywords/900_OPM/G/GRUPRIG b/src/opm/parser/eclipse/share/keywords/900_OPM/G/GRUPRIG similarity index 100% rename from opm/parser/share/keywords/900_OPM/G/GRUPRIG rename to src/opm/parser/eclipse/share/keywords/900_OPM/G/GRUPRIG diff --git a/opm/parser/share/keywords/900_OPM/M/MINPVFIL b/src/opm/parser/eclipse/share/keywords/900_OPM/M/MINPVFIL similarity index 100% rename from opm/parser/share/keywords/900_OPM/M/MINPVFIL rename to src/opm/parser/eclipse/share/keywords/900_OPM/M/MINPVFIL diff --git a/opm/parser/share/keywords/900_OPM/O/OCOMPIDX b/src/opm/parser/eclipse/share/keywords/900_OPM/O/OCOMPIDX similarity index 100% rename from opm/parser/share/keywords/900_OPM/O/OCOMPIDX rename to src/opm/parser/eclipse/share/keywords/900_OPM/O/OCOMPIDX diff --git a/opm/parser/share/keywords/900_OPM/T/TLPMIXPA b/src/opm/parser/eclipse/share/keywords/900_OPM/T/TLPMIXPA similarity index 100% rename from opm/parser/share/keywords/900_OPM/T/TLPMIXPA rename to src/opm/parser/eclipse/share/keywords/900_OPM/T/TLPMIXPA diff --git a/testdata/json/example1.json b/tests/json/example1.json similarity index 100% rename from testdata/json/example1.json rename to tests/json/example1.json diff --git a/opm/json/tests/jsonTests.cpp b/tests/json/jsonTests.cpp similarity index 97% rename from opm/json/tests/jsonTests.cpp rename to tests/json/jsonTests.cpp index a76ab0758..f4ceceab1 100644 --- a/opm/json/tests/jsonTests.cpp +++ b/tests/json/jsonTests.cpp @@ -28,7 +28,7 @@ #include - +namespace framework = boost::unit_test::framework; @@ -251,13 +251,15 @@ BOOST_AUTO_TEST_CASE(Parse_fileDoesNotExist_Throws) { BOOST_AUTO_TEST_CASE(Parse_fileExists_OK) { - boost::filesystem::path jsonFile("testdata/json/example1.json"); + const auto arg = framework::master_test_suite().argv[1]; + boost::filesystem::path jsonFile(arg); BOOST_CHECK_NO_THROW( Json::JsonObject parser(jsonFile) ); } BOOST_AUTO_TEST_CASE(to_string_ok) { - boost::filesystem::path jsonFile("testdata/json/example1.json"); + const auto arg = framework::master_test_suite().argv[1]; + boost::filesystem::path jsonFile(arg); Json::JsonObject parser(jsonFile); std::string json_string = "{\n" diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/ADDREGTests.cpp b/tests/parser/ADDREGTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/ADDREGTests.cpp rename to tests/parser/ADDREGTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/BoxManagerTests.cpp b/tests/parser/BoxManagerTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/BoxManagerTests.cpp rename to tests/parser/BoxManagerTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/BoxTests.cpp b/tests/parser/BoxTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/BoxTests.cpp rename to tests/parser/BoxTests.cpp diff --git a/opm/parser/eclipse/Units/tests/COMPSEGUnits.cpp b/tests/parser/COMPSEGUnits.cpp similarity index 100% rename from opm/parser/eclipse/Units/tests/COMPSEGUnits.cpp rename to tests/parser/COMPSEGUnits.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/tests/ColumnSchemaTests.cpp b/tests/parser/ColumnSchemaTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/tests/ColumnSchemaTests.cpp rename to tests/parser/ColumnSchemaTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/CompletionSetTests.cpp b/tests/parser/CompletionSetTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/CompletionSetTests.cpp rename to tests/parser/CompletionSetTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/CompletionTests.cpp b/tests/parser/CompletionTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/CompletionTests.cpp rename to tests/parser/CompletionTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/CopyRegTests.cpp b/tests/parser/CopyRegTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/CopyRegTests.cpp rename to tests/parser/CopyRegTests.cpp diff --git a/opm/parser/eclipse/Deck/tests/DeckDoubleItemTests.cpp b/tests/parser/DeckDoubleItemTests.cpp similarity index 100% rename from opm/parser/eclipse/Deck/tests/DeckDoubleItemTests.cpp rename to tests/parser/DeckDoubleItemTests.cpp diff --git a/opm/parser/eclipse/Deck/tests/DeckIntItemTests.cpp b/tests/parser/DeckIntItemTests.cpp similarity index 100% rename from opm/parser/eclipse/Deck/tests/DeckIntItemTests.cpp rename to tests/parser/DeckIntItemTests.cpp diff --git a/opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp b/tests/parser/DeckKeywordTests.cpp similarity index 100% rename from opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp rename to tests/parser/DeckKeywordTests.cpp diff --git a/opm/parser/eclipse/Deck/tests/DeckRecordTests.cpp b/tests/parser/DeckRecordTests.cpp similarity index 100% rename from opm/parser/eclipse/Deck/tests/DeckRecordTests.cpp rename to tests/parser/DeckRecordTests.cpp diff --git a/opm/parser/eclipse/Deck/tests/DeckStringItemTests.cpp b/tests/parser/DeckStringItemTests.cpp similarity index 100% rename from opm/parser/eclipse/Deck/tests/DeckStringItemTests.cpp rename to tests/parser/DeckStringItemTests.cpp diff --git a/opm/parser/eclipse/Deck/tests/DeckTests.cpp b/tests/parser/DeckTests.cpp similarity index 100% rename from opm/parser/eclipse/Deck/tests/DeckTests.cpp rename to tests/parser/DeckTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/DynamicStateTests.cpp b/tests/parser/DynamicStateTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/DynamicStateTests.cpp rename to tests/parser/DynamicStateTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/DynamicVectorTests.cpp b/tests/parser/DynamicVectorTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/DynamicVectorTests.cpp rename to tests/parser/DynamicVectorTests.cpp diff --git a/opm/parser/eclipse/EclipseState/tests/Eclipse3DPropertiesTests.cpp b/tests/parser/Eclipse3DPropertiesTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/tests/Eclipse3DPropertiesTests.cpp rename to tests/parser/Eclipse3DPropertiesTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/EclipseGridTests.cpp b/tests/parser/EclipseGridTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/EclipseGridTests.cpp rename to tests/parser/EclipseGridTests.cpp diff --git a/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp b/tests/parser/EclipseStateTests.cpp similarity index 98% rename from opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp rename to tests/parser/EclipseStateTests.cpp index b2e7a1f36..43dd57eb6 100644 --- a/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp +++ b/tests/parser/EclipseStateTests.cpp @@ -49,6 +49,9 @@ along with OPM. If not, see . using namespace Opm; +inline std::string prepath() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} static Deck createDeckTOP() { const char *deckData = @@ -440,11 +443,11 @@ BOOST_AUTO_TEST_CASE(WithGridOptsDefaultRegion) { BOOST_AUTO_TEST_CASE(TestIOConfigBaseName) { ParseContext parseContext; Parser parser; - auto deck = parser.parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseContext); + auto deck = parser.parseFile(prepath() + "IOConfig/SPE1CASE2.DATA", parseContext); EclipseState state(deck, parseContext); const auto& io = state.cfg().io(); BOOST_CHECK_EQUAL(io.getBaseName(), "SPE1CASE2"); - BOOST_CHECK_EQUAL(io.getOutputDir(), "testdata/integration_tests/IOConfig"); + BOOST_CHECK_EQUAL(io.getOutputDir(), prepath() + "IOConfig"); Parser parser2; auto deck2 = createDeckWithGridOpts(); diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/EqualRegTests.cpp b/tests/parser/EqualRegTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/EqualRegTests.cpp rename to tests/parser/EqualRegTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/EventTests.cpp b/tests/parser/EventTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/EventTests.cpp rename to tests/parser/EventTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/FaceDirTests.cpp b/tests/parser/FaceDirTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/FaceDirTests.cpp rename to tests/parser/FaceDirTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/FaultTests.cpp b/tests/parser/FaultTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/FaultTests.cpp rename to tests/parser/FaultTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/FaultsTests.cpp b/tests/parser/FaultsTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/FaultsTests.cpp rename to tests/parser/FaultsTests.cpp diff --git a/opm/parser/eclipse/Utility/tests/FunctionalTests.cpp b/tests/parser/FunctionalTests.cpp similarity index 100% rename from opm/parser/eclipse/Utility/tests/FunctionalTests.cpp rename to tests/parser/FunctionalTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/GeomodifierTests.cpp b/tests/parser/GeomodifierTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/GeomodifierTests.cpp rename to tests/parser/GeomodifierTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/GridPropertiesTests.cpp b/tests/parser/GridPropertiesTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/GridPropertiesTests.cpp rename to tests/parser/GridPropertiesTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/GridPropertyTests.cpp b/tests/parser/GridPropertyTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/GridPropertyTests.cpp rename to tests/parser/GridPropertyTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/GroupTests.cpp b/tests/parser/GroupTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/GroupTests.cpp rename to tests/parser/GroupTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/GroupTreeTests.cpp b/tests/parser/GroupTreeTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/GroupTreeTests.cpp rename to tests/parser/GroupTreeTests.cpp diff --git a/opm/parser/eclipse/EclipseState/IOConfig/tests/IOConfigTest.cpp b/tests/parser/IOConfigTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/IOConfig/tests/IOConfigTest.cpp rename to tests/parser/IOConfigTests.cpp diff --git a/opm/parser/eclipse/EclipseState/InitConfig/tests/InitConfigTest.cpp b/tests/parser/InitConfigTest.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/InitConfig/tests/InitConfigTest.cpp rename to tests/parser/InitConfigTest.cpp diff --git a/opm/parser/eclipse/Generator/tests/KeywordLoaderTests.cpp b/tests/parser/KeywordLoaderTests.cpp similarity index 68% rename from opm/parser/eclipse/Generator/tests/KeywordLoaderTests.cpp rename to tests/parser/KeywordLoaderTests.cpp index 5bdc28a85..a37912e33 100644 --- a/opm/parser/eclipse/Generator/tests/KeywordLoaderTests.cpp +++ b/tests/parser/KeywordLoaderTests.cpp @@ -32,6 +32,10 @@ #include #include +inline std::string prefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + BOOST_AUTO_TEST_CASE(EmptyKeywordLoader) { Opm::KeywordLoader loader(false); @@ -46,11 +50,11 @@ BOOST_AUTO_TEST_CASE(LoadKeyword) { Opm::KeywordLoader loader(false); BOOST_CHECK_THROW( loader.loadKeyword("does/not/exists") , std::invalid_argument ); - BOOST_CHECK_THROW( loader.loadKeyword("testdata/parser/keyword-generator/invalid.json") , std::invalid_argument); - BOOST_CHECK_THROW( loader.loadKeyword("testdata/parser/keyword-generator/PORO-invalid") , std::invalid_argument); + BOOST_CHECK_THROW( loader.loadKeyword(prefix() + "invalid.json") , std::invalid_argument); + BOOST_CHECK_THROW( loader.loadKeyword(prefix() + "PORO-invalid") , std::invalid_argument); - loader.loadKeyword("testdata/parser/keyword-generator/PORO.json"); - loader.loadKeyword("testdata/parser/keyword-generator/PORO.json"); + loader.loadKeyword(prefix() + "PORO.json"); + loader.loadKeyword(prefix() + "PORO.json"); BOOST_CHECK_EQUAL( true , loader.hasKeyword("PORO")); BOOST_CHECK_EQUAL( 1U , loader.size() ); @@ -63,9 +67,9 @@ BOOST_AUTO_TEST_CASE(LoadKeyword) { BOOST_AUTO_TEST_CASE(LoadKeywordDirectory) { Opm::KeywordLoader loader(false); BOOST_CHECK_THROW( loader.loadKeywordDirectory("does/not/exists") , std::invalid_argument ); - BOOST_CHECK_THROW( loader.loadKeywordDirectory("testdata/parser/keyword-generator/invalid.json") , std::invalid_argument); + BOOST_CHECK_THROW( loader.loadKeywordDirectory(prefix() + "invalid.json") , std::invalid_argument); - BOOST_CHECK_EQUAL( 4 , loader.loadKeywordDirectory( "testdata/parser/keyword-generator/loader/001_ECLIPSE100")); + BOOST_CHECK_EQUAL( 4 , loader.loadKeywordDirectory( prefix() + "loader/001_ECLIPSE100")); BOOST_CHECK( loader.hasKeyword("ADDREG") ); BOOST_CHECK( loader.hasKeyword("ACTNUM") ); BOOST_CHECK( loader.hasKeyword("BOX") ); @@ -79,23 +83,23 @@ BOOST_AUTO_TEST_CASE(LoadKeywordDirectory) { BOOST_AUTO_TEST_CASE(DirectorySort) { - BOOST_CHECK_THROW( Opm::KeywordLoader::sortSubdirectories( "testdata/parser/keyword-generator/loader/ZCORN") , std::invalid_argument ); - std::vector dir_list = Opm::KeywordLoader::sortSubdirectories( "testdata/parser/keyword-generator/loader"); + BOOST_CHECK_THROW( Opm::KeywordLoader::sortSubdirectories( prefix() + "loader/ZCORN") , std::invalid_argument ); + std::vector dir_list = Opm::KeywordLoader::sortSubdirectories( prefix() + "loader"); namespace fs = boost::filesystem; BOOST_CHECK_EQUAL( 2U , dir_list.size()); - BOOST_CHECK_EQUAL( fs::path( dir_list[0] ), fs::path( "testdata/parser/keyword-generator/loader/001_ECLIPSE100" ) ); - BOOST_CHECK_EQUAL( fs::path( dir_list[1] ), fs::path( "testdata/parser/keyword-generator/loader/002_ECLIPSE300" ) ); + BOOST_CHECK_EQUAL( fs::path( dir_list[0] ), fs::path( prefix() + "loader/001_ECLIPSE100" ) ); + BOOST_CHECK_EQUAL( fs::path( dir_list[1] ), fs::path( prefix() + "loader/002_ECLIPSE300" ) ); } BOOST_AUTO_TEST_CASE(BigLoad) { Opm::KeywordLoader loader(false); BOOST_CHECK_THROW( loader.loadMultipleKeywordDirectories("does/not/exists") , std::invalid_argument ); - BOOST_CHECK_THROW( loader.loadMultipleKeywordDirectories("testdata/parser/keyword-generator/invalid.json") , std::invalid_argument); + BOOST_CHECK_THROW( loader.loadMultipleKeywordDirectories(prefix() + "invalid.json") , std::invalid_argument); - loader.loadMultipleKeywordDirectories("testdata/parser/keyword-generator/loader"); + loader.loadMultipleKeywordDirectories(prefix() + "loader"); BOOST_CHECK( loader.hasKeyword("EQUIL")); { auto kw = loader.getKeyword("ADDREG"); diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/MULTREGTScannerTests.cpp b/tests/parser/MULTREGTScannerTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/MULTREGTScannerTests.cpp rename to tests/parser/MULTREGTScannerTests.cpp diff --git a/opm/parser/eclipse/Parser/tests/MessageContainerTest.cpp b/tests/parser/MessageContainerTest.cpp similarity index 100% rename from opm/parser/eclipse/Parser/tests/MessageContainerTest.cpp rename to tests/parser/MessageContainerTest.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/MessageLimitTests.cpp b/tests/parser/MessageLimitTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/MessageLimitTests.cpp rename to tests/parser/MessageLimitTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/MultiRegTests.cpp b/tests/parser/MultiRegTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/MultiRegTests.cpp rename to tests/parser/MultiRegTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Util/tests/OrderedMapTests.cpp b/tests/parser/OrderedMapTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Util/tests/OrderedMapTests.cpp rename to tests/parser/OrderedMapTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/PORVTests.cpp b/tests/parser/PORVTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/PORVTests.cpp rename to tests/parser/PORVTests.cpp diff --git a/opm/parser/eclipse/Parser/tests/ParseContextTests.cpp b/tests/parser/ParseContextTests.cpp similarity index 100% rename from opm/parser/eclipse/Parser/tests/ParseContextTests.cpp rename to tests/parser/ParseContextTests.cpp diff --git a/opm/parser/eclipse/Parser/tests/ParserEnumTests.cpp b/tests/parser/ParserEnumTests.cpp similarity index 100% rename from opm/parser/eclipse/Parser/tests/ParserEnumTests.cpp rename to tests/parser/ParserEnumTests.cpp diff --git a/opm/parser/eclipse/Parser/tests/ParserIncludeTests.cpp b/tests/parser/ParserIncludeTests.cpp similarity index 84% rename from opm/parser/eclipse/Parser/tests/ParserIncludeTests.cpp rename to tests/parser/ParserIncludeTests.cpp index 8528b98e3..0a4fe2852 100644 --- a/opm/parser/eclipse/Parser/tests/ParserIncludeTests.cpp +++ b/tests/parser/ParserIncludeTests.cpp @@ -27,13 +27,14 @@ #include #include -#include "opm_parser_build_config.hpp" - +inline std::string prefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} #ifdef OPM_PARSER_BUILD_HAVE_SYMLINK BOOST_AUTO_TEST_CASE(ParserKeyword_includeInvalid) { - boost::filesystem::path inputFilePath("testdata/parser/includeInvalid.data"); + boost::filesystem::path inputFilePath(prefix() + "includeInvalid.data"); Opm::Parser parser; Opm::ParseContext parseContext; @@ -48,7 +49,7 @@ BOOST_AUTO_TEST_CASE(ParserKeyword_includeInvalid) { BOOST_AUTO_TEST_CASE(Verify_find_includes_Data_file_is_a_symlink) { - boost::filesystem::path inputFilePath("testdata/parser/includeSymlinkTestdata/symlink1/case_symlink.data"); + boost::filesystem::path inputFilePath(prefix() + "includeSymlinkTestdata/symlink1/case_symlink.data"); Opm::Parser parser; auto deck = parser.parseFile(inputFilePath.string() , Opm::ParseContext()); @@ -58,7 +59,7 @@ BOOST_AUTO_TEST_CASE(Verify_find_includes_Data_file_is_a_symlink) { BOOST_AUTO_TEST_CASE(Verify_find_includes_Data_file_has_include_that_is_a_symlink) { - boost::filesystem::path inputFilePath("testdata/parser/includeSymlinkTestdata/symlink2/caseWithIncludedSymlink.data"); + boost::filesystem::path inputFilePath(prefix() + "includeSymlinkTestdata/symlink2/caseWithIncludedSymlink.data"); Opm::Parser parser; auto deck = parser.parseFile(inputFilePath.string() , Opm::ParseContext()); @@ -68,7 +69,7 @@ BOOST_AUTO_TEST_CASE(Verify_find_includes_Data_file_has_include_that_is_a_symlin BOOST_AUTO_TEST_CASE(Verify_find_includes_Data_file_has_include_file_that_again_includes_a_symlink) { - boost::filesystem::path inputFilePath("testdata/parser/includeSymlinkTestdata/symlink3/case.data"); + boost::filesystem::path inputFilePath(prefix() + "includeSymlinkTestdata/symlink3/case.data"); Opm::Parser parser; auto deck = parser.parseFile(inputFilePath.string() , Opm::ParseContext()); @@ -80,7 +81,7 @@ BOOST_AUTO_TEST_CASE(Verify_find_includes_Data_file_has_include_file_that_again_ BOOST_AUTO_TEST_CASE(ParserKeyword_includeValid) { - boost::filesystem::path inputFilePath("testdata/parser/includeValid.data"); + boost::filesystem::path inputFilePath(prefix() + "includeValid.data"); Opm::Parser parser; auto deck = parser.parseFile(inputFilePath.string() , Opm::ParseContext()); @@ -95,9 +96,9 @@ BOOST_AUTO_TEST_CASE(ParserKeyword_includeValid) { BOOST_AUTO_TEST_CASE(ParserKeyword_includeWrongCase) { - boost::filesystem::path inputFile1Path("testdata/parser/includeWrongCase1.data"); - boost::filesystem::path inputFile2Path("testdata/parser/includeWrongCase2.data"); - boost::filesystem::path inputFile3Path("testdata/parser/includeWrongCase3.data"); + boost::filesystem::path inputFile1Path(prefix() + "includeWrongCase1.data"); + boost::filesystem::path inputFile2Path(prefix() + "includeWrongCase2.data"); + boost::filesystem::path inputFile3Path(prefix() + "includeWrongCase3.data"); Opm::Parser parser; diff --git a/opm/parser/eclipse/Parser/tests/ParserItemTests.cpp b/tests/parser/ParserItemTests.cpp similarity index 100% rename from opm/parser/eclipse/Parser/tests/ParserItemTests.cpp rename to tests/parser/ParserItemTests.cpp diff --git a/opm/parser/eclipse/Parser/tests/ParserKeywordTests.cpp b/tests/parser/ParserKeywordTests.cpp similarity index 100% rename from opm/parser/eclipse/Parser/tests/ParserKeywordTests.cpp rename to tests/parser/ParserKeywordTests.cpp diff --git a/opm/parser/eclipse/Parser/tests/ParserRecordTests.cpp b/tests/parser/ParserRecordTests.cpp similarity index 100% rename from opm/parser/eclipse/Parser/tests/ParserRecordTests.cpp rename to tests/parser/ParserRecordTests.cpp diff --git a/opm/parser/eclipse/Parser/tests/ParserTests.cpp b/tests/parser/ParserTests.cpp similarity index 92% rename from opm/parser/eclipse/Parser/tests/ParserTests.cpp rename to tests/parser/ParserTests.cpp index 233745dc1..8a7e1c419 100644 --- a/opm/parser/eclipse/Parser/tests/ParserTests.cpp +++ b/tests/parser/ParserTests.cpp @@ -35,6 +35,10 @@ using namespace Opm; +inline std::string prefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} + inline std::unique_ptr< ParserKeyword > createDynamicSized(const std::string& kw) { std::unique_ptr< ParserKeyword > pkw( new ParserKeyword( kw ) ); pkw->setSizeType(SLASH_TERMINATED); @@ -165,21 +169,21 @@ BOOST_AUTO_TEST_CASE(loadKeywordFromFile_fileDoesNotExist_returnsFalse) { BOOST_AUTO_TEST_CASE(loadKeywordFromFile_invalidJson_returnsFalse) { Parser parser; - boost::filesystem::path configFile("testdata/json/example_invalid_json"); + boost::filesystem::path configFile(prefix() + "json/example_invalid_json"); BOOST_CHECK_EQUAL( false , parser.loadKeywordFromFile( configFile )); } BOOST_AUTO_TEST_CASE(loadKeywordFromFile_invalidConfig_returnsFalse) { Parser parser; - boost::filesystem::path configFile("testdata/json/example_missing_name.json"); + boost::filesystem::path configFile(prefix() + "json/example_missing_name.json"); BOOST_CHECK_EQUAL( false , parser.loadKeywordFromFile( configFile )); } BOOST_AUTO_TEST_CASE(loadKeywordFromFile_validKeyword_returnsTrueHasKeyword) { Parser parser( false ); - boost::filesystem::path configFile("testdata/json/BPR"); + boost::filesystem::path configFile(prefix() + "json/BPR"); BOOST_CHECK_EQUAL( true , parser.loadKeywordFromFile( configFile )); BOOST_CHECK_EQUAL( 1U , parser.size() ); BOOST_CHECK_EQUAL( true , parser.isRecognizedKeyword("BPR") ); @@ -196,7 +200,7 @@ BOOST_AUTO_TEST_CASE(loadConfigFromDirectory_directoryDoesNotexist_throws) { BOOST_AUTO_TEST_CASE(loadConfigFromDirectory_notRecursive_allNames) { Parser parser( false ); BOOST_CHECK_EQUAL(false , parser.isRecognizedKeyword("BPR")); - boost::filesystem::path configPath("testdata/config/directory1"); + boost::filesystem::path configPath(prefix() + "config/directory1"); BOOST_CHECK_NO_THROW(parser.loadKeywordsFromDirectory( configPath, false)); BOOST_CHECK(parser.isRecognizedKeyword("WWCT")); BOOST_CHECK_EQUAL(true , parser.isRecognizedKeyword("BPR")); @@ -206,7 +210,7 @@ BOOST_AUTO_TEST_CASE(loadConfigFromDirectory_notRecursive_allNames) { BOOST_AUTO_TEST_CASE(loadConfigFromDirectory_notRecursive_strictNames) { Parser parser( false ); - boost::filesystem::path configPath("testdata/config/directory1"); + boost::filesystem::path configPath(prefix() + "config/directory1"); BOOST_CHECK_NO_THROW(parser.loadKeywordsFromDirectory( configPath, false)); BOOST_CHECK(parser.isRecognizedKeyword("WWCT")); // the file name for the following keyword is "Bpr", but that @@ -219,7 +223,7 @@ BOOST_AUTO_TEST_CASE(loadConfigFromDirectory_notRecursive_strictNames) { BOOST_AUTO_TEST_CASE(loadConfigFromDirectory_Recursive_allNames) { Parser parser( false ); BOOST_CHECK_EQUAL(false , parser.isRecognizedKeyword("BPR")); - boost::filesystem::path configPath("testdata/config/directory1"); + boost::filesystem::path configPath(prefix() + "config/directory1"); BOOST_CHECK_NO_THROW(parser.loadKeywordsFromDirectory( configPath, true)); BOOST_CHECK(parser.isRecognizedKeyword("WWCT")); BOOST_CHECK_EQUAL(true , parser.isRecognizedKeyword("BPR")); @@ -230,7 +234,7 @@ BOOST_AUTO_TEST_CASE(loadConfigFromDirectory_Recursive_allNames) { BOOST_AUTO_TEST_CASE(loadConfigFromDirectory_default) { Parser parser( false ); BOOST_CHECK_EQUAL(false , parser.isRecognizedKeyword("BPR")); - boost::filesystem::path configPath("testdata/config/directory1"); + boost::filesystem::path configPath(prefix() + "config/directory1"); BOOST_CHECK_NO_THROW(parser.loadKeywordsFromDirectory( configPath )); BOOST_CHECK(parser.isRecognizedKeyword("WWCT")); // the file name for the following keyword is "Bpr", but that @@ -243,7 +247,7 @@ BOOST_AUTO_TEST_CASE(ReplaceKeyword) { Parser parser; const auto* eqldims = parser.getParserKeywordFromDeckName("EQLDIMS"); - BOOST_CHECK( parser.loadKeywordFromFile( "testdata/parser/EQLDIMS2" ) ); + BOOST_CHECK( parser.loadKeywordFromFile( prefix() + "parser/EQLDIMS2" ) ); eqldims = parser.getParserKeywordFromDeckName("EQLDIMS"); const auto& record = eqldims->getRecord(0); @@ -288,9 +292,9 @@ BOOST_AUTO_TEST_CASE( PATHS_has_global_scope ) { ParseContext parseContext; parseContext.update( ParseContext::PARSE_MISSING_INCLUDE , Opm::InputError::THROW_EXCEPTION); - const auto deck = parser.parseFile( "testdata/parser/PATHSInInclude.data", parseContext ); + const auto deck = parser.parseFile( prefix() + "parser/PATHSInInclude.data", parseContext ); BOOST_CHECK(deck.hasKeyword("OIL")); - BOOST_CHECK_THROW( parser.parseFile( "testdata/parser/PATHSInIncludeInvalid.data", ParseContext() ), std::invalid_argument ); + BOOST_CHECK_THROW( parser.parseFile( prefix() + "parser/PATHSInIncludeInvalid.data", ParseContext() ), std::invalid_argument ); } BOOST_AUTO_TEST_CASE( PATHS_with_backslashes ) { @@ -298,7 +302,7 @@ BOOST_AUTO_TEST_CASE( PATHS_with_backslashes ) { ParseContext parseContext; parseContext.update( ParseContext::PARSE_MISSING_INCLUDE , Opm::InputError::THROW_EXCEPTION); - const auto deck = parser.parseFile( "testdata/parser/PATHSWithBackslashes.data", parseContext ); + const auto deck = parser.parseFile( prefix() + "parser/PATHSWithBackslashes.data", parseContext ); BOOST_CHECK(deck.hasKeyword("OIL")); } diff --git a/opm/parser/eclipse/EclipseState/Tables/tests/PvtxTableTests.cpp b/tests/parser/PvtxTableTests.cpp similarity index 95% rename from opm/parser/eclipse/EclipseState/Tables/tests/PvtxTableTests.cpp rename to tests/parser/PvtxTableTests.cpp index 77c66194a..82fbf4749 100644 --- a/opm/parser/eclipse/EclipseState/Tables/tests/PvtxTableTests.cpp +++ b/tests/parser/PvtxTableTests.cpp @@ -48,10 +48,13 @@ using namespace Opm; +inline std::string prefix() { + return boost::unit_test::framework::master_test_suite().argv[1]; +} BOOST_AUTO_TEST_CASE( PvtxNumTables1 ) { Parser parser; - boost::filesystem::path deckFile("testdata/integration_tests/TABLES/PVTX1.DATA"); + boost::filesystem::path deckFile(prefix() + "TABLES/PVTX1.DATA"); ParseContext parseContext; auto deck = parser.parseFile(deckFile.string(), parseContext); BOOST_CHECK_EQUAL( PvtxTable::numTables( deck.getKeyword()) , 1); @@ -65,7 +68,7 @@ BOOST_AUTO_TEST_CASE( PvtxNumTables1 ) { BOOST_AUTO_TEST_CASE( PvtxNumTables2 ) { Parser parser; - boost::filesystem::path deckFile("testdata/integration_tests/TABLES/PVTO2.DATA"); + boost::filesystem::path deckFile(prefix() + "TABLES/PVTO2.DATA"); ParseContext parseContext; auto deck = parser.parseFile(deckFile.string(), parseContext); BOOST_CHECK_EQUAL( PvtxTable::numTables( deck.getKeyword()) , 3); @@ -118,7 +121,7 @@ BOOST_AUTO_TEST_CASE( PvtxNumTables3 ) { BOOST_AUTO_TEST_CASE( PVTOSaturatedTable ) { Parser parser; - boost::filesystem::path deckFile("testdata/integration_tests/TABLES/PVTX1.DATA"); + boost::filesystem::path deckFile(prefix() + "TABLES/PVTX1.DATA"); ParseContext parseContext; auto deck = parser.parseFile(deckFile.string(), parseContext); Opm::TableManager tables(deck); @@ -165,7 +168,7 @@ BOOST_AUTO_TEST_CASE( PVTOSaturatedTable ) { BOOST_AUTO_TEST_CASE( PVTGSaturatedTable ) { Parser parser; - boost::filesystem::path deckFile("testdata/integration_tests/TABLES/PVTX1.DATA"); + boost::filesystem::path deckFile(prefix() + "TABLES/PVTX1.DATA"); ParseContext parseContext; auto deck = parser.parseFile(deckFile.string(), parseContext); Opm::TableManager tables(deck); diff --git a/opm/parser/eclipse/RawDeck/tests/RawKeywordTests.cpp b/tests/parser/RawKeywordTests.cpp similarity index 100% rename from opm/parser/eclipse/RawDeck/tests/RawKeywordTests.cpp rename to tests/parser/RawKeywordTests.cpp diff --git a/opm/parser/eclipse/RawDeck/tests/RawRecordTests.cpp b/tests/parser/RawRecordTests.cpp similarity index 100% rename from opm/parser/eclipse/RawDeck/tests/RawRecordTests.cpp rename to tests/parser/RawRecordTests.cpp diff --git a/opm/parser/eclipse/EclipseState/IOConfig/tests/RestartConfigTests.cpp b/tests/parser/RestartConfigTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/IOConfig/tests/RestartConfigTests.cpp rename to tests/parser/RestartConfigTests.cpp diff --git a/opm/parser/eclipse/EclipseState/tests/RunspecTests.cpp b/tests/parser/RunspecTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/tests/RunspecTests.cpp rename to tests/parser/RunspecTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/SatfuncPropertyInitializersTests.cpp b/tests/parser/SatfuncPropertyInitializersTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/SatfuncPropertyInitializersTests.cpp rename to tests/parser/SatfuncPropertyInitializersTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/ScheduleEnumTests.cpp b/tests/parser/ScheduleEnumTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/ScheduleEnumTests.cpp rename to tests/parser/ScheduleEnumTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/ScheduleTests.cpp b/tests/parser/ScheduleTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/ScheduleTests.cpp rename to tests/parser/ScheduleTests.cpp diff --git a/opm/parser/eclipse/Deck/tests/SectionTests.cpp b/tests/parser/SectionTests.cpp similarity index 100% rename from opm/parser/eclipse/Deck/tests/SectionTests.cpp rename to tests/parser/SectionTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/tests/SimpleTableTests.cpp b/tests/parser/SimpleTableTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/tests/SimpleTableTests.cpp rename to tests/parser/SimpleTableTests.cpp diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/tests/SimulationConfigTest.cpp b/tests/parser/SimulationConfigTest.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/SimulationConfig/tests/SimulationConfigTest.cpp rename to tests/parser/SimulationConfigTest.cpp diff --git a/opm/parser/eclipse/RawDeck/tests/StarTokenTests.cpp b/tests/parser/StarTokenTests.cpp similarity index 100% rename from opm/parser/eclipse/RawDeck/tests/StarTokenTests.cpp rename to tests/parser/StarTokenTests.cpp diff --git a/opm/parser/eclipse/Utility/tests/StringTests.cpp b/tests/parser/StringTests.cpp similarity index 100% rename from opm/parser/eclipse/Utility/tests/StringTests.cpp rename to tests/parser/StringTests.cpp diff --git a/opm/parser/eclipse/Utility/tests/StringviewTests.cpp b/tests/parser/StringviewTests.cpp similarity index 100% rename from opm/parser/eclipse/Utility/tests/StringviewTests.cpp rename to tests/parser/StringviewTests.cpp diff --git a/opm/parser/eclipse/EclipseState/SummaryConfig/tests/SummaryConfigTests.cpp b/tests/parser/SummaryConfigTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/SummaryConfig/tests/SummaryConfigTests.cpp rename to tests/parser/SummaryConfigTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/tests/TabdimsTests.cpp b/tests/parser/TabdimsTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/tests/TabdimsTests.cpp rename to tests/parser/TabdimsTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/tests/TableColumnTests.cpp b/tests/parser/TableColumnTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/tests/TableColumnTests.cpp rename to tests/parser/TableColumnTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/tests/TableContainerTests.cpp b/tests/parser/TableContainerTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/tests/TableContainerTests.cpp rename to tests/parser/TableContainerTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/tests/TableManagerTests.cpp b/tests/parser/TableManagerTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/tests/TableManagerTests.cpp rename to tests/parser/TableManagerTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Tables/tests/TableSchemaTests.cpp b/tests/parser/TableSchemaTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/tests/TableSchemaTests.cpp rename to tests/parser/TableSchemaTests.cpp diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/tests/ThresholdPressureTest.cpp b/tests/parser/ThresholdPressureTest.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/SimulationConfig/tests/ThresholdPressureTest.cpp rename to tests/parser/ThresholdPressureTest.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/TimeMapTest.cpp b/tests/parser/TimeMapTest.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/TimeMapTest.cpp rename to tests/parser/TimeMapTest.cpp diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/TransMultTests.cpp b/tests/parser/TransMultTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/tests/TransMultTests.cpp rename to tests/parser/TransMultTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/TuningTests.cpp b/tests/parser/TuningTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/TuningTests.cpp rename to tests/parser/TuningTests.cpp diff --git a/opm/parser/eclipse/Units/tests/UnitTests.cpp b/tests/parser/UnitTests.cpp similarity index 100% rename from opm/parser/eclipse/Units/tests/UnitTests.cpp rename to tests/parser/UnitTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Util/tests/ValueTests.cpp b/tests/parser/ValueTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Util/tests/ValueTests.cpp rename to tests/parser/ValueTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/WellPropertiesTests.cpp b/tests/parser/WellPropertiesTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/WellPropertiesTests.cpp rename to tests/parser/WellPropertiesTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/WellSolventTests.cpp b/tests/parser/WellSolventTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/WellSolventTests.cpp rename to tests/parser/WellSolventTests.cpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/WellTests.cpp b/tests/parser/WellTests.cpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/tests/WellTests.cpp rename to tests/parser/WellTests.cpp diff --git a/testdata/config/directory1/Bpr b/tests/parser/data/config/directory1/Bpr similarity index 100% rename from testdata/config/directory1/Bpr rename to tests/parser/data/config/directory1/Bpr diff --git a/testdata/config/directory1/WWCT b/tests/parser/data/config/directory1/WWCT similarity index 100% rename from testdata/config/directory1/WWCT rename to tests/parser/data/config/directory1/WWCT diff --git a/testdata/config/directory1/subdir/DIMENS b/tests/parser/data/config/directory1/subdir/DIMENS similarity index 100% rename from testdata/config/directory1/subdir/DIMENS rename to tests/parser/data/config/directory1/subdir/DIMENS diff --git a/testdata/integration_tests/ACTION/ACTION.txt b/tests/parser/data/integration_tests/ACTION/ACTION.txt similarity index 100% rename from testdata/integration_tests/ACTION/ACTION.txt rename to tests/parser/data/integration_tests/ACTION/ACTION.txt diff --git a/testdata/integration_tests/ACTION/ACTION_EXCEPTION.txt b/tests/parser/data/integration_tests/ACTION/ACTION_EXCEPTION.txt similarity index 100% rename from testdata/integration_tests/ACTION/ACTION_EXCEPTION.txt rename to tests/parser/data/integration_tests/ACTION/ACTION_EXCEPTION.txt diff --git a/testdata/integration_tests/BOX/BOXTEST1 b/tests/parser/data/integration_tests/BOX/BOXTEST1 similarity index 100% rename from testdata/integration_tests/BOX/BOXTEST1 rename to tests/parser/data/integration_tests/BOX/BOXTEST1 diff --git a/testdata/integration_tests/BOX/BOXTEST2 b/tests/parser/data/integration_tests/BOX/BOXTEST2 similarity index 100% rename from testdata/integration_tests/BOX/BOXTEST2 rename to tests/parser/data/integration_tests/BOX/BOXTEST2 diff --git a/testdata/integration_tests/BOX/BOXTEST3 b/tests/parser/data/integration_tests/BOX/BOXTEST3 similarity index 100% rename from testdata/integration_tests/BOX/BOXTEST3 rename to tests/parser/data/integration_tests/BOX/BOXTEST3 diff --git a/testdata/integration_tests/DEBUG/DEBUG.DATA b/tests/parser/data/integration_tests/DEBUG/DEBUG.DATA similarity index 100% rename from testdata/integration_tests/DEBUG/DEBUG.DATA rename to tests/parser/data/integration_tests/DEBUG/DEBUG.DATA diff --git a/testdata/integration_tests/DENSITY/DENSITY1 b/tests/parser/data/integration_tests/DENSITY/DENSITY1 similarity index 100% rename from testdata/integration_tests/DENSITY/DENSITY1 rename to tests/parser/data/integration_tests/DENSITY/DENSITY1 diff --git a/testdata/integration_tests/END/END1.txt b/tests/parser/data/integration_tests/END/END1.txt similarity index 100% rename from testdata/integration_tests/END/END1.txt rename to tests/parser/data/integration_tests/END/END1.txt diff --git a/testdata/integration_tests/END/ENDINC1.txt b/tests/parser/data/integration_tests/END/ENDINC1.txt similarity index 100% rename from testdata/integration_tests/END/ENDINC1.txt rename to tests/parser/data/integration_tests/END/ENDINC1.txt diff --git a/testdata/integration_tests/EQUIL/EQUIL1 b/tests/parser/data/integration_tests/EQUIL/EQUIL1 similarity index 100% rename from testdata/integration_tests/EQUIL/EQUIL1 rename to tests/parser/data/integration_tests/EQUIL/EQUIL1 diff --git a/testdata/integration_tests/GRID/CORNERPOINT.DATA b/tests/parser/data/integration_tests/GRID/CORNERPOINT.DATA similarity index 100% rename from testdata/integration_tests/GRID/CORNERPOINT.DATA rename to tests/parser/data/integration_tests/GRID/CORNERPOINT.DATA diff --git a/testdata/integration_tests/GRID/CORNERPOINT_ACTNUM.DATA b/tests/parser/data/integration_tests/GRID/CORNERPOINT_ACTNUM.DATA similarity index 100% rename from testdata/integration_tests/GRID/CORNERPOINT_ACTNUM.DATA rename to tests/parser/data/integration_tests/GRID/CORNERPOINT_ACTNUM.DATA diff --git a/testdata/integration_tests/GRID/TOPS.DATA b/tests/parser/data/integration_tests/GRID/TOPS.DATA similarity index 100% rename from testdata/integration_tests/GRID/TOPS.DATA rename to tests/parser/data/integration_tests/GRID/TOPS.DATA diff --git a/testdata/integration_tests/IOConfig/RPTRST_DECK.DATA b/tests/parser/data/integration_tests/IOConfig/RPTRST_DECK.DATA similarity index 100% rename from testdata/integration_tests/IOConfig/RPTRST_DECK.DATA rename to tests/parser/data/integration_tests/IOConfig/RPTRST_DECK.DATA diff --git a/testdata/integration_tests/IOConfig/RPT_TEST2.DATA b/tests/parser/data/integration_tests/IOConfig/RPT_TEST2.DATA similarity index 100% rename from testdata/integration_tests/IOConfig/RPT_TEST2.DATA rename to tests/parser/data/integration_tests/IOConfig/RPT_TEST2.DATA diff --git a/testdata/integration_tests/IOConfig/SPE1CASE2.DATA b/tests/parser/data/integration_tests/IOConfig/SPE1CASE2.DATA similarity index 100% rename from testdata/integration_tests/IOConfig/SPE1CASE2.DATA rename to tests/parser/data/integration_tests/IOConfig/SPE1CASE2.DATA diff --git a/testdata/integration_tests/IOConfig/SPE9_END.DATA b/tests/parser/data/integration_tests/IOConfig/SPE9_END.DATA similarity index 100% rename from testdata/integration_tests/IOConfig/SPE9_END.DATA rename to tests/parser/data/integration_tests/IOConfig/SPE9_END.DATA diff --git a/testdata/integration_tests/LGR/LGR.DATA b/tests/parser/data/integration_tests/LGR/LGR.DATA similarity index 100% rename from testdata/integration_tests/LGR/LGR.DATA rename to tests/parser/data/integration_tests/LGR/LGR.DATA diff --git a/testdata/integration_tests/MULTREGT/MULTREGT b/tests/parser/data/integration_tests/MULTREGT/MULTREGT similarity index 100% rename from testdata/integration_tests/MULTREGT/MULTREGT rename to tests/parser/data/integration_tests/MULTREGT/MULTREGT diff --git a/testdata/integration_tests/MULTREGT/MULTREGT.DATA b/tests/parser/data/integration_tests/MULTREGT/MULTREGT.DATA similarity index 100% rename from testdata/integration_tests/MULTREGT/MULTREGT.DATA rename to tests/parser/data/integration_tests/MULTREGT/MULTREGT.DATA diff --git a/testdata/integration_tests/NNC/NNC.DATA b/tests/parser/data/integration_tests/NNC/NNC.DATA similarity index 100% rename from testdata/integration_tests/NNC/NNC.DATA rename to tests/parser/data/integration_tests/NNC/NNC.DATA diff --git a/testdata/integration_tests/NNC/noNNC.DATA b/tests/parser/data/integration_tests/NNC/noNNC.DATA similarity index 100% rename from testdata/integration_tests/NNC/noNNC.DATA rename to tests/parser/data/integration_tests/NNC/noNNC.DATA diff --git a/testdata/integration_tests/POLYMER/POLY.inc b/tests/parser/data/integration_tests/POLYMER/POLY.inc similarity index 100% rename from testdata/integration_tests/POLYMER/POLY.inc rename to tests/parser/data/integration_tests/POLYMER/POLY.inc diff --git a/testdata/integration_tests/POLYMER/plyads.data b/tests/parser/data/integration_tests/POLYMER/plyads.data similarity index 100% rename from testdata/integration_tests/POLYMER/plyads.data rename to tests/parser/data/integration_tests/POLYMER/plyads.data diff --git a/testdata/integration_tests/POLYMER/plyadss.data b/tests/parser/data/integration_tests/POLYMER/plyadss.data similarity index 100% rename from testdata/integration_tests/POLYMER/plyadss.data rename to tests/parser/data/integration_tests/POLYMER/plyadss.data diff --git a/testdata/integration_tests/POLYMER/plydhflf.data b/tests/parser/data/integration_tests/POLYMER/plydhflf.data similarity index 100% rename from testdata/integration_tests/POLYMER/plydhflf.data rename to tests/parser/data/integration_tests/POLYMER/plydhflf.data diff --git a/testdata/integration_tests/POLYMER/plyshlog.data b/tests/parser/data/integration_tests/POLYMER/plyshlog.data similarity index 100% rename from testdata/integration_tests/POLYMER/plyshlog.data rename to tests/parser/data/integration_tests/POLYMER/plyshlog.data diff --git a/testdata/integration_tests/POLYMER/plyvisc.data b/tests/parser/data/integration_tests/POLYMER/plyvisc.data similarity index 100% rename from testdata/integration_tests/POLYMER/plyvisc.data rename to tests/parser/data/integration_tests/POLYMER/plyvisc.data diff --git a/testdata/integration_tests/PORO/PORO1 b/tests/parser/data/integration_tests/PORO/PORO1 similarity index 100% rename from testdata/integration_tests/PORO/PORO1 rename to tests/parser/data/integration_tests/PORO/PORO1 diff --git a/testdata/integration_tests/RSVD/RSVD.txt b/tests/parser/data/integration_tests/RSVD/RSVD.txt similarity index 100% rename from testdata/integration_tests/RSVD/RSVD.txt rename to tests/parser/data/integration_tests/RSVD/RSVD.txt diff --git a/testdata/integration_tests/Resinsight/DECK1.DATA b/tests/parser/data/integration_tests/Resinsight/DECK1.DATA similarity index 100% rename from testdata/integration_tests/Resinsight/DECK1.DATA rename to tests/parser/data/integration_tests/Resinsight/DECK1.DATA diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE1 b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE1 similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE1 rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE1 diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_CMODE_MISSING_DATA b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_CMODE_MISSING_DATA similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_CMODE_MISSING_DATA rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_CMODE_MISSING_DATA diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_COMMENTS_AFTER_KEYWORDS b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_COMMENTS_AFTER_KEYWORDS similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_COMMENTS_AFTER_KEYWORDS rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_COMMENTS_AFTER_KEYWORDS diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_COMPDAT1 b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_COMPDAT1 similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_COMPDAT1 rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_COMPDAT1 diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_EVENTS b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_EVENTS similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_EVENTS rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_EVENTS diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_GROUPS b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_GROUPS similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_GROUPS rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_GROUPS diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_GROUPS_REPARENT b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_GROUPS_REPARENT similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_GROUPS_REPARENT rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_GROUPS_REPARENT diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_GRUPTREE_EXPLICIT_PARENTING b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_GRUPTREE_EXPLICIT_PARENTING similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_GRUPTREE_EXPLICIT_PARENTING rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_GRUPTREE_EXPLICIT_PARENTING diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_MISSING_CMODE b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_MISSING_CMODE similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_MISSING_CMODE rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_MISSING_CMODE diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_MULTISEGMENT_WELL b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_MULTISEGMENT_WELL similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_MULTISEGMENT_WELL rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_MULTISEGMENT_WELL diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_POLYMER b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_POLYMER similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_POLYMER rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_POLYMER diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_SHUT_WELL b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_SHUT_WELL similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_SHUT_WELL rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_SHUT_WELL diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_WECON b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WECON similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_WECON rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WECON diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_WELLS2 b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WELLS2 similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_WELLS2 rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WELLS2 diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_WELLS_AND_GROUPS b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WELLS_AND_GROUPS similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_WELLS_AND_GROUPS rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WELLS_AND_GROUPS diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_WELOPEN b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WELOPEN similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_WELOPEN rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WELOPEN diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_WELOPEN_INVALID b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WELOPEN_INVALID similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_WELOPEN_INVALID rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WELOPEN_INVALID diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_WELSPECS_GROUPS b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WELSPECS_GROUPS similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_WELSPECS_GROUPS rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WELSPECS_GROUPS diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_WELSPECS_GRUPTREE b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WELSPECS_GRUPTREE similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_WELSPECS_GRUPTREE rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WELSPECS_GRUPTREE diff --git a/testdata/integration_tests/SCHEDULE/SCHEDULE_WGRUPCON b/tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WGRUPCON similarity index 100% rename from testdata/integration_tests/SCHEDULE/SCHEDULE_WGRUPCON rename to tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_WGRUPCON diff --git a/testdata/integration_tests/SCHEDULE/wells_group.data b/tests/parser/data/integration_tests/SCHEDULE/wells_group.data similarity index 100% rename from testdata/integration_tests/SCHEDULE/wells_group.data rename to tests/parser/data/integration_tests/SCHEDULE/wells_group.data diff --git a/testdata/integration_tests/TABLES/PVTO2.DATA b/tests/parser/data/integration_tests/TABLES/PVTO2.DATA similarity index 100% rename from testdata/integration_tests/TABLES/PVTO2.DATA rename to tests/parser/data/integration_tests/TABLES/PVTO2.DATA diff --git a/testdata/integration_tests/TABLES/PVTX1.DATA b/tests/parser/data/integration_tests/TABLES/PVTX1.DATA similarity index 100% rename from testdata/integration_tests/TABLES/PVTX1.DATA rename to tests/parser/data/integration_tests/TABLES/PVTX1.DATA diff --git a/testdata/integration_tests/TITLE/TITLE1.txt b/tests/parser/data/integration_tests/TITLE/TITLE1.txt similarity index 100% rename from testdata/integration_tests/TITLE/TITLE1.txt rename to tests/parser/data/integration_tests/TITLE/TITLE1.txt diff --git a/testdata/integration_tests/TRANS/Deck1 b/tests/parser/data/integration_tests/TRANS/Deck1 similarity index 100% rename from testdata/integration_tests/TRANS/Deck1 rename to tests/parser/data/integration_tests/TRANS/Deck1 diff --git a/testdata/integration_tests/TVDP/TVDP1 b/tests/parser/data/integration_tests/TVDP/TVDP1 similarity index 100% rename from testdata/integration_tests/TVDP/TVDP1 rename to tests/parser/data/integration_tests/TVDP/TVDP1 diff --git a/testdata/integration_tests/VFPPROD/VFPPROD1 b/tests/parser/data/integration_tests/VFPPROD/VFPPROD1 similarity index 100% rename from testdata/integration_tests/VFPPROD/VFPPROD1 rename to tests/parser/data/integration_tests/VFPPROD/VFPPROD1 diff --git a/testdata/integration_tests/VFPPROD/VFPPROD2 b/tests/parser/data/integration_tests/VFPPROD/VFPPROD2 similarity index 100% rename from testdata/integration_tests/VFPPROD/VFPPROD2 rename to tests/parser/data/integration_tests/VFPPROD/VFPPROD2 diff --git a/testdata/integration_tests/WCONHIST/WCONHIST1 b/tests/parser/data/integration_tests/WCONHIST/WCONHIST1 similarity index 100% rename from testdata/integration_tests/WCONHIST/WCONHIST1 rename to tests/parser/data/integration_tests/WCONHIST/WCONHIST1 diff --git a/testdata/integration_tests/WellWithWildcards/WCONINJE1 b/tests/parser/data/integration_tests/WellWithWildcards/WCONINJE1 similarity index 100% rename from testdata/integration_tests/WellWithWildcards/WCONINJE1 rename to tests/parser/data/integration_tests/WellWithWildcards/WCONINJE1 diff --git a/testdata/integration_tests/WellWithWildcards/WCONPROD1 b/tests/parser/data/integration_tests/WellWithWildcards/WCONPROD1 similarity index 100% rename from testdata/integration_tests/WellWithWildcards/WCONPROD1 rename to tests/parser/data/integration_tests/WellWithWildcards/WCONPROD1 diff --git a/testdata/integration_tests/bpr.data b/tests/parser/data/integration_tests/bpr.data similarity index 100% rename from testdata/integration_tests/bpr.data rename to tests/parser/data/integration_tests/bpr.data diff --git a/testdata/integration_tests/include path/readthis.sch b/tests/parser/data/integration_tests/include path/readthis.sch similarity index 100% rename from testdata/integration_tests/include path/readthis.sch rename to tests/parser/data/integration_tests/include path/readthis.sch diff --git a/testdata/integration_tests/mini.data b/tests/parser/data/integration_tests/mini.data similarity index 100% rename from testdata/integration_tests/mini.data rename to tests/parser/data/integration_tests/mini.data diff --git a/testdata/integration_tests/small.data b/tests/parser/data/integration_tests/small.data similarity index 100% rename from testdata/integration_tests/small.data rename to tests/parser/data/integration_tests/small.data diff --git a/testdata/integration_tests/someobscureelements.data b/tests/parser/data/integration_tests/someobscureelements.data similarity index 100% rename from testdata/integration_tests/someobscureelements.data rename to tests/parser/data/integration_tests/someobscureelements.data diff --git a/testdata/integration_tests/truncated_records.data b/tests/parser/data/integration_tests/truncated_records.data similarity index 100% rename from testdata/integration_tests/truncated_records.data rename to tests/parser/data/integration_tests/truncated_records.data diff --git a/testdata/integration_tests/wwct.data b/tests/parser/data/integration_tests/wwct.data similarity index 100% rename from testdata/integration_tests/wwct.data rename to tests/parser/data/integration_tests/wwct.data diff --git a/testdata/json/BPR b/tests/parser/data/json/BPR similarity index 100% rename from testdata/json/BPR rename to tests/parser/data/json/BPR diff --git a/testdata/json/example_invalid_json b/tests/parser/data/json/example_invalid_json similarity index 100% rename from testdata/json/example_invalid_json rename to tests/parser/data/json/example_invalid_json diff --git a/testdata/json/example_missing_keyword.json b/tests/parser/data/json/example_missing_keyword.json similarity index 100% rename from testdata/json/example_missing_keyword.json rename to tests/parser/data/json/example_missing_keyword.json diff --git a/testdata/json/example_missing_name.json b/tests/parser/data/json/example_missing_name.json similarity index 100% rename from testdata/json/example_missing_name.json rename to tests/parser/data/json/example_missing_name.json diff --git a/testdata/parser/EQLDIMS2 b/tests/parser/data/parser/EQLDIMS2 similarity index 100% rename from testdata/parser/EQLDIMS2 rename to tests/parser/data/parser/EQLDIMS2 diff --git a/testdata/parser/PATHSInInclude.data b/tests/parser/data/parser/PATHSInInclude.data similarity index 100% rename from testdata/parser/PATHSInInclude.data rename to tests/parser/data/parser/PATHSInInclude.data diff --git a/testdata/parser/PATHSInIncludeInvalid.data b/tests/parser/data/parser/PATHSInIncludeInvalid.data similarity index 100% rename from testdata/parser/PATHSInIncludeInvalid.data rename to tests/parser/data/parser/PATHSInIncludeInvalid.data diff --git a/testdata/parser/PATHSWithBackslashes.data b/tests/parser/data/parser/PATHSWithBackslashes.data similarity index 100% rename from testdata/parser/PATHSWithBackslashes.data rename to tests/parser/data/parser/PATHSWithBackslashes.data diff --git a/testdata/parser/include/foo.inc b/tests/parser/data/parser/include/foo.inc similarity index 100% rename from testdata/parser/include/foo.inc rename to tests/parser/data/parser/include/foo.inc diff --git a/testdata/parser/include/foo_invalid.inc b/tests/parser/data/parser/include/foo_invalid.inc similarity index 100% rename from testdata/parser/include/foo_invalid.inc rename to tests/parser/data/parser/include/foo_invalid.inc diff --git a/testdata/parser/include/foobackslash.inc b/tests/parser/data/parser/include/foobackslash.inc similarity index 100% rename from testdata/parser/include/foobackslash.inc rename to tests/parser/data/parser/include/foobackslash.inc diff --git a/testdata/parser/include/foopath/foo_target.inc b/tests/parser/data/parser/include/foopath/foo_target.inc similarity index 100% rename from testdata/parser/include/foopath/foo_target.inc rename to tests/parser/data/parser/include/foopath/foo_target.inc diff --git a/testdata/parser/include/some_flags.inc b/tests/parser/data/parser/include/some_flags.inc similarity index 100% rename from testdata/parser/include/some_flags.inc rename to tests/parser/data/parser/include/some_flags.inc diff --git a/testdata/parser/includeInvalid.data b/tests/parser/data/parser/includeInvalid.data similarity index 100% rename from testdata/parser/includeInvalid.data rename to tests/parser/data/parser/includeInvalid.data diff --git a/testdata/parser/includeSymlinkTestdata/symlink1/actual_file_dir/case.data b/tests/parser/data/parser/includeSymlinkTestdata/symlink1/actual_file_dir/case.data similarity index 100% rename from testdata/parser/includeSymlinkTestdata/symlink1/actual_file_dir/case.data rename to tests/parser/data/parser/includeSymlinkTestdata/symlink1/actual_file_dir/case.data diff --git a/testdata/parser/includeSymlinkTestdata/symlink1/actual_file_dir/include/include.inc b/tests/parser/data/parser/includeSymlinkTestdata/symlink1/actual_file_dir/include/include.inc similarity index 100% rename from testdata/parser/includeSymlinkTestdata/symlink1/actual_file_dir/include/include.inc rename to tests/parser/data/parser/includeSymlinkTestdata/symlink1/actual_file_dir/include/include.inc diff --git a/testdata/parser/includeSymlinkTestdata/symlink1/case_symlink.data b/tests/parser/data/parser/includeSymlinkTestdata/symlink1/case_symlink.data similarity index 100% rename from testdata/parser/includeSymlinkTestdata/symlink1/case_symlink.data rename to tests/parser/data/parser/includeSymlinkTestdata/symlink1/case_symlink.data diff --git a/testdata/parser/includeSymlinkTestdata/symlink2/actual_inlude_file/include.inc b/tests/parser/data/parser/includeSymlinkTestdata/symlink2/actual_inlude_file/include.inc similarity index 100% rename from testdata/parser/includeSymlinkTestdata/symlink2/actual_inlude_file/include.inc rename to tests/parser/data/parser/includeSymlinkTestdata/symlink2/actual_inlude_file/include.inc diff --git a/testdata/parser/includeSymlinkTestdata/symlink2/caseWithIncludedSymlink.data b/tests/parser/data/parser/includeSymlinkTestdata/symlink2/caseWithIncludedSymlink.data similarity index 100% rename from testdata/parser/includeSymlinkTestdata/symlink2/caseWithIncludedSymlink.data rename to tests/parser/data/parser/includeSymlinkTestdata/symlink2/caseWithIncludedSymlink.data diff --git a/testdata/parser/includeSymlinkTestdata/symlink2/include/symlink_include.inc b/tests/parser/data/parser/includeSymlinkTestdata/symlink2/include/symlink_include.inc similarity index 100% rename from testdata/parser/includeSymlinkTestdata/symlink2/include/symlink_include.inc rename to tests/parser/data/parser/includeSymlinkTestdata/symlink2/include/symlink_include.inc diff --git a/testdata/parser/includeSymlinkTestdata/symlink3/actual_include_file/include_oil.inc b/tests/parser/data/parser/includeSymlinkTestdata/symlink3/actual_include_file/include_oil.inc similarity index 100% rename from testdata/parser/includeSymlinkTestdata/symlink3/actual_include_file/include_oil.inc rename to tests/parser/data/parser/includeSymlinkTestdata/symlink3/actual_include_file/include_oil.inc diff --git a/testdata/parser/includeSymlinkTestdata/symlink3/case.data b/tests/parser/data/parser/includeSymlinkTestdata/symlink3/case.data similarity index 100% rename from testdata/parser/includeSymlinkTestdata/symlink3/case.data rename to tests/parser/data/parser/includeSymlinkTestdata/symlink3/case.data diff --git a/testdata/parser/includeSymlinkTestdata/symlink3/include.inc b/tests/parser/data/parser/includeSymlinkTestdata/symlink3/include.inc similarity index 100% rename from testdata/parser/includeSymlinkTestdata/symlink3/include.inc rename to tests/parser/data/parser/includeSymlinkTestdata/symlink3/include.inc diff --git a/testdata/parser/includeSymlinkTestdata/symlink3/include/incl_symlink.inc b/tests/parser/data/parser/includeSymlinkTestdata/symlink3/include/incl_symlink.inc similarity index 100% rename from testdata/parser/includeSymlinkTestdata/symlink3/include/incl_symlink.inc rename to tests/parser/data/parser/includeSymlinkTestdata/symlink3/include/incl_symlink.inc diff --git a/testdata/parser/includeValid.data b/tests/parser/data/parser/includeValid.data similarity index 100% rename from testdata/parser/includeValid.data rename to tests/parser/data/parser/includeValid.data diff --git a/testdata/parser/includeWrongCase1.data b/tests/parser/data/parser/includeWrongCase1.data similarity index 100% rename from testdata/parser/includeWrongCase1.data rename to tests/parser/data/parser/includeWrongCase1.data diff --git a/testdata/parser/includeWrongCase2.data b/tests/parser/data/parser/includeWrongCase2.data similarity index 100% rename from testdata/parser/includeWrongCase2.data rename to tests/parser/data/parser/includeWrongCase2.data diff --git a/testdata/parser/includeWrongCase3.data b/tests/parser/data/parser/includeWrongCase3.data similarity index 100% rename from testdata/parser/includeWrongCase3.data rename to tests/parser/data/parser/includeWrongCase3.data diff --git a/testdata/parser/keyword-generator/PORO-invalid b/tests/parser/data/parser/keyword-generator/PORO-invalid similarity index 100% rename from testdata/parser/keyword-generator/PORO-invalid rename to tests/parser/data/parser/keyword-generator/PORO-invalid diff --git a/testdata/parser/keyword-generator/PORO.json b/tests/parser/data/parser/keyword-generator/PORO.json similarity index 100% rename from testdata/parser/keyword-generator/PORO.json rename to tests/parser/data/parser/keyword-generator/PORO.json diff --git a/testdata/parser/keyword-generator/invalid.json b/tests/parser/data/parser/keyword-generator/invalid.json similarity index 100% rename from testdata/parser/keyword-generator/invalid.json rename to tests/parser/data/parser/keyword-generator/invalid.json diff --git a/testdata/parser/keyword-generator/loader/001_ECLIPSE100/A/2ADDREG b/tests/parser/data/parser/keyword-generator/loader/001_ECLIPSE100/A/2ADDREG similarity index 100% rename from testdata/parser/keyword-generator/loader/001_ECLIPSE100/A/2ADDREG rename to tests/parser/data/parser/keyword-generator/loader/001_ECLIPSE100/A/2ADDREG diff --git a/testdata/parser/keyword-generator/loader/001_ECLIPSE100/A/ACTNUM b/tests/parser/data/parser/keyword-generator/loader/001_ECLIPSE100/A/ACTNUM similarity index 100% rename from testdata/parser/keyword-generator/loader/001_ECLIPSE100/A/ACTNUM rename to tests/parser/data/parser/keyword-generator/loader/001_ECLIPSE100/A/ACTNUM diff --git a/testdata/parser/keyword-generator/loader/001_ECLIPSE100/A/ADDREG b/tests/parser/data/parser/keyword-generator/loader/001_ECLIPSE100/A/ADDREG similarity index 100% rename from testdata/parser/keyword-generator/loader/001_ECLIPSE100/A/ADDREG rename to tests/parser/data/parser/keyword-generator/loader/001_ECLIPSE100/A/ADDREG diff --git a/testdata/parser/keyword-generator/loader/001_ECLIPSE100/B/BLOCK_PROBE b/tests/parser/data/parser/keyword-generator/loader/001_ECLIPSE100/B/BLOCK_PROBE similarity index 100% rename from testdata/parser/keyword-generator/loader/001_ECLIPSE100/B/BLOCK_PROBE rename to tests/parser/data/parser/keyword-generator/loader/001_ECLIPSE100/B/BLOCK_PROBE diff --git a/testdata/parser/keyword-generator/loader/001_ECLIPSE100/B/BOX b/tests/parser/data/parser/keyword-generator/loader/001_ECLIPSE100/B/BOX similarity index 100% rename from testdata/parser/keyword-generator/loader/001_ECLIPSE100/B/BOX rename to tests/parser/data/parser/keyword-generator/loader/001_ECLIPSE100/B/BOX diff --git a/testdata/parser/keyword-generator/loader/002_ECLIPSE300/ADDREG b/tests/parser/data/parser/keyword-generator/loader/002_ECLIPSE300/ADDREG similarity index 100% rename from testdata/parser/keyword-generator/loader/002_ECLIPSE300/ADDREG rename to tests/parser/data/parser/keyword-generator/loader/002_ECLIPSE300/ADDREG diff --git a/testdata/parser/keyword-generator/loader/002_ECLIPSE300/EQUIL b/tests/parser/data/parser/keyword-generator/loader/002_ECLIPSE300/EQUIL similarity index 100% rename from testdata/parser/keyword-generator/loader/002_ECLIPSE300/EQUIL rename to tests/parser/data/parser/keyword-generator/loader/002_ECLIPSE300/EQUIL diff --git a/testdata/parser/keyword-generator/loader/ZCORN b/tests/parser/data/parser/keyword-generator/loader/ZCORN similarity index 100% rename from testdata/parser/keyword-generator/loader/ZCORN rename to tests/parser/data/parser/keyword-generator/loader/ZCORN