diff --git a/CMakeLists.txt b/CMakeLists.txt index a194d2c33..95dc40e83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,7 +134,7 @@ macro (sources_hook) list(INSERT opm-common_SOURCES 0 ${PROJECT_BINARY_DIR}/python/cxx/builtin_pybind11.cpp) endif() endif() - set_source_files_properties(src/opm/parser/eclipse/Python/Python.cpp + set_source_files_properties(src/opm/input/eclipse/Python/Python.cpp PROPERTIES COMPILE_FLAGS -Wno-shadow) endmacro (sources_hook) diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index b4cfb8b9f..cb94a7af9 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -45,190 +45,190 @@ if(ENABLE_ECL_INPUT) list(APPEND MAIN_SOURCE_FILES src/opm/io/eclipse/SummaryNode.cpp src/opm/json/JsonObject.cpp - src/opm/parser/eclipse/Deck/Deck.cpp - src/opm/parser/eclipse/Deck/DeckView.cpp - src/opm/parser/eclipse/Deck/DeckTree.cpp - src/opm/parser/eclipse/Deck/FileDeck.cpp - src/opm/parser/eclipse/Deck/DeckItem.cpp - src/opm/parser/eclipse/Deck/DeckValue.cpp - src/opm/parser/eclipse/Deck/DeckKeyword.cpp - src/opm/parser/eclipse/Deck/DeckRecord.cpp - src/opm/parser/eclipse/Deck/DeckOutput.cpp - src/opm/parser/eclipse/Deck/DeckSection.cpp - src/opm/parser/eclipse/Deck/ImportContainer.cpp - src/opm/parser/eclipse/Deck/UDAValue.cpp - src/opm/parser/eclipse/Python/Python.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.cpp - src/opm/parser/eclipse/EclipseState/Aquifer/AquiferConfig.cpp - src/opm/parser/eclipse/EclipseState/Aquifer/AquiferCT.cpp - src/opm/parser/eclipse/EclipseState/Aquifer/Aquifetp.cpp - src/opm/parser/eclipse/EclipseState/Aquifer/Aquancon.cpp - src/opm/parser/eclipse/EclipseState/Aquifer/AquiferHelpers.cpp - src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.cpp - src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.cpp - src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.cpp - src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.cpp - src/opm/parser/eclipse/EclipseState/checkDeck.cpp - src/opm/parser/eclipse/EclipseState/EclipseConfig.cpp - src/opm/parser/eclipse/EclipseState/EclipseState.cpp - src/opm/parser/eclipse/EclipseState/EndpointScaling.cpp - src/opm/parser/eclipse/EclipseState/Grid/FieldProps.cpp - src/opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.cpp - src/opm/parser/eclipse/EclipseState/Grid/Box.cpp - src/opm/parser/eclipse/EclipseState/Grid/BoxManager.cpp - src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp - src/opm/parser/eclipse/EclipseState/Grid/FaceDir.cpp - src/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp - src/opm/parser/eclipse/EclipseState/Grid/Fault.cpp - src/opm/parser/eclipse/EclipseState/Grid/FaultFace.cpp - src/opm/parser/eclipse/EclipseState/Grid/GridDims.cpp - src/opm/parser/eclipse/EclipseState/Grid/MapAxes.cpp - src/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp - src/opm/parser/eclipse/EclipseState/Grid/NNC.cpp - src/opm/parser/eclipse/EclipseState/Grid/Operate.cpp - src/opm/parser/eclipse/EclipseState/Grid/PinchMode.cpp - src/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp - src/opm/parser/eclipse/EclipseState/Grid/setKeywordBox.cpp - src/opm/parser/eclipse/EclipseState/Grid/TranCalculator.cpp - src/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp - src/opm/parser/eclipse/EclipseState/InitConfig/Equil.cpp - src/opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.cpp - src/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp - src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp - src/opm/parser/eclipse/EclipseState/Runspec.cpp - src/opm/parser/eclipse/EclipseState/TracerConfig.cpp - src/opm/parser/eclipse/EclipseState/MICPpara.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionContext.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionResult.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Action/Actdims.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Action/Actions.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionParser.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionValue.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Action/Condition.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Action/Enums.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Action/State.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Action/WGNames.cpp - src/opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp - src/opm/parser/eclipse/EclipseState/Schedule/CompletedCells.cpp - src/opm/parser/eclipse/EclipseState/Schedule/eval_uda.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Events.cpp - src/opm/parser/eclipse/EclipseState/Schedule/GasLiftOpt.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Group/GPMaint.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Group/Group.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRate.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateModel.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Group/GConSump.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Group/GTNode.cpp - src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp - src/opm/parser/eclipse/EclipseState/Schedule/MessageLimits.cpp - src/opm/parser/eclipse/EclipseState/Schedule/MSW/icd.cpp - src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp - src/opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.cpp - src/opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.cpp - src/opm/parser/eclipse/EclipseState/Schedule/MSW/AICD.cpp - src/opm/parser/eclipse/EclipseState/Schedule/MSW/SICD.cpp - src/opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Network/Balance.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Network/Branch.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Network/Node.cpp - src/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp - src/opm/parser/eclipse/EclipseState/Schedule/RFTConfig.cpp - src/opm/parser/eclipse/EclipseState/Schedule/RPTConfig.cpp - src/opm/parser/eclipse/EclipseState/Schedule/RSTConfig.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp - src/opm/parser/eclipse/EclipseState/Schedule/ScheduleDeck.cpp - src/opm/parser/eclipse/EclipseState/Schedule/ScheduleGrid.cpp - src/opm/parser/eclipse/EclipseState/Schedule/ScheduleState.cpp - src/opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.cpp - src/opm/parser/eclipse/EclipseState/Schedule/SummaryState.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp - src/opm/parser/eclipse/EclipseState/Schedule/WriteRestartFileEvents.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/injection.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvg.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculator.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/Well.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/NameOrder.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/WellMatcher.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/WList.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/WellFoamProperties.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/WellMICPProperties.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/WellBrineProperties.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.cpp - src/opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.cpp - src/opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.cpp - src/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp - src/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp - src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp - src/opm/parser/eclipse/EclipseState/Tables/Aqudims.cpp - src/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.cpp - src/opm/parser/eclipse/EclipseState/Tables/DenT.cpp - src/opm/parser/eclipse/EclipseState/Tables/Eqldims.cpp - src/opm/parser/eclipse/EclipseState/Tables/JFunc.cpp - src/opm/parser/eclipse/EclipseState/Tables/PvtxTable.cpp - src/opm/parser/eclipse/EclipseState/Tables/Regdims.cpp - src/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp - src/opm/parser/eclipse/EclipseState/Tables/PolyInjTables.cpp - src/opm/parser/eclipse/EclipseState/Tables/StandardCond.cpp - src/opm/parser/eclipse/EclipseState/Tables/TableColumn.cpp - src/opm/parser/eclipse/EclipseState/Tables/TableContainer.cpp - src/opm/parser/eclipse/EclipseState/Tables/TableIndex.cpp - src/opm/parser/eclipse/EclipseState/Tables/TLMixpar.cpp - src/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp - src/opm/parser/eclipse/EclipseState/Tables/TableSchema.cpp - src/opm/parser/eclipse/EclipseState/Tables/Tables.cpp - src/opm/parser/eclipse/EclipseState/Tables/Rock2dTable.cpp - src/opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.cpp - src/opm/parser/eclipse/EclipseState/Tables/PvtwsaltTable.cpp - src/opm/parser/eclipse/EclipseState/Tables/BrineDensityTable.cpp - src/opm/parser/eclipse/EclipseState/Tables/RwgsaltTable.cpp - src/opm/parser/eclipse/EclipseState/Tables/SolventDensityTable.cpp - src/opm/parser/eclipse/EclipseState/Tables/Tabdims.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParams.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQSet.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQToken.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunction.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.cpp - src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQState.cpp - src/opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.cpp - src/opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.cpp - src/opm/parser/eclipse/Parser/ErrorGuard.cpp - src/opm/parser/eclipse/Parser/ParseContext.cpp - src/opm/parser/eclipse/Parser/Parser.cpp - src/opm/parser/eclipse/Parser/ParserEnums.cpp - src/opm/parser/eclipse/Parser/ParserItem.cpp - src/opm/parser/eclipse/Parser/ParserKeyword.cpp - src/opm/parser/eclipse/Parser/ParserRecord.cpp - src/opm/parser/eclipse/Parser/raw/RawKeyword.cpp - src/opm/parser/eclipse/Parser/raw/RawRecord.cpp - src/opm/parser/eclipse/Parser/raw/StarToken.cpp - src/opm/parser/eclipse/Units/Dimension.cpp - src/opm/parser/eclipse/Units/UnitSystem.cpp - src/opm/parser/eclipse/Utility/Functional.cpp + src/opm/input/eclipse/Deck/Deck.cpp + src/opm/input/eclipse/Deck/DeckView.cpp + src/opm/input/eclipse/Deck/DeckTree.cpp + src/opm/input/eclipse/Deck/FileDeck.cpp + src/opm/input/eclipse/Deck/DeckItem.cpp + src/opm/input/eclipse/Deck/DeckValue.cpp + src/opm/input/eclipse/Deck/DeckKeyword.cpp + src/opm/input/eclipse/Deck/DeckRecord.cpp + src/opm/input/eclipse/Deck/DeckOutput.cpp + src/opm/input/eclipse/Deck/DeckSection.cpp + src/opm/input/eclipse/Deck/ImportContainer.cpp + src/opm/input/eclipse/Deck/UDAValue.cpp + src/opm/input/eclipse/Python/Python.cpp + src/opm/input/eclipse/EclipseState/Schedule/Action/PyAction.cpp + src/opm/input/eclipse/EclipseState/Aquifer/AquiferConfig.cpp + src/opm/input/eclipse/EclipseState/Aquifer/AquiferCT.cpp + src/opm/input/eclipse/EclipseState/Aquifer/Aquifetp.cpp + src/opm/input/eclipse/EclipseState/Aquifer/Aquancon.cpp + src/opm/input/eclipse/EclipseState/Aquifer/AquiferHelpers.cpp + src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.cpp + src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.cpp + src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.cpp + src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.cpp + src/opm/input/eclipse/EclipseState/checkDeck.cpp + src/opm/input/eclipse/EclipseState/EclipseConfig.cpp + src/opm/input/eclipse/EclipseState/EclipseState.cpp + src/opm/input/eclipse/EclipseState/EndpointScaling.cpp + src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp + src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp + src/opm/input/eclipse/EclipseState/Grid/Box.cpp + src/opm/input/eclipse/EclipseState/Grid/BoxManager.cpp + src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp + src/opm/input/eclipse/EclipseState/Grid/FaceDir.cpp + src/opm/input/eclipse/EclipseState/Grid/FaultCollection.cpp + src/opm/input/eclipse/EclipseState/Grid/Fault.cpp + src/opm/input/eclipse/EclipseState/Grid/FaultFace.cpp + src/opm/input/eclipse/EclipseState/Grid/GridDims.cpp + src/opm/input/eclipse/EclipseState/Grid/MapAxes.cpp + src/opm/input/eclipse/EclipseState/Grid/MULTREGTScanner.cpp + src/opm/input/eclipse/EclipseState/Grid/NNC.cpp + src/opm/input/eclipse/EclipseState/Grid/Operate.cpp + src/opm/input/eclipse/EclipseState/Grid/PinchMode.cpp + src/opm/input/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp + src/opm/input/eclipse/EclipseState/Grid/setKeywordBox.cpp + src/opm/input/eclipse/EclipseState/Grid/TranCalculator.cpp + src/opm/input/eclipse/EclipseState/Grid/TransMult.cpp + src/opm/input/eclipse/EclipseState/InitConfig/Equil.cpp + src/opm/input/eclipse/EclipseState/InitConfig/FoamConfig.cpp + src/opm/input/eclipse/EclipseState/InitConfig/InitConfig.cpp + src/opm/input/eclipse/EclipseState/IOConfig/IOConfig.cpp + src/opm/input/eclipse/EclipseState/Runspec.cpp + src/opm/input/eclipse/EclipseState/TracerConfig.cpp + src/opm/input/eclipse/EclipseState/MICPpara.cpp + src/opm/input/eclipse/EclipseState/Schedule/Action/ActionAST.cpp + src/opm/input/eclipse/EclipseState/Schedule/Action/ActionContext.cpp + src/opm/input/eclipse/EclipseState/Schedule/Action/ActionResult.cpp + src/opm/input/eclipse/EclipseState/Schedule/Action/Actdims.cpp + src/opm/input/eclipse/EclipseState/Schedule/Action/Actions.cpp + src/opm/input/eclipse/EclipseState/Schedule/Action/ActionX.cpp + src/opm/input/eclipse/EclipseState/Schedule/Action/ActionParser.cpp + src/opm/input/eclipse/EclipseState/Schedule/Action/ActionValue.cpp + src/opm/input/eclipse/EclipseState/Schedule/Action/ASTNode.cpp + src/opm/input/eclipse/EclipseState/Schedule/Action/Condition.cpp + src/opm/input/eclipse/EclipseState/Schedule/Action/Enums.cpp + src/opm/input/eclipse/EclipseState/Schedule/Action/State.cpp + src/opm/input/eclipse/EclipseState/Schedule/Action/WGNames.cpp + src/opm/input/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp + src/opm/input/eclipse/EclipseState/Schedule/CompletedCells.cpp + src/opm/input/eclipse/EclipseState/Schedule/eval_uda.cpp + src/opm/input/eclipse/EclipseState/Schedule/Events.cpp + src/opm/input/eclipse/EclipseState/Schedule/GasLiftOpt.cpp + src/opm/input/eclipse/EclipseState/Schedule/Group/GPMaint.cpp + src/opm/input/eclipse/EclipseState/Schedule/Group/Group.cpp + src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRate.cpp + src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateConfig.cpp + src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateModel.cpp + src/opm/input/eclipse/EclipseState/Schedule/Group/GConSale.cpp + src/opm/input/eclipse/EclipseState/Schedule/Group/GConSump.cpp + src/opm/input/eclipse/EclipseState/Schedule/Group/GTNode.cpp + src/opm/input/eclipse/EclipseState/Schedule/KeywordHandlers.cpp + src/opm/input/eclipse/EclipseState/Schedule/MessageLimits.cpp + src/opm/input/eclipse/EclipseState/Schedule/MSW/icd.cpp + src/opm/input/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp + src/opm/input/eclipse/EclipseState/Schedule/MSW/Segment.cpp + src/opm/input/eclipse/EclipseState/Schedule/MSW/WellSegments.cpp + src/opm/input/eclipse/EclipseState/Schedule/MSW/AICD.cpp + src/opm/input/eclipse/EclipseState/Schedule/MSW/SICD.cpp + src/opm/input/eclipse/EclipseState/Schedule/MSW/Valve.cpp + src/opm/input/eclipse/EclipseState/Schedule/Network/Balance.cpp + src/opm/input/eclipse/EclipseState/Schedule/Network/Branch.cpp + src/opm/input/eclipse/EclipseState/Schedule/Network/ExtNetwork.cpp + src/opm/input/eclipse/EclipseState/Schedule/Network/Node.cpp + src/opm/input/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp + src/opm/input/eclipse/EclipseState/Schedule/RFTConfig.cpp + src/opm/input/eclipse/EclipseState/Schedule/RPTConfig.cpp + src/opm/input/eclipse/EclipseState/Schedule/RSTConfig.cpp + src/opm/input/eclipse/EclipseState/Schedule/Schedule.cpp + src/opm/input/eclipse/EclipseState/Schedule/ScheduleDeck.cpp + src/opm/input/eclipse/EclipseState/Schedule/ScheduleGrid.cpp + src/opm/input/eclipse/EclipseState/Schedule/ScheduleState.cpp + src/opm/input/eclipse/EclipseState/Schedule/ScheduleTypes.cpp + src/opm/input/eclipse/EclipseState/Schedule/SummaryState.cpp + src/opm/input/eclipse/EclipseState/Schedule/Tuning.cpp + src/opm/input/eclipse/EclipseState/Schedule/WriteRestartFileEvents.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/Connection.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/injection.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/PAvg.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculator.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/Well.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/WellConnections.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/NameOrder.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/WellMatcher.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/WList.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/WListManager.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/WellFoamProperties.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/WellMICPProperties.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/WellBrineProperties.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp + src/opm/input/eclipse/EclipseState/Schedule/Well/WellTestState.cpp + src/opm/input/eclipse/EclipseState/SimulationConfig/BCConfig.cpp + src/opm/input/eclipse/EclipseState/SimulationConfig/RockConfig.cpp + src/opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp + src/opm/input/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp + src/opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp + src/opm/input/eclipse/EclipseState/Tables/Aqudims.cpp + src/opm/input/eclipse/EclipseState/Tables/ColumnSchema.cpp + src/opm/input/eclipse/EclipseState/Tables/DenT.cpp + src/opm/input/eclipse/EclipseState/Tables/Eqldims.cpp + src/opm/input/eclipse/EclipseState/Tables/JFunc.cpp + src/opm/input/eclipse/EclipseState/Tables/PvtxTable.cpp + src/opm/input/eclipse/EclipseState/Tables/Regdims.cpp + src/opm/input/eclipse/EclipseState/Tables/SimpleTable.cpp + src/opm/input/eclipse/EclipseState/Tables/PolyInjTables.cpp + src/opm/input/eclipse/EclipseState/Tables/StandardCond.cpp + src/opm/input/eclipse/EclipseState/Tables/TableColumn.cpp + src/opm/input/eclipse/EclipseState/Tables/TableContainer.cpp + src/opm/input/eclipse/EclipseState/Tables/TableIndex.cpp + src/opm/input/eclipse/EclipseState/Tables/TLMixpar.cpp + src/opm/input/eclipse/EclipseState/Tables/TableManager.cpp + src/opm/input/eclipse/EclipseState/Tables/TableSchema.cpp + src/opm/input/eclipse/EclipseState/Tables/Tables.cpp + src/opm/input/eclipse/EclipseState/Tables/Rock2dTable.cpp + src/opm/input/eclipse/EclipseState/Tables/Rock2dtrTable.cpp + src/opm/input/eclipse/EclipseState/Tables/PvtwsaltTable.cpp + src/opm/input/eclipse/EclipseState/Tables/BrineDensityTable.cpp + src/opm/input/eclipse/EclipseState/Tables/RwgsaltTable.cpp + src/opm/input/eclipse/EclipseState/Tables/SolventDensityTable.cpp + src/opm/input/eclipse/EclipseState/Tables/Tabdims.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParams.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParser.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQSet.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQAssign.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQEnums.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQToken.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQConfig.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunction.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQInput.cpp + src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQState.cpp + src/opm/input/eclipse/EclipseState/Schedule/VFPInjTable.cpp + src/opm/input/eclipse/EclipseState/Schedule/VFPProdTable.cpp + src/opm/input/eclipse/Parser/ErrorGuard.cpp + src/opm/input/eclipse/Parser/ParseContext.cpp + src/opm/input/eclipse/Parser/Parser.cpp + src/opm/input/eclipse/Parser/ParserEnums.cpp + src/opm/input/eclipse/Parser/ParserItem.cpp + src/opm/input/eclipse/Parser/ParserKeyword.cpp + src/opm/input/eclipse/Parser/ParserRecord.cpp + src/opm/input/eclipse/Parser/raw/RawKeyword.cpp + src/opm/input/eclipse/Parser/raw/RawRecord.cpp + src/opm/input/eclipse/Parser/raw/StarToken.cpp + src/opm/input/eclipse/Units/Dimension.cpp + src/opm/input/eclipse/Units/UnitSystem.cpp + src/opm/input/eclipse/Utility/Functional.cpp ) @@ -261,11 +261,11 @@ if(ENABLE_ECL_INPUT) if (OPM_ENABLE_EMBEDDED_PYTHON) set_source_files_properties(${PYTHON_CXX_SOURCE_FILES} PROPERTIES COMPILE_FLAGS -Wno-shadow) - set_source_files_properties(src/opm/parser/eclipse/Python/PythonInterp.cpp PROPERTIES COMPILE_FLAGS -Wno-shadow) - set_source_files_properties(src/opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.cpp PROPERTIES COMPILE_FLAGS -Wno-shadow) + set_source_files_properties(src/opm/input/eclipse/Python/PythonInterp.cpp PROPERTIES COMPILE_FLAGS -Wno-shadow) + set_source_files_properties(src/opm/input/eclipse/EclipseState/Schedule/Action/PyAction.cpp PROPERTIES COMPILE_FLAGS -Wno-shadow) list( APPEND MAIN_SOURCE_FILES - src/opm/parser/eclipse/Python/PythonInterp.cpp - src/opm/parser/eclipse/Python/PyRunModule.cpp + src/opm/input/eclipse/Python/PythonInterp.cpp + src/opm/input/eclipse/Python/PyRunModule.cpp ${PYTHON_CXX_SOURCE_FILES}) endif() @@ -652,251 +652,251 @@ if(ENABLE_ECL_INPUT) list(APPEND PUBLIC_HEADER_FILES opm/io/eclipse/SummaryNode.hpp opm/json/JsonObject.hpp - opm/parser/eclipse/Utility/Functional.hpp - opm/parser/eclipse/Utility/Typetools.hpp - opm/parser/eclipse/Generator/KeywordGenerator.hpp - opm/parser/eclipse/Generator/KeywordLoader.hpp - opm/parser/eclipse/Units/UnitSystem.hpp - opm/parser/eclipse/Units/Units.hpp - opm/parser/eclipse/Units/Dimension.hpp - opm/parser/eclipse/Parser/ErrorGuard.hpp - opm/parser/eclipse/Parser/ParserItem.hpp - opm/parser/eclipse/Parser/Parser.hpp - opm/parser/eclipse/Parser/ParserRecord.hpp - opm/parser/eclipse/Parser/ParserKeyword.hpp - opm/parser/eclipse/Parser/InputErrorAction.hpp - opm/parser/eclipse/Parser/ParserEnums.hpp - opm/parser/eclipse/Parser/ParseContext.hpp - opm/parser/eclipse/Parser/ParserConst.hpp - opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp - opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp - opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp - opm/parser/eclipse/EclipseState/Util/IOrderSet.hpp - opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp - opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp - opm/parser/eclipse/EclipseState/Grid/FieldData.hpp - opm/parser/eclipse/EclipseState/Grid/Keywords.hpp - opm/parser/eclipse/EclipseState/Grid/GridDims.hpp - opm/parser/eclipse/EclipseState/Grid/TranCalculator.hpp - opm/parser/eclipse/EclipseState/Grid/TransMult.hpp - opm/parser/eclipse/EclipseState/Grid/PinchMode.hpp - opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp - opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp - opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp - opm/parser/eclipse/EclipseState/Grid/Fault.hpp - opm/parser/eclipse/EclipseState/Grid/Box.hpp - opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp - opm/parser/eclipse/EclipseState/Grid/FaultFace.hpp - opm/parser/eclipse/EclipseState/Grid/NNC.hpp - opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp - opm/parser/eclipse/EclipseState/Grid/BoxManager.hpp - opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp - opm/parser/eclipse/EclipseState/Grid/MapAxes.hpp - opm/parser/eclipse/EclipseState/Grid/MinpvMode.hpp - opm/parser/eclipse/EclipseState/EndpointScaling.hpp - opm/parser/eclipse/EclipseState/TracerConfig.hpp - opm/parser/eclipse/EclipseState/MICPpara.hpp - opm/parser/eclipse/EclipseState/Tables/DenT.hpp - opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp - opm/parser/eclipse/EclipseState/Tables/StandardCond.hpp - opm/parser/eclipse/EclipseState/Tables/PolyInjTable.hpp - opm/parser/eclipse/EclipseState/Tables/PdvdTable.hpp - opm/parser/eclipse/EclipseState/Tables/TlpmixpaTable.hpp - opm/parser/eclipse/EclipseState/Tables/PvdgTable.hpp - opm/parser/eclipse/EclipseState/Tables/MsfnTable.hpp - opm/parser/eclipse/EclipseState/Tables/GasvisctTable.hpp - opm/parser/eclipse/EclipseState/Tables/Regdims.hpp - opm/parser/eclipse/EclipseState/Tables/Eqldims.hpp - opm/parser/eclipse/EclipseState/Tables/SpecrockTable.hpp - opm/parser/eclipse/EclipseState/Tables/PvtwsaltTable.hpp - opm/parser/eclipse/EclipseState/Tables/BrineDensityTable.hpp - opm/parser/eclipse/EclipseState/Tables/PermfactTable.hpp - opm/parser/eclipse/EclipseState/Tables/RwgsaltTable.hpp - opm/parser/eclipse/EclipseState/Tables/SaltSolubilityTable.hpp - opm/parser/eclipse/EclipseState/Tables/SaltvdTable.hpp - opm/parser/eclipse/EclipseState/Tables/SaltpvdTable.hpp - opm/parser/eclipse/EclipseState/Tables/SolventDensityTable.hpp - opm/parser/eclipse/EclipseState/Tables/PlydhflfTable.hpp - opm/parser/eclipse/EclipseState/Tables/PlymwinjTable.hpp - opm/parser/eclipse/EclipseState/Tables/PlyshlogTable.hpp - opm/parser/eclipse/EclipseState/Tables/RsvdTable.hpp - opm/parser/eclipse/EclipseState/Tables/SkprwatTable.hpp - opm/parser/eclipse/EclipseState/Tables/SkprpolyTable.hpp - opm/parser/eclipse/EclipseState/Tables/SpecheatTable.hpp - opm/parser/eclipse/EclipseState/Tables/SgcwmisTable.hpp - opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp - opm/parser/eclipse/EclipseState/Tables/TLMixpar.hpp - opm/parser/eclipse/EclipseState/Tables/TableManager.hpp - opm/parser/eclipse/EclipseState/Tables/SwfnTable.hpp - opm/parser/eclipse/EclipseState/Tables/EnptvdTable.hpp - opm/parser/eclipse/EclipseState/Tables/SwofTable.hpp - opm/parser/eclipse/EclipseState/Tables/FlatTable.hpp - opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp - opm/parser/eclipse/EclipseState/Tables/JFunc.hpp - opm/parser/eclipse/EclipseState/Tables/TableIndex.hpp - opm/parser/eclipse/EclipseState/Tables/PvtgTable.hpp - opm/parser/eclipse/EclipseState/Tables/PvtgwTable.hpp - opm/parser/eclipse/EclipseState/Tables/PvtgwoTable.hpp - opm/parser/eclipse/EclipseState/Tables/Tabdims.hpp - opm/parser/eclipse/EclipseState/Tables/TableSchema.hpp - opm/parser/eclipse/EclipseState/Tables/RocktabTable.hpp - opm/parser/eclipse/EclipseState/Tables/EnkrvdTable.hpp - opm/parser/eclipse/EclipseState/Tables/PlyrockTable.hpp - opm/parser/eclipse/EclipseState/Tables/PvtxTable.hpp - opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp - opm/parser/eclipse/EclipseState/Tables/TableEnums.hpp - opm/parser/eclipse/EclipseState/Tables/RvvdTable.hpp - opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp - opm/parser/eclipse/EclipseState/Tables/AqutabTable.hpp - opm/parser/eclipse/EclipseState/Tables/PlyadsTable.hpp - opm/parser/eclipse/EclipseState/Tables/FoamadsTable.hpp - opm/parser/eclipse/EclipseState/Tables/FoammobTable.hpp - opm/parser/eclipse/EclipseState/Tables/PbvdTable.hpp - opm/parser/eclipse/EclipseState/Tables/SorwmisTable.hpp - opm/parser/eclipse/EclipseState/Tables/PlymaxTable.hpp - opm/parser/eclipse/EclipseState/Tables/PlyviscTable.hpp - opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp - opm/parser/eclipse/EclipseState/Tables/SsfnTable.hpp - opm/parser/eclipse/EclipseState/Tables/PvdoTable.hpp - opm/parser/eclipse/EclipseState/Tables/OilvisctTable.hpp - opm/parser/eclipse/EclipseState/Tables/SgfnTable.hpp - opm/parser/eclipse/EclipseState/Tables/MiscTable.hpp - opm/parser/eclipse/EclipseState/Tables/SgwfnTable.hpp - opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp - opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp - opm/parser/eclipse/EclipseState/Tables/PvtsolTable.hpp - opm/parser/eclipse/EclipseState/Tables/Rock2dTable.hpp - opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.hpp - opm/parser/eclipse/EclipseState/Tables/RockwnodTable.hpp - opm/parser/eclipse/EclipseState/Tables/OverburdTable.hpp - opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp - opm/parser/eclipse/EclipseState/Tables/PmiscTable.hpp - opm/parser/eclipse/EclipseState/Tables/RtempvdTable.hpp - opm/parser/eclipse/EclipseState/Tables/SlgofTable.hpp - opm/parser/eclipse/EclipseState/Tables/ImptvdTable.hpp - opm/parser/eclipse/EclipseState/Tables/ImkrvdTable.hpp - opm/parser/eclipse/EclipseState/Tables/Sof3Table.hpp - opm/parser/eclipse/EclipseState/Tables/SgofTable.hpp - opm/parser/eclipse/EclipseState/Tables/TracerVdTable.hpp - opm/parser/eclipse/EclipseState/EclipseState.hpp - opm/parser/eclipse/EclipseState/EclipseConfig.hpp - opm/parser/eclipse/EclipseState/Aquifer/Aquancon.hpp - opm/parser/eclipse/EclipseState/Aquifer/AquiferConfig.hpp - opm/parser/eclipse/EclipseState/Aquifer/AquiferCT.hpp - opm/parser/eclipse/EclipseState/Aquifer/Aquifetp.hpp - opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp - opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.hpp - opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.hpp - opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.hpp - opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.hpp - opm/parser/eclipse/EclipseState/Schedule/Action/ActionContext.hpp - opm/parser/eclipse/EclipseState/Schedule/Action/ActionResult.hpp - opm/parser/eclipse/EclipseState/Schedule/Action/ActionValue.hpp - opm/parser/eclipse/EclipseState/Schedule/Action/Actdims.hpp - opm/parser/eclipse/EclipseState/Schedule/Action/Actions.hpp - opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.hpp - opm/parser/eclipse/EclipseState/Schedule/Action/Condition.hpp - opm/parser/eclipse/EclipseState/Schedule/Action/Enums.hpp - opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.hpp - opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.hpp - opm/parser/eclipse/EclipseState/Schedule/Action/SimulatorUpdate.hpp - opm/parser/eclipse/EclipseState/Schedule/Action/State.hpp - opm/parser/eclipse/EclipseState/Schedule/Action/WGNames.hpp - opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.hpp - opm/parser/eclipse/EclipseState/Schedule/GasLiftOpt.hpp - opm/parser/eclipse/EclipseState/Schedule/Network/Balance.hpp - opm/parser/eclipse/EclipseState/Schedule/Network/Branch.hpp - opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp - opm/parser/eclipse/EclipseState/Schedule/Network/Node.hpp - opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp - opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/ProductionControls.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/InjectionControls.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/PAvg.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculator.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/NameOrder.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/WellMatcher.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/WellFoamProperties.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/WellBrineProperties.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/WellMICPProperties.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp - opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp - opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp - opm/parser/eclipse/EclipseState/Schedule/RFTConfig.hpp - opm/parser/eclipse/EclipseState/Schedule/RPTConfig.hpp - opm/parser/eclipse/EclipseState/Schedule/RSTConfig.hpp - opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp - opm/parser/eclipse/EclipseState/Schedule/ScheduleDeck.hpp - opm/parser/eclipse/EclipseState/Schedule/ScheduleGrid.hpp - opm/parser/eclipse/EclipseState/Schedule/ScheduleState.hpp - opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.hpp - opm/parser/eclipse/EclipseState/Schedule/Tuning.hpp - opm/parser/eclipse/EclipseState/Schedule/WriteRestartFileEvents.hpp - opm/parser/eclipse/EclipseState/Schedule/Group/GPMaint.hpp - opm/parser/eclipse/EclipseState/Schedule/Group/GTNode.hpp - opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp - opm/parser/eclipse/EclipseState/Schedule/Group/GuideRate.hpp - opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.hpp - opm/parser/eclipse/EclipseState/Schedule/Group/GConSump.hpp - opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp - opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp - opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp - opm/parser/eclipse/EclipseState/Schedule/CompletedCells.hpp - opm/parser/eclipse/EclipseState/Schedule/Events.hpp - opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp - opm/parser/eclipse/EclipseState/Schedule/MSW/icd.hpp - opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.hpp - opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.hpp - opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp - opm/parser/eclipse/EclipseState/Schedule/MSW/AICD.hpp - opm/parser/eclipse/EclipseState/Schedule/MSW/SICD.hpp - opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp - opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.hpp - opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.hpp - opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp - opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp - opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp - opm/parser/eclipse/EclipseState/checkDeck.hpp - opm/parser/eclipse/EclipseState/Runspec.hpp - opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp - opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp - opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp - opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.hpp - opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp - opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp - opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp - opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParams.hpp - opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp - opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp - opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQSet.hpp - opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQToken.hpp - opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp - opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp - opm/parser/eclipse/Deck/DeckItem.hpp - opm/parser/eclipse/Deck/Deck.hpp - opm/parser/eclipse/Deck/DeckView.hpp - opm/parser/eclipse/Deck/FileDeck.hpp - opm/parser/eclipse/Deck/DeckSection.hpp - opm/parser/eclipse/Deck/DeckTree.hpp - opm/parser/eclipse/Deck/DeckOutput.hpp - opm/parser/eclipse/Deck/DeckValue.hpp - opm/parser/eclipse/Deck/DeckKeyword.hpp - opm/parser/eclipse/Deck/DeckRecord.hpp - opm/parser/eclipse/Deck/ImportContainer.hpp - opm/parser/eclipse/Deck/UDAValue.hpp - opm/parser/eclipse/Deck/value_status.hpp - opm/parser/eclipse/Python/Python.hpp) + opm/input/eclipse/Utility/Functional.hpp + opm/input/eclipse/Utility/Typetools.hpp + opm/input/eclipse/Generator/KeywordGenerator.hpp + opm/input/eclipse/Generator/KeywordLoader.hpp + opm/input/eclipse/Units/UnitSystem.hpp + opm/input/eclipse/Units/Units.hpp + opm/input/eclipse/Units/Dimension.hpp + opm/input/eclipse/Parser/ErrorGuard.hpp + opm/input/eclipse/Parser/ParserItem.hpp + opm/input/eclipse/Parser/Parser.hpp + opm/input/eclipse/Parser/ParserRecord.hpp + opm/input/eclipse/Parser/ParserKeyword.hpp + opm/input/eclipse/Parser/InputErrorAction.hpp + opm/input/eclipse/Parser/ParserEnums.hpp + opm/input/eclipse/Parser/ParseContext.hpp + opm/input/eclipse/Parser/ParserConst.hpp + opm/input/eclipse/EclipseState/InitConfig/InitConfig.hpp + opm/input/eclipse/EclipseState/InitConfig/Equil.hpp + opm/input/eclipse/EclipseState/InitConfig/FoamConfig.hpp + opm/input/eclipse/EclipseState/Util/IOrderSet.hpp + opm/input/eclipse/EclipseState/Util/OrderedMap.hpp + opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp + opm/input/eclipse/EclipseState/Grid/FieldData.hpp + opm/input/eclipse/EclipseState/Grid/Keywords.hpp + opm/input/eclipse/EclipseState/Grid/GridDims.hpp + opm/input/eclipse/EclipseState/Grid/TranCalculator.hpp + opm/input/eclipse/EclipseState/Grid/TransMult.hpp + opm/input/eclipse/EclipseState/Grid/PinchMode.hpp + opm/input/eclipse/EclipseState/Grid/MULTREGTScanner.hpp + opm/input/eclipse/EclipseState/Grid/FaultCollection.hpp + opm/input/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp + opm/input/eclipse/EclipseState/Grid/Fault.hpp + opm/input/eclipse/EclipseState/Grid/Box.hpp + opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp + opm/input/eclipse/EclipseState/Grid/FaultFace.hpp + opm/input/eclipse/EclipseState/Grid/NNC.hpp + opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp + opm/input/eclipse/EclipseState/Grid/BoxManager.hpp + opm/input/eclipse/EclipseState/Grid/FaceDir.hpp + opm/input/eclipse/EclipseState/Grid/MapAxes.hpp + opm/input/eclipse/EclipseState/Grid/MinpvMode.hpp + opm/input/eclipse/EclipseState/EndpointScaling.hpp + opm/input/eclipse/EclipseState/TracerConfig.hpp + opm/input/eclipse/EclipseState/MICPpara.hpp + opm/input/eclipse/EclipseState/Tables/DenT.hpp + opm/input/eclipse/EclipseState/Tables/SimpleTable.hpp + opm/input/eclipse/EclipseState/Tables/StandardCond.hpp + opm/input/eclipse/EclipseState/Tables/PolyInjTable.hpp + opm/input/eclipse/EclipseState/Tables/PdvdTable.hpp + opm/input/eclipse/EclipseState/Tables/TlpmixpaTable.hpp + opm/input/eclipse/EclipseState/Tables/PvdgTable.hpp + opm/input/eclipse/EclipseState/Tables/MsfnTable.hpp + opm/input/eclipse/EclipseState/Tables/GasvisctTable.hpp + opm/input/eclipse/EclipseState/Tables/Regdims.hpp + opm/input/eclipse/EclipseState/Tables/Eqldims.hpp + opm/input/eclipse/EclipseState/Tables/SpecrockTable.hpp + opm/input/eclipse/EclipseState/Tables/PvtwsaltTable.hpp + opm/input/eclipse/EclipseState/Tables/BrineDensityTable.hpp + opm/input/eclipse/EclipseState/Tables/PermfactTable.hpp + opm/input/eclipse/EclipseState/Tables/RwgsaltTable.hpp + opm/input/eclipse/EclipseState/Tables/SaltSolubilityTable.hpp + opm/input/eclipse/EclipseState/Tables/SaltvdTable.hpp + opm/input/eclipse/EclipseState/Tables/SaltpvdTable.hpp + opm/input/eclipse/EclipseState/Tables/SolventDensityTable.hpp + opm/input/eclipse/EclipseState/Tables/PlydhflfTable.hpp + opm/input/eclipse/EclipseState/Tables/PlymwinjTable.hpp + opm/input/eclipse/EclipseState/Tables/PlyshlogTable.hpp + opm/input/eclipse/EclipseState/Tables/RsvdTable.hpp + opm/input/eclipse/EclipseState/Tables/SkprwatTable.hpp + opm/input/eclipse/EclipseState/Tables/SkprpolyTable.hpp + opm/input/eclipse/EclipseState/Tables/SpecheatTable.hpp + opm/input/eclipse/EclipseState/Tables/SgcwmisTable.hpp + opm/input/eclipse/EclipseState/Tables/Sof2Table.hpp + opm/input/eclipse/EclipseState/Tables/TLMixpar.hpp + opm/input/eclipse/EclipseState/Tables/TableManager.hpp + opm/input/eclipse/EclipseState/Tables/SwfnTable.hpp + opm/input/eclipse/EclipseState/Tables/EnptvdTable.hpp + opm/input/eclipse/EclipseState/Tables/SwofTable.hpp + opm/input/eclipse/EclipseState/Tables/FlatTable.hpp + opm/input/eclipse/EclipseState/Tables/Aqudims.hpp + opm/input/eclipse/EclipseState/Tables/JFunc.hpp + opm/input/eclipse/EclipseState/Tables/TableIndex.hpp + opm/input/eclipse/EclipseState/Tables/PvtgTable.hpp + opm/input/eclipse/EclipseState/Tables/PvtgwTable.hpp + opm/input/eclipse/EclipseState/Tables/PvtgwoTable.hpp + opm/input/eclipse/EclipseState/Tables/Tabdims.hpp + opm/input/eclipse/EclipseState/Tables/TableSchema.hpp + opm/input/eclipse/EclipseState/Tables/RocktabTable.hpp + opm/input/eclipse/EclipseState/Tables/EnkrvdTable.hpp + opm/input/eclipse/EclipseState/Tables/PlyrockTable.hpp + opm/input/eclipse/EclipseState/Tables/PvtxTable.hpp + opm/input/eclipse/EclipseState/Tables/WatvisctTable.hpp + opm/input/eclipse/EclipseState/Tables/TableEnums.hpp + opm/input/eclipse/EclipseState/Tables/RvvdTable.hpp + opm/input/eclipse/EclipseState/Tables/TableContainer.hpp + opm/input/eclipse/EclipseState/Tables/AqutabTable.hpp + opm/input/eclipse/EclipseState/Tables/PlyadsTable.hpp + opm/input/eclipse/EclipseState/Tables/FoamadsTable.hpp + opm/input/eclipse/EclipseState/Tables/FoammobTable.hpp + opm/input/eclipse/EclipseState/Tables/PbvdTable.hpp + opm/input/eclipse/EclipseState/Tables/SorwmisTable.hpp + opm/input/eclipse/EclipseState/Tables/PlymaxTable.hpp + opm/input/eclipse/EclipseState/Tables/PlyviscTable.hpp + opm/input/eclipse/EclipseState/Tables/TableColumn.hpp + opm/input/eclipse/EclipseState/Tables/SsfnTable.hpp + opm/input/eclipse/EclipseState/Tables/PvdoTable.hpp + opm/input/eclipse/EclipseState/Tables/OilvisctTable.hpp + opm/input/eclipse/EclipseState/Tables/SgfnTable.hpp + opm/input/eclipse/EclipseState/Tables/MiscTable.hpp + opm/input/eclipse/EclipseState/Tables/SgwfnTable.hpp + opm/input/eclipse/EclipseState/Tables/PvdsTable.hpp + opm/input/eclipse/EclipseState/Tables/PvtoTable.hpp + opm/input/eclipse/EclipseState/Tables/PvtsolTable.hpp + opm/input/eclipse/EclipseState/Tables/Rock2dTable.hpp + opm/input/eclipse/EclipseState/Tables/Rock2dtrTable.hpp + opm/input/eclipse/EclipseState/Tables/RockwnodTable.hpp + opm/input/eclipse/EclipseState/Tables/OverburdTable.hpp + opm/input/eclipse/EclipseState/Tables/ColumnSchema.hpp + opm/input/eclipse/EclipseState/Tables/PmiscTable.hpp + opm/input/eclipse/EclipseState/Tables/RtempvdTable.hpp + opm/input/eclipse/EclipseState/Tables/SlgofTable.hpp + opm/input/eclipse/EclipseState/Tables/ImptvdTable.hpp + opm/input/eclipse/EclipseState/Tables/ImkrvdTable.hpp + opm/input/eclipse/EclipseState/Tables/Sof3Table.hpp + opm/input/eclipse/EclipseState/Tables/SgofTable.hpp + opm/input/eclipse/EclipseState/Tables/TracerVdTable.hpp + opm/input/eclipse/EclipseState/EclipseState.hpp + opm/input/eclipse/EclipseState/EclipseConfig.hpp + opm/input/eclipse/EclipseState/Aquifer/Aquancon.hpp + opm/input/eclipse/EclipseState/Aquifer/AquiferConfig.hpp + opm/input/eclipse/EclipseState/Aquifer/AquiferCT.hpp + opm/input/eclipse/EclipseState/Aquifer/Aquifetp.hpp + opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp + opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.hpp + opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.hpp + opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.hpp + opm/input/eclipse/EclipseState/Schedule/Action/ActionAST.hpp + opm/input/eclipse/EclipseState/Schedule/Action/ActionContext.hpp + opm/input/eclipse/EclipseState/Schedule/Action/ActionResult.hpp + opm/input/eclipse/EclipseState/Schedule/Action/ActionValue.hpp + opm/input/eclipse/EclipseState/Schedule/Action/Actdims.hpp + opm/input/eclipse/EclipseState/Schedule/Action/Actions.hpp + opm/input/eclipse/EclipseState/Schedule/Action/ActionX.hpp + opm/input/eclipse/EclipseState/Schedule/Action/Condition.hpp + opm/input/eclipse/EclipseState/Schedule/Action/Enums.hpp + opm/input/eclipse/EclipseState/Schedule/Action/ASTNode.hpp + opm/input/eclipse/EclipseState/Schedule/Action/PyAction.hpp + opm/input/eclipse/EclipseState/Schedule/Action/SimulatorUpdate.hpp + opm/input/eclipse/EclipseState/Schedule/Action/State.hpp + opm/input/eclipse/EclipseState/Schedule/Action/WGNames.hpp + opm/input/eclipse/EclipseState/Schedule/ArrayDimChecker.hpp + opm/input/eclipse/EclipseState/Schedule/GasLiftOpt.hpp + opm/input/eclipse/EclipseState/Schedule/Network/Balance.hpp + opm/input/eclipse/EclipseState/Schedule/Network/Branch.hpp + opm/input/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp + opm/input/eclipse/EclipseState/Schedule/Network/Node.hpp + opm/input/eclipse/EclipseState/Schedule/VFPInjTable.hpp + opm/input/eclipse/EclipseState/Schedule/VFPProdTable.hpp + opm/input/eclipse/EclipseState/Schedule/Well/Connection.hpp + opm/input/eclipse/EclipseState/Schedule/Well/ProductionControls.hpp + opm/input/eclipse/EclipseState/Schedule/Well/InjectionControls.hpp + opm/input/eclipse/EclipseState/Schedule/Well/PAvg.hpp + opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculator.hpp + opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp + opm/input/eclipse/EclipseState/Schedule/Well/Well.hpp + opm/input/eclipse/EclipseState/Schedule/Well/WList.hpp + opm/input/eclipse/EclipseState/Schedule/Well/NameOrder.hpp + opm/input/eclipse/EclipseState/Schedule/Well/WellMatcher.hpp + opm/input/eclipse/EclipseState/Schedule/Well/WListManager.hpp + opm/input/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.hpp + opm/input/eclipse/EclipseState/Schedule/Well/WellFoamProperties.hpp + opm/input/eclipse/EclipseState/Schedule/Well/WellBrineProperties.hpp + opm/input/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.hpp + opm/input/eclipse/EclipseState/Schedule/Well/WellMICPProperties.hpp + opm/input/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.hpp + opm/input/eclipse/EclipseState/Schedule/Well/WellProductionProperties.hpp + opm/input/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp + opm/input/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp + opm/input/eclipse/EclipseState/Schedule/Well/WellTestState.hpp + opm/input/eclipse/EclipseState/Schedule/Well/WellConnections.hpp + opm/input/eclipse/EclipseState/Schedule/SummaryState.hpp + opm/input/eclipse/EclipseState/Schedule/RFTConfig.hpp + opm/input/eclipse/EclipseState/Schedule/RPTConfig.hpp + opm/input/eclipse/EclipseState/Schedule/RSTConfig.hpp + opm/input/eclipse/EclipseState/Schedule/Schedule.hpp + opm/input/eclipse/EclipseState/Schedule/ScheduleDeck.hpp + opm/input/eclipse/EclipseState/Schedule/ScheduleGrid.hpp + opm/input/eclipse/EclipseState/Schedule/ScheduleState.hpp + opm/input/eclipse/EclipseState/Schedule/ScheduleTypes.hpp + opm/input/eclipse/EclipseState/Schedule/Tuning.hpp + opm/input/eclipse/EclipseState/Schedule/WriteRestartFileEvents.hpp + opm/input/eclipse/EclipseState/Schedule/Group/GPMaint.hpp + opm/input/eclipse/EclipseState/Schedule/Group/GTNode.hpp + opm/input/eclipse/EclipseState/Schedule/Group/Group.hpp + opm/input/eclipse/EclipseState/Schedule/Group/GuideRate.hpp + opm/input/eclipse/EclipseState/Schedule/Group/GConSale.hpp + opm/input/eclipse/EclipseState/Schedule/Group/GConSump.hpp + opm/input/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp + opm/input/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp + opm/input/eclipse/EclipseState/Schedule/MessageLimits.hpp + opm/input/eclipse/EclipseState/Schedule/CompletedCells.hpp + opm/input/eclipse/EclipseState/Schedule/Events.hpp + opm/input/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp + opm/input/eclipse/EclipseState/Schedule/MSW/icd.hpp + opm/input/eclipse/EclipseState/Schedule/MSW/Segment.hpp + opm/input/eclipse/EclipseState/Schedule/MSW/Segment.hpp + opm/input/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp + opm/input/eclipse/EclipseState/Schedule/MSW/AICD.hpp + opm/input/eclipse/EclipseState/Schedule/MSW/SICD.hpp + opm/input/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp + opm/input/eclipse/EclipseState/SimulationConfig/BCConfig.hpp + opm/input/eclipse/EclipseState/SimulationConfig/RockConfig.hpp + opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp + opm/input/eclipse/EclipseState/Schedule/MSW/Valve.hpp + opm/input/eclipse/EclipseState/IOConfig/IOConfig.hpp + opm/input/eclipse/EclipseState/checkDeck.hpp + opm/input/eclipse/EclipseState/Runspec.hpp + opm/input/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp + opm/input/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp + opm/input/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp + opm/input/eclipse/EclipseState/Schedule/UDQ/UDQContext.hpp + opm/input/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp + opm/input/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp + opm/input/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp + opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParams.hpp + opm/input/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp + opm/input/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp + opm/input/eclipse/EclipseState/Schedule/UDQ/UDQSet.hpp + opm/input/eclipse/EclipseState/Schedule/UDQ/UDQToken.hpp + opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp + opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp + opm/input/eclipse/Deck/DeckItem.hpp + opm/input/eclipse/Deck/Deck.hpp + opm/input/eclipse/Deck/DeckView.hpp + opm/input/eclipse/Deck/FileDeck.hpp + opm/input/eclipse/Deck/DeckSection.hpp + opm/input/eclipse/Deck/DeckTree.hpp + opm/input/eclipse/Deck/DeckOutput.hpp + opm/input/eclipse/Deck/DeckValue.hpp + opm/input/eclipse/Deck/DeckKeyword.hpp + opm/input/eclipse/Deck/DeckRecord.hpp + opm/input/eclipse/Deck/ImportContainer.hpp + opm/input/eclipse/Deck/UDAValue.hpp + opm/input/eclipse/Deck/value_status.hpp + opm/input/eclipse/Python/Python.hpp) endif() if(ENABLE_ECL_OUTPUT) list(APPEND PUBLIC_HEADER_FILES diff --git a/CopyHeaders.cmake b/CopyHeaders.cmake index 3b3fccc49..044fbb3ee 100644 --- a/CopyHeaders.cmake +++ b/CopyHeaders.cmake @@ -13,17 +13,17 @@ if (EXISTS ${BASE_DIR}/python/cxx) endif() execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${BASE_DIR}/tmp_gen/include/opm/parser/eclipse/Parser/ParserKeywords/Builtin.hpp - ${BASE_DIR}/include/opm/parser/eclipse/Parser/ParserKeywords/Builtin.hpp) + ${BASE_DIR}/tmp_gen/include/opm/input/eclipse/Parser/ParserKeywords/Builtin.hpp + ${BASE_DIR}/include/opm/input/eclipse/Parser/ParserKeywords/Builtin.hpp) -file(GLOB HDRS ${BASE_DIR}/tmp_gen/include/opm/parser/eclipse/Parser/ParserKeywords/*.hpp) +file(GLOB HDRS ${BASE_DIR}/tmp_gen/include/opm/input/eclipse/Parser/ParserKeywords/*.hpp) foreach(HDR ${HDRS}) - file(RELATIVE_PATH hdr ${BASE_DIR}/tmp_gen/include/opm/parser/eclipse/Parser/ParserKeywords ${HDR}) + file(RELATIVE_PATH hdr ${BASE_DIR}/tmp_gen/include/opm/input/eclipse/Parser/ParserKeywords ${HDR}) execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDR} - ${BASE_DIR}/include/opm/parser/eclipse/Parser/ParserKeywords/${hdr}) + ${BASE_DIR}/include/opm/input/eclipse/Parser/ParserKeywords/${hdr}) endforeach() diff --git a/GenerateKeywords.cmake b/GenerateKeywords.cmake index 50d276cb6..949e46c46 100644 --- a/GenerateKeywords.cmake +++ b/GenerateKeywords.cmake @@ -1,27 +1,27 @@ set(genkw_SOURCES src/opm/json/JsonObject.cpp - src/opm/parser/eclipse/Parser/createDefaultKeywordList.cpp - src/opm/parser/eclipse/Deck/UDAValue.cpp - src/opm/parser/eclipse/Deck/DeckTree.cpp - src/opm/parser/eclipse/Deck/DeckValue.cpp - src/opm/parser/eclipse/Deck/Deck.cpp - src/opm/parser/eclipse/Deck/DeckView.cpp - src/opm/parser/eclipse/Deck/DeckItem.cpp - src/opm/parser/eclipse/Deck/DeckKeyword.cpp - src/opm/parser/eclipse/Deck/DeckRecord.cpp - src/opm/parser/eclipse/Deck/DeckOutput.cpp - src/opm/parser/eclipse/Generator/KeywordGenerator.cpp - src/opm/parser/eclipse/Generator/KeywordLoader.cpp - src/opm/parser/eclipse/Parser/ErrorGuard.cpp - src/opm/parser/eclipse/Parser/ParseContext.cpp - src/opm/parser/eclipse/Parser/ParserEnums.cpp - src/opm/parser/eclipse/Parser/ParserItem.cpp - src/opm/parser/eclipse/Parser/ParserKeyword.cpp - src/opm/parser/eclipse/Parser/ParserRecord.cpp - src/opm/parser/eclipse/Parser/raw/RawKeyword.cpp - src/opm/parser/eclipse/Parser/raw/RawRecord.cpp - src/opm/parser/eclipse/Parser/raw/StarToken.cpp - src/opm/parser/eclipse/Units/Dimension.cpp - src/opm/parser/eclipse/Units/UnitSystem.cpp + src/opm/input/eclipse/Parser/createDefaultKeywordList.cpp + src/opm/input/eclipse/Deck/UDAValue.cpp + src/opm/input/eclipse/Deck/DeckTree.cpp + src/opm/input/eclipse/Deck/DeckValue.cpp + src/opm/input/eclipse/Deck/Deck.cpp + src/opm/input/eclipse/Deck/DeckView.cpp + src/opm/input/eclipse/Deck/DeckItem.cpp + src/opm/input/eclipse/Deck/DeckKeyword.cpp + src/opm/input/eclipse/Deck/DeckRecord.cpp + src/opm/input/eclipse/Deck/DeckOutput.cpp + src/opm/input/eclipse/Generator/KeywordGenerator.cpp + src/opm/input/eclipse/Generator/KeywordLoader.cpp + src/opm/input/eclipse/Parser/ErrorGuard.cpp + src/opm/input/eclipse/Parser/ParseContext.cpp + src/opm/input/eclipse/Parser/ParserEnums.cpp + src/opm/input/eclipse/Parser/ParserItem.cpp + src/opm/input/eclipse/Parser/ParserKeyword.cpp + src/opm/input/eclipse/Parser/ParserRecord.cpp + src/opm/input/eclipse/Parser/raw/RawKeyword.cpp + src/opm/input/eclipse/Parser/raw/RawRecord.cpp + src/opm/input/eclipse/Parser/raw/StarToken.cpp + src/opm/input/eclipse/Units/Dimension.cpp + src/opm/input/eclipse/Units/UnitSystem.cpp src/opm/common/utility/OpmInputError.cpp src/opm/common/OpmLog/OpmLog.cpp src/opm/common/OpmLog/Logger.cpp @@ -37,9 +37,9 @@ add_executable(genkw ${genkw_SOURCES}) target_link_libraries(genkw ${opm-common_LIBRARIES}) # Generate keyword list -include(src/opm/parser/eclipse/share/keywords/keyword_list.cmake) -string(REGEX REPLACE "([^;]+)" "${PROJECT_SOURCE_DIR}/src/opm/parser/eclipse/share/keywords/\\1" keyword_files "${keywords}") -configure_file(src/opm/parser/eclipse/keyword_list.argv.in keyword_list.argv) +include(src/opm/input/eclipse/share/keywords/keyword_list.cmake) +string(REGEX REPLACE "([^;]+)" "${PROJECT_SOURCE_DIR}/src/opm/input/eclipse/share/keywords/\\1" keyword_files "${keywords}") +configure_file(src/opm/input/eclipse/keyword_list.argv.in keyword_list.argv) # Generate keyword source @@ -47,7 +47,7 @@ set( genkw_argv keyword_list.argv ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords ${PROJECT_BINARY_DIR}/tmp_gen/ParserInit.cpp ${PROJECT_BINARY_DIR}/tmp_gen/include/ - opm/parser/eclipse/Parser/ParserKeywords + opm/input/eclipse/Parser/ParserKeywords ${PROJECT_BINARY_DIR}/tmp_gen/TestKeywords.cpp) set( _tmp_output @@ -123,7 +123,7 @@ endif() add_custom_command( OUTPUT ${_tmp_output} COMMAND genkw ${genkw_argv} - DEPENDS genkw ${keyword_files} src/opm/parser/eclipse/share/keywords/keyword_list.cmake) + DEPENDS genkw ${keyword_files} src/opm/input/eclipse/share/keywords/keyword_list.cmake) # To avoid some rebuilds add_custom_command(OUTPUT diff --git a/docs/keywords.txt b/docs/keywords.txt index 600048046..b14b07cd8 100644 --- a/docs/keywords.txt +++ b/docs/keywords.txt @@ -297,7 +297,7 @@ composite units based on the dimension of the composite quantity. As a consequence the list of dimensions supported by the parser is long, and growing. The current list can be found in the source file: - opm/parser/eclipse/Units/UnitSystem.cpp + opm/input/eclipse/Units/UnitSystem.cpp diff --git a/examples/msim.cpp b/examples/msim.cpp index 5fbc1a2cd..b5a9b943d 100644 --- a/examples/msim.cpp +++ b/examples/msim.cpp @@ -19,14 +19,14 @@ #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/examples/opmhash.cpp b/examples/opmhash.cpp index 4af5e2989..904753d83 100644 --- a/examples/opmhash.cpp +++ b/examples/opmhash.cpp @@ -24,14 +24,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include struct keyword { diff --git a/examples/opmi.cpp b/examples/opmi.cpp index 0dbddd12f..60b07529f 100644 --- a/examples/opmi.cpp +++ b/examples/opmi.cpp @@ -21,15 +21,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/examples/opmpack.cpp b/examples/opmpack.cpp index acbbe05a5..4590eac1f 100644 --- a/examples/opmpack.cpp +++ b/examples/opmpack.cpp @@ -22,14 +22,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace fs = std::filesystem; diff --git a/examples/rst_deck.cpp b/examples/rst_deck.cpp index 054278749..d5cb26d9a 100644 --- a/examples/rst_deck.cpp +++ b/examples/rst_deck.cpp @@ -26,20 +26,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace fs = std::filesystem; diff --git a/examples/wellgraph.cpp b/examples/wellgraph.cpp index 44206b69a..4b1f39b93 100644 --- a/examples/wellgraph.cpp +++ b/examples/wellgraph.cpp @@ -23,14 +23,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/msim/include/opm/msim/msim.hpp b/msim/include/opm/msim/msim.hpp index 27e97a500..136c45549 100644 --- a/msim/include/opm/msim/msim.hpp +++ b/msim/include/opm/msim/msim.hpp @@ -6,18 +6,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include +#include namespace Opm { diff --git a/msim/src/msim.cpp b/msim/src/msim.cpp index 769808932..fbecfc094 100644 --- a/msim/src/msim.cpp +++ b/msim/src/msim.cpp @@ -27,16 +27,16 @@ #include #include #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace Opm { diff --git a/opm/common/utility/ActiveGridCells.hpp b/opm/common/utility/ActiveGridCells.hpp index 14aa4234d..d08d553c6 100644 --- a/opm/common/utility/ActiveGridCells.hpp +++ b/opm/common/utility/ActiveGridCells.hpp @@ -19,7 +19,7 @@ #ifndef ACTIVEGRIDCELLS_HPP #define ACTIVEGRIDCELLS_HPP -#include +#include #include diff --git a/opm/common/utility/TimeService.hpp b/opm/common/utility/TimeService.hpp index 87545a6cd..3f101072c 100644 --- a/opm/common/utility/TimeService.hpp +++ b/opm/common/utility/TimeService.hpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/Deck/Deck.hpp b/opm/input/eclipse/Deck/Deck.hpp similarity index 96% rename from opm/parser/eclipse/Deck/Deck.hpp rename to opm/input/eclipse/Deck/Deck.hpp index 8486d5918..a71b75a86 100644 --- a/opm/parser/eclipse/Deck/Deck.hpp +++ b/opm/input/eclipse/Deck/Deck.hpp @@ -28,10 +28,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef OPM_PARSER_DECK_API_WARNING #ifndef OPM_PARSER_DECK_API diff --git a/opm/parser/eclipse/Deck/DeckItem.hpp b/opm/input/eclipse/Deck/DeckItem.hpp similarity index 97% rename from opm/parser/eclipse/Deck/DeckItem.hpp rename to opm/input/eclipse/Deck/DeckItem.hpp index 41d25dcf3..15af0d8a3 100644 --- a/opm/parser/eclipse/Deck/DeckItem.hpp +++ b/opm/input/eclipse/Deck/DeckItem.hpp @@ -25,10 +25,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/Deck/DeckKeyword.hpp b/opm/input/eclipse/Deck/DeckKeyword.hpp similarity index 97% rename from opm/parser/eclipse/Deck/DeckKeyword.hpp rename to opm/input/eclipse/Deck/DeckKeyword.hpp index 0f306c8c9..1cf1d3035 100644 --- a/opm/parser/eclipse/Deck/DeckKeyword.hpp +++ b/opm/input/eclipse/Deck/DeckKeyword.hpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include namespace Opm { diff --git a/opm/parser/eclipse/Deck/DeckOutput.hpp b/opm/input/eclipse/Deck/DeckOutput.hpp similarity index 100% rename from opm/parser/eclipse/Deck/DeckOutput.hpp rename to opm/input/eclipse/Deck/DeckOutput.hpp diff --git a/opm/parser/eclipse/Deck/DeckRecord.hpp b/opm/input/eclipse/Deck/DeckRecord.hpp similarity index 98% rename from opm/parser/eclipse/Deck/DeckRecord.hpp rename to opm/input/eclipse/Deck/DeckRecord.hpp index c7fc4da2f..58abcc57f 100644 --- a/opm/parser/eclipse/Deck/DeckRecord.hpp +++ b/opm/input/eclipse/Deck/DeckRecord.hpp @@ -25,7 +25,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/Deck/DeckSection.hpp b/opm/input/eclipse/Deck/DeckSection.hpp similarity index 99% rename from opm/parser/eclipse/Deck/DeckSection.hpp rename to opm/input/eclipse/Deck/DeckSection.hpp index b52542a58..a66a1361d 100644 --- a/opm/parser/eclipse/Deck/DeckSection.hpp +++ b/opm/input/eclipse/Deck/DeckSection.hpp @@ -22,7 +22,7 @@ #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/Deck/DeckTree.hpp b/opm/input/eclipse/Deck/DeckTree.hpp similarity index 100% rename from opm/parser/eclipse/Deck/DeckTree.hpp rename to opm/input/eclipse/Deck/DeckTree.hpp diff --git a/opm/parser/eclipse/Deck/DeckValue.hpp b/opm/input/eclipse/Deck/DeckValue.hpp similarity index 93% rename from opm/parser/eclipse/Deck/DeckValue.hpp rename to opm/input/eclipse/Deck/DeckValue.hpp index 1e39b2f99..645557bb2 100644 --- a/opm/parser/eclipse/Deck/DeckValue.hpp +++ b/opm/input/eclipse/Deck/DeckValue.hpp @@ -22,8 +22,8 @@ #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/Deck/DeckView.hpp b/opm/input/eclipse/Deck/DeckView.hpp similarity index 98% rename from opm/parser/eclipse/Deck/DeckView.hpp rename to opm/input/eclipse/Deck/DeckView.hpp index 6f9e4d4e3..0e40caa23 100644 --- a/opm/parser/eclipse/Deck/DeckView.hpp +++ b/opm/input/eclipse/Deck/DeckView.hpp @@ -20,7 +20,7 @@ #ifndef DECKVIEW_HPP #define DECKVIEW_HPP -#include +#include #include diff --git a/opm/parser/eclipse/Deck/FileDeck.hpp b/opm/input/eclipse/Deck/FileDeck.hpp similarity index 98% rename from opm/parser/eclipse/Deck/FileDeck.hpp rename to opm/input/eclipse/Deck/FileDeck.hpp index d284ad8f2..a3a960864 100644 --- a/opm/parser/eclipse/Deck/FileDeck.hpp +++ b/opm/input/eclipse/Deck/FileDeck.hpp @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include namespace fs = std::filesystem; diff --git a/opm/parser/eclipse/Deck/ImportContainer.hpp b/opm/input/eclipse/Deck/ImportContainer.hpp similarity index 96% rename from opm/parser/eclipse/Deck/ImportContainer.hpp rename to opm/input/eclipse/Deck/ImportContainer.hpp index d8e3746e0..49276cb3c 100644 --- a/opm/parser/eclipse/Deck/ImportContainer.hpp +++ b/opm/input/eclipse/Deck/ImportContainer.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/Deck/UDAValue.hpp b/opm/input/eclipse/Deck/UDAValue.hpp similarity index 98% rename from opm/parser/eclipse/Deck/UDAValue.hpp rename to opm/input/eclipse/Deck/UDAValue.hpp index e8d9f4c2a..4788c8213 100644 --- a/opm/parser/eclipse/Deck/UDAValue.hpp +++ b/opm/input/eclipse/Deck/UDAValue.hpp @@ -25,7 +25,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/Deck/value_status.hpp b/opm/input/eclipse/Deck/value_status.hpp similarity index 100% rename from opm/parser/eclipse/Deck/value_status.hpp rename to opm/input/eclipse/Deck/value_status.hpp diff --git a/opm/parser/eclipse/EclipseState/Aquifer/Aquancon.hpp b/opm/input/eclipse/EclipseState/Aquifer/Aquancon.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/Aquifer/Aquancon.hpp rename to opm/input/eclipse/EclipseState/Aquifer/Aquancon.hpp index b79a2711f..dd4b6120a 100644 --- a/opm/parser/eclipse/EclipseState/Aquifer/Aquancon.hpp +++ b/opm/input/eclipse/EclipseState/Aquifer/Aquancon.hpp @@ -26,7 +26,7 @@ implement the analytical aquifer models in OPM Flow. */ -#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Aquifer/AquiferCT.hpp b/opm/input/eclipse/EclipseState/Aquifer/AquiferCT.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Aquifer/AquiferCT.hpp rename to opm/input/eclipse/EclipseState/Aquifer/AquiferCT.hpp diff --git a/opm/parser/eclipse/EclipseState/Aquifer/AquiferConfig.hpp b/opm/input/eclipse/EclipseState/Aquifer/AquiferConfig.hpp similarity index 90% rename from opm/parser/eclipse/EclipseState/Aquifer/AquiferConfig.hpp rename to opm/input/eclipse/EclipseState/Aquifer/AquiferConfig.hpp index fe4731780..0c38bba57 100644 --- a/opm/parser/eclipse/EclipseState/Aquifer/AquiferConfig.hpp +++ b/opm/input/eclipse/EclipseState/Aquifer/AquiferConfig.hpp @@ -20,10 +20,10 @@ #ifndef OPM_AUQIFER_CONFIG_HPP #define OPM_AUQIFER_CONFIG_HPP -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Aquifer/Aquifetp.hpp b/opm/input/eclipse/EclipseState/Aquifer/Aquifetp.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Aquifer/Aquifetp.hpp rename to opm/input/eclipse/EclipseState/Aquifer/Aquifetp.hpp diff --git a/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp b/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp rename to opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp diff --git a/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.hpp b/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.hpp similarity index 97% rename from opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.hpp rename to opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.hpp index b9fd3e276..5a1e4c47d 100644 --- a/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.hpp +++ b/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.hpp @@ -20,7 +20,7 @@ #ifndef OPM_NUMERICALAQUIFERCONNECTION_HPP #define OPM_NUMERICALAQUIFERCONNECTION_HPP -#include +#include #include #include #include diff --git a/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.hpp b/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.hpp similarity index 96% rename from opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.hpp rename to opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.hpp index b210c3d81..d9997ce62 100644 --- a/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.hpp +++ b/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.hpp @@ -25,7 +25,7 @@ #include -#include +#include namespace Opm { class Deck; diff --git a/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.hpp b/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.hpp similarity index 93% rename from opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.hpp rename to opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.hpp index 2f5537df8..a4d72987c 100644 --- a/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.hpp +++ b/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.hpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include namespace Opm { class NNC; diff --git a/opm/parser/eclipse/EclipseState/EclipseConfig.hpp b/opm/input/eclipse/EclipseState/EclipseConfig.hpp similarity index 92% rename from opm/parser/eclipse/EclipseState/EclipseConfig.hpp rename to opm/input/eclipse/EclipseState/EclipseConfig.hpp index 8558b89b9..f9e1874bc 100644 --- a/opm/parser/eclipse/EclipseState/EclipseConfig.hpp +++ b/opm/input/eclipse/EclipseState/EclipseConfig.hpp @@ -20,8 +20,8 @@ #ifndef OPM_ECLIPSE_CONFIG_HPP #define OPM_ECLIPSE_CONFIG_HPP -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/EclipseState.hpp b/opm/input/eclipse/EclipseState/EclipseState.hpp similarity index 86% rename from opm/parser/eclipse/EclipseState/EclipseState.hpp rename to opm/input/eclipse/EclipseState/EclipseState.hpp index 4dc9d8e5d..1c53a70c5 100644 --- a/opm/parser/eclipse/EclipseState/EclipseState.hpp +++ b/opm/input/eclipse/EclipseState/EclipseState.hpp @@ -24,19 +24,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { class Deck; diff --git a/opm/parser/eclipse/EclipseState/EndpointScaling.hpp b/opm/input/eclipse/EclipseState/EndpointScaling.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/EndpointScaling.hpp rename to opm/input/eclipse/EclipseState/EndpointScaling.hpp diff --git a/opm/parser/eclipse/EclipseState/Grid/Box.hpp b/opm/input/eclipse/EclipseState/Grid/Box.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/Box.hpp rename to opm/input/eclipse/EclipseState/Grid/Box.hpp diff --git a/opm/parser/eclipse/EclipseState/Grid/BoxManager.hpp b/opm/input/eclipse/EclipseState/Grid/BoxManager.hpp similarity index 94% rename from opm/parser/eclipse/EclipseState/Grid/BoxManager.hpp rename to opm/input/eclipse/EclipseState/Grid/BoxManager.hpp index 9e247c88b..565b339fb 100644 --- a/opm/parser/eclipse/EclipseState/Grid/BoxManager.hpp +++ b/opm/input/eclipse/EclipseState/Grid/BoxManager.hpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include /* This class implements a simple book keeping system for the current diff --git a/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp b/opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp rename to opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp index aa31e59d6..f9ed932ee 100644 --- a/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp +++ b/opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp @@ -22,10 +22,10 @@ #define OPM_PARSER_ECLIPSE_GRID_HPP -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp b/opm/input/eclipse/EclipseState/Grid/FaceDir.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp rename to opm/input/eclipse/EclipseState/Grid/FaceDir.hpp diff --git a/opm/parser/eclipse/EclipseState/Grid/Fault.hpp b/opm/input/eclipse/EclipseState/Grid/Fault.hpp similarity index 96% rename from opm/parser/eclipse/EclipseState/Grid/Fault.hpp rename to opm/input/eclipse/EclipseState/Grid/Fault.hpp index 483892e65..a1067facd 100644 --- a/opm/parser/eclipse/EclipseState/Grid/Fault.hpp +++ b/opm/input/eclipse/EclipseState/Grid/Fault.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp b/opm/input/eclipse/EclipseState/Grid/FaultCollection.hpp similarity index 94% rename from opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp rename to opm/input/eclipse/EclipseState/Grid/FaultCollection.hpp index 45a485d12..f8caee87a 100644 --- a/opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp +++ b/opm/input/eclipse/EclipseState/Grid/FaultCollection.hpp @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Grid/FaultFace.hpp b/opm/input/eclipse/EclipseState/Grid/FaultFace.hpp similarity index 96% rename from opm/parser/eclipse/EclipseState/Grid/FaultFace.hpp rename to opm/input/eclipse/EclipseState/Grid/FaultFace.hpp index a302b826b..d50efb437 100644 --- a/opm/parser/eclipse/EclipseState/Grid/FaultFace.hpp +++ b/opm/input/eclipse/EclipseState/Grid/FaultFace.hpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Grid/FieldData.hpp b/opm/input/eclipse/EclipseState/Grid/FieldData.hpp similarity index 97% rename from opm/parser/eclipse/EclipseState/Grid/FieldData.hpp rename to opm/input/eclipse/EclipseState/Grid/FieldData.hpp index 58eee7c18..47c4c6d8e 100644 --- a/opm/parser/eclipse/EclipseState/Grid/FieldData.hpp +++ b/opm/input/eclipse/EclipseState/Grid/FieldData.hpp @@ -20,9 +20,9 @@ #ifndef FIELD_DATA_HPP #define FIELD_DATA_HPP -#include -#include -#include +#include +#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp b/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp rename to opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp index 7bd2537f5..4194fc793 100644 --- a/opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp +++ b/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Grid/GridDims.hpp b/opm/input/eclipse/EclipseState/Grid/GridDims.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/GridDims.hpp rename to opm/input/eclipse/EclipseState/Grid/GridDims.hpp diff --git a/opm/parser/eclipse/EclipseState/Grid/Keywords.hpp b/opm/input/eclipse/EclipseState/Grid/Keywords.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/Keywords.hpp rename to opm/input/eclipse/EclipseState/Grid/Keywords.hpp diff --git a/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp b/opm/input/eclipse/EclipseState/Grid/MULTREGTScanner.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp rename to opm/input/eclipse/EclipseState/Grid/MULTREGTScanner.hpp index 7e42bd15e..8ab538e48 100644 --- a/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp +++ b/opm/input/eclipse/EclipseState/Grid/MULTREGTScanner.hpp @@ -21,7 +21,7 @@ #ifndef OPM_PARSER_MULTREGTSCANNER_HPP #define OPM_PARSER_MULTREGTSCANNER_HPP -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Grid/MapAxes.hpp b/opm/input/eclipse/EclipseState/Grid/MapAxes.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/MapAxes.hpp rename to opm/input/eclipse/EclipseState/Grid/MapAxes.hpp diff --git a/opm/parser/eclipse/EclipseState/Grid/MinpvMode.hpp b/opm/input/eclipse/EclipseState/Grid/MinpvMode.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/MinpvMode.hpp rename to opm/input/eclipse/EclipseState/Grid/MinpvMode.hpp diff --git a/opm/parser/eclipse/EclipseState/Grid/NNC.hpp b/opm/input/eclipse/EclipseState/Grid/NNC.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/NNC.hpp rename to opm/input/eclipse/EclipseState/Grid/NNC.hpp diff --git a/opm/parser/eclipse/EclipseState/Grid/PinchMode.hpp b/opm/input/eclipse/EclipseState/Grid/PinchMode.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/PinchMode.hpp rename to opm/input/eclipse/EclipseState/Grid/PinchMode.hpp diff --git a/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp b/opm/input/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp rename to opm/input/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp diff --git a/opm/parser/eclipse/EclipseState/Grid/TranCalculator.hpp b/opm/input/eclipse/EclipseState/Grid/TranCalculator.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Grid/TranCalculator.hpp rename to opm/input/eclipse/EclipseState/Grid/TranCalculator.hpp diff --git a/opm/parser/eclipse/EclipseState/Grid/TransMult.hpp b/opm/input/eclipse/EclipseState/Grid/TransMult.hpp similarity index 96% rename from opm/parser/eclipse/EclipseState/Grid/TransMult.hpp rename to opm/input/eclipse/EclipseState/Grid/TransMult.hpp index 5e9755089..8c20f06e5 100644 --- a/opm/parser/eclipse/EclipseState/Grid/TransMult.hpp +++ b/opm/input/eclipse/EclipseState/Grid/TransMult.hpp @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include namespace Opm { template< typename > class GridProperty; diff --git a/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp b/opm/input/eclipse/EclipseState/IOConfig/IOConfig.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp rename to opm/input/eclipse/EclipseState/IOConfig/IOConfig.hpp diff --git a/opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp b/opm/input/eclipse/EclipseState/InitConfig/Equil.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp rename to opm/input/eclipse/EclipseState/InitConfig/Equil.hpp diff --git a/opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp b/opm/input/eclipse/EclipseState/InitConfig/FoamConfig.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp rename to opm/input/eclipse/EclipseState/InitConfig/FoamConfig.hpp index 9c9a21ab3..07b67512c 100644 --- a/opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp +++ b/opm/input/eclipse/EclipseState/InitConfig/FoamConfig.hpp @@ -20,7 +20,7 @@ #ifndef OPM_FOAMCONFIG_HPP #define OPM_FOAMCONFIG_HPP -#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp b/opm/input/eclipse/EclipseState/InitConfig/InitConfig.hpp similarity index 94% rename from opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp rename to opm/input/eclipse/EclipseState/InitConfig/InitConfig.hpp index 0a6bb24e3..377008264 100644 --- a/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp +++ b/opm/input/eclipse/EclipseState/InitConfig/InitConfig.hpp @@ -22,8 +22,8 @@ #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/MICPpara.hpp b/opm/input/eclipse/EclipseState/MICPpara.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/MICPpara.hpp rename to opm/input/eclipse/EclipseState/MICPpara.hpp diff --git a/opm/parser/eclipse/EclipseState/Runspec.hpp b/opm/input/eclipse/EclipseState/Runspec.hpp similarity index 97% rename from opm/parser/eclipse/EclipseState/Runspec.hpp rename to opm/input/eclipse/EclipseState/Runspec.hpp index 656a4b45c..0bc61f69f 100644 --- a/opm/parser/eclipse/EclipseState/Runspec.hpp +++ b/opm/input/eclipse/EclipseState/Runspec.hpp @@ -24,11 +24,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Opm { class Deck; diff --git a/opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.hpp b/opm/input/eclipse/EclipseState/Schedule/Action/ASTNode.hpp similarity index 94% rename from opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.hpp rename to opm/input/eclipse/EclipseState/Schedule/Action/ASTNode.hpp index affd6665e..ce86b98e9 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Action/ASTNode.hpp @@ -3,7 +3,7 @@ #include -#include +#include #include "ActionValue.hpp" diff --git a/opm/parser/eclipse/EclipseState/Schedule/Action/Actdims.hpp b/opm/input/eclipse/EclipseState/Schedule/Action/Actdims.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Action/Actdims.hpp rename to opm/input/eclipse/EclipseState/Schedule/Action/Actdims.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.hpp b/opm/input/eclipse/EclipseState/Schedule/Action/ActionAST.hpp similarity index 96% rename from opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.hpp rename to opm/input/eclipse/EclipseState/Schedule/Action/ActionAST.hpp index 01ce17f5e..1d323aaaf 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Action/ActionAST.hpp @@ -26,7 +26,7 @@ #include #include -#include +#include namespace Opm { namespace Action { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Action/ActionContext.hpp b/opm/input/eclipse/EclipseState/Schedule/Action/ActionContext.hpp similarity index 92% rename from opm/parser/eclipse/EclipseState/Schedule/Action/ActionContext.hpp rename to opm/input/eclipse/EclipseState/Schedule/Action/ActionContext.hpp index 5c6fe1111..1daa75161 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Action/ActionContext.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Action/ActionContext.hpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include namespace Opm { namespace Action { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Action/ActionResult.hpp b/opm/input/eclipse/EclipseState/Schedule/Action/ActionResult.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Action/ActionResult.hpp rename to opm/input/eclipse/EclipseState/Schedule/Action/ActionResult.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Action/ActionValue.hpp b/opm/input/eclipse/EclipseState/Schedule/Action/ActionValue.hpp similarity index 93% rename from opm/parser/eclipse/EclipseState/Schedule/Action/ActionValue.hpp rename to opm/input/eclipse/EclipseState/Schedule/Action/ActionValue.hpp index 375281e50..96b90c060 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Action/ActionValue.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Action/ActionValue.hpp @@ -1,7 +1,7 @@ #ifndef ACTION_VALUE_HPP #define ACTION_VALUE_HPP -#include +#include enum TokenType { number, // 0 diff --git a/opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.hpp b/opm/input/eclipse/EclipseState/Schedule/Action/ActionX.hpp similarity index 93% rename from opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.hpp rename to opm/input/eclipse/EclipseState/Schedule/Action/ActionX.hpp index 5bb0aef1c..eed40338a 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Action/ActionX.hpp @@ -27,10 +27,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include diff --git a/opm/parser/eclipse/EclipseState/Schedule/Action/Actions.hpp b/opm/input/eclipse/EclipseState/Schedule/Action/Actions.hpp similarity index 93% rename from opm/parser/eclipse/EclipseState/Schedule/Action/Actions.hpp rename to opm/input/eclipse/EclipseState/Schedule/Action/Actions.hpp index eab414b80..368905b03 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Action/Actions.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Action/Actions.hpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include namespace Opm { namespace Action { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Action/Condition.hpp b/opm/input/eclipse/EclipseState/Schedule/Action/Condition.hpp similarity index 97% rename from opm/parser/eclipse/EclipseState/Schedule/Action/Condition.hpp rename to opm/input/eclipse/EclipseState/Schedule/Action/Condition.hpp index 330d3d716..0a17157c0 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Action/Condition.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Action/Condition.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Action/Enums.hpp b/opm/input/eclipse/EclipseState/Schedule/Action/Enums.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Action/Enums.hpp rename to opm/input/eclipse/EclipseState/Schedule/Action/Enums.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.hpp b/opm/input/eclipse/EclipseState/Schedule/Action/PyAction.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.hpp rename to opm/input/eclipse/EclipseState/Schedule/Action/PyAction.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Action/SimulatorUpdate.hpp b/opm/input/eclipse/EclipseState/Schedule/Action/SimulatorUpdate.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Action/SimulatorUpdate.hpp rename to opm/input/eclipse/EclipseState/Schedule/Action/SimulatorUpdate.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Action/State.hpp b/opm/input/eclipse/EclipseState/Schedule/Action/State.hpp similarity index 97% rename from opm/parser/eclipse/EclipseState/Schedule/Action/State.hpp rename to opm/input/eclipse/EclipseState/Schedule/Action/State.hpp index 85b9d45b9..0797e0097 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Action/State.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Action/State.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Action/WGNames.hpp b/opm/input/eclipse/EclipseState/Schedule/Action/WGNames.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Action/WGNames.hpp rename to opm/input/eclipse/EclipseState/Schedule/Action/WGNames.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.hpp b/opm/input/eclipse/EclipseState/Schedule/ArrayDimChecker.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.hpp rename to opm/input/eclipse/EclipseState/Schedule/ArrayDimChecker.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/CompletedCells.hpp b/opm/input/eclipse/EclipseState/Schedule/CompletedCells.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/Schedule/CompletedCells.hpp rename to opm/input/eclipse/EclipseState/Schedule/CompletedCells.hpp index d3e790fbb..32d8746eb 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/CompletedCells.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/CompletedCells.hpp @@ -21,7 +21,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Events.hpp b/opm/input/eclipse/EclipseState/Schedule/Events.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Events.hpp rename to opm/input/eclipse/EclipseState/Schedule/Events.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/GasLiftOpt.hpp b/opm/input/eclipse/EclipseState/Schedule/GasLiftOpt.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/GasLiftOpt.hpp rename to opm/input/eclipse/EclipseState/Schedule/GasLiftOpt.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.hpp b/opm/input/eclipse/EclipseState/Schedule/Group/GConSale.hpp similarity index 96% rename from opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.hpp rename to opm/input/eclipse/EclipseState/Schedule/Group/GConSale.hpp index db7cf8dbb..46573aad7 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Group/GConSale.hpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group/GConSump.hpp b/opm/input/eclipse/EclipseState/Schedule/Group/GConSump.hpp similarity index 96% rename from opm/parser/eclipse/EclipseState/Schedule/Group/GConSump.hpp rename to opm/input/eclipse/EclipseState/Schedule/Group/GConSump.hpp index 3728ecb05..1c53b3471 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group/GConSump.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Group/GConSump.hpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group/GPMaint.hpp b/opm/input/eclipse/EclipseState/Schedule/Group/GPMaint.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Group/GPMaint.hpp rename to opm/input/eclipse/EclipseState/Schedule/Group/GPMaint.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group/GTNode.hpp b/opm/input/eclipse/EclipseState/Schedule/Group/GTNode.hpp similarity index 92% rename from opm/parser/eclipse/EclipseState/Schedule/Group/GTNode.hpp rename to opm/input/eclipse/EclipseState/Schedule/Group/GTNode.hpp index 4f93039d8..4388bf9bb 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group/GTNode.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Group/GTNode.hpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp b/opm/input/eclipse/EclipseState/Schedule/Group/Group.hpp similarity index 97% rename from opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp rename to opm/input/eclipse/EclipseState/Schedule/Group/Group.hpp index 8983da591..8debd25e6 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Group/Group.hpp @@ -25,11 +25,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRate.hpp b/opm/input/eclipse/EclipseState/Schedule/Group/GuideRate.hpp similarity index 96% rename from opm/parser/eclipse/EclipseState/Schedule/Group/GuideRate.hpp rename to opm/input/eclipse/EclipseState/Schedule/Group/GuideRate.hpp index 602a62154..40a06ab0e 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRate.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Group/GuideRate.hpp @@ -20,9 +20,9 @@ #ifndef GUIDE_RATE_HPP #define GUIDE_RATE_HPP -#include -#include -#include +#include +#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp b/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp similarity index 94% rename from opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp rename to opm/input/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp index 53cabe9ba..e40d998cd 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp b/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp similarity index 95% rename from opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp rename to opm/input/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp index 9098e0b22..2b323e3cd 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp @@ -20,9 +20,9 @@ #ifndef GUIDE_RATE_MODEL_HPP #define GUIDE_RATE_MODEL_HPP -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/MSW/AICD.hpp b/opm/input/eclipse/EclipseState/Schedule/MSW/AICD.hpp similarity index 97% rename from opm/parser/eclipse/EclipseState/Schedule/MSW/AICD.hpp rename to opm/input/eclipse/EclipseState/Schedule/MSW/AICD.hpp index 245804a73..cf69bfc01 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/MSW/AICD.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/MSW/AICD.hpp @@ -25,7 +25,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/MSW/SICD.hpp b/opm/input/eclipse/EclipseState/Schedule/MSW/SICD.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/Schedule/MSW/SICD.hpp rename to opm/input/eclipse/EclipseState/Schedule/MSW/SICD.hpp index 22bab9f11..6ccd6812a 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/MSW/SICD.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/MSW/SICD.hpp @@ -27,7 +27,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.hpp b/opm/input/eclipse/EclipseState/Schedule/MSW/Segment.hpp similarity index 97% rename from opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.hpp rename to opm/input/eclipse/EclipseState/Schedule/MSW/Segment.hpp index ceed817d3..de738e9e2 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/MSW/Segment.hpp @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp b/opm/input/eclipse/EclipseState/Schedule/MSW/Valve.hpp similarity index 97% rename from opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp rename to opm/input/eclipse/EclipseState/Schedule/MSW/Valve.hpp index 5ae185220..601fe3537 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/MSW/Valve.hpp @@ -25,7 +25,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp b/opm/input/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp rename to opm/input/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp index 7ad55ac99..061811bf5 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include namespace Opm { class SICD; diff --git a/opm/parser/eclipse/EclipseState/Schedule/MSW/icd.hpp b/opm/input/eclipse/EclipseState/Schedule/MSW/icd.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/MSW/icd.hpp rename to opm/input/eclipse/EclipseState/Schedule/MSW/icd.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp b/opm/input/eclipse/EclipseState/Schedule/MessageLimits.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp rename to opm/input/eclipse/EclipseState/Schedule/MessageLimits.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Network/Balance.hpp b/opm/input/eclipse/EclipseState/Schedule/Network/Balance.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Network/Balance.hpp rename to opm/input/eclipse/EclipseState/Schedule/Network/Balance.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Network/Branch.hpp b/opm/input/eclipse/EclipseState/Schedule/Network/Branch.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Network/Branch.hpp rename to opm/input/eclipse/EclipseState/Schedule/Network/Branch.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp b/opm/input/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp similarity index 93% rename from opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp rename to opm/input/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp index 506506d6b..8adcdadb9 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include namespace Opm { namespace Network { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Network/Node.hpp b/opm/input/eclipse/EclipseState/Schedule/Network/Node.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Network/Node.hpp rename to opm/input/eclipse/EclipseState/Schedule/Network/Node.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp b/opm/input/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp rename to opm/input/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/RFTConfig.hpp b/opm/input/eclipse/EclipseState/Schedule/RFTConfig.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/RFTConfig.hpp rename to opm/input/eclipse/EclipseState/Schedule/RFTConfig.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/RPTConfig.hpp b/opm/input/eclipse/EclipseState/Schedule/RPTConfig.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/RPTConfig.hpp rename to opm/input/eclipse/EclipseState/Schedule/RPTConfig.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/RSTConfig.hpp b/opm/input/eclipse/EclipseState/Schedule/RSTConfig.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/RSTConfig.hpp rename to opm/input/eclipse/EclipseState/Schedule/RSTConfig.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp b/opm/input/eclipse/EclipseState/Schedule/Schedule.hpp similarity index 95% rename from opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp rename to opm/input/eclipse/EclipseState/Schedule/Schedule.hpp index f562586e6..71b7a682b 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Schedule.hpp @@ -32,32 +32,32 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include +#include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/ScheduleDeck.hpp b/opm/input/eclipse/EclipseState/Schedule/ScheduleDeck.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/Schedule/ScheduleDeck.hpp rename to opm/input/eclipse/EclipseState/Schedule/ScheduleDeck.hpp index 4dd610adb..f0322bc36 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/ScheduleDeck.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/ScheduleDeck.hpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/ScheduleGrid.hpp b/opm/input/eclipse/EclipseState/Schedule/ScheduleGrid.hpp similarity index 94% rename from opm/parser/eclipse/EclipseState/Schedule/ScheduleGrid.hpp rename to opm/input/eclipse/EclipseState/Schedule/ScheduleGrid.hpp index 9df635fdc..66b2511f0 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/ScheduleGrid.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/ScheduleGrid.hpp @@ -19,7 +19,7 @@ #ifndef SCHEDULE_GRID #define SCHEDULE_GRID -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/ScheduleState.hpp b/opm/input/eclipse/EclipseState/Schedule/ScheduleState.hpp similarity index 92% rename from opm/parser/eclipse/EclipseState/Schedule/ScheduleState.hpp rename to opm/input/eclipse/EclipseState/Schedule/ScheduleState.hpp index f8b4e9dc8..0999a5518 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/ScheduleState.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/ScheduleState.hpp @@ -26,32 +26,32 @@ #include #include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.hpp b/opm/input/eclipse/EclipseState/Schedule/ScheduleTypes.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.hpp rename to opm/input/eclipse/EclipseState/Schedule/ScheduleTypes.hpp index 468e5f043..069890c57 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/ScheduleTypes.hpp @@ -21,7 +21,7 @@ #define OPM_SCHEDULE_TYPES_HPP #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp b/opm/input/eclipse/EclipseState/Schedule/SummaryState.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp rename to opm/input/eclipse/EclipseState/Schedule/SummaryState.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Tuning.hpp b/opm/input/eclipse/EclipseState/Schedule/Tuning.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Tuning.hpp rename to opm/input/eclipse/EclipseState/Schedule/Tuning.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp similarity index 93% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp index 3fe46079b..8ffb8bd3a 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp @@ -27,9 +27,9 @@ #include #include -#include -#include -#include +#include +#include +#include diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp similarity index 97% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp index 3a3f2e6da..da8217f93 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp @@ -26,9 +26,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp similarity index 96% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp index 9f9967e00..140ef6d74 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp similarity index 90% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp index 1009b4808..406f631f4 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp @@ -25,14 +25,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQContext.hpp similarity index 93% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQContext.hpp index 4d501cca3..d8bf8f4aa 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQContext.hpp @@ -27,8 +27,8 @@ #include -#include -#include +#include +#include namespace Opm { class SummaryState; diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp similarity index 89% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp index 272d15c96..6ddc2b14e 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp @@ -27,12 +27,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQExpression.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQExpression.hpp similarity index 91% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQExpression.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQExpression.hpp index 2d6a15914..ac6814600 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQExpression.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQExpression.hpp @@ -23,8 +23,8 @@ #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp similarity index 96% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp index 12164ac9b..5ffeaaacd 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp similarity index 91% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp index eb80352c2..a7d654c86 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp similarity index 92% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp index 6a22bb63f..7317842ad 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp @@ -23,9 +23,9 @@ #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParams.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParams.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParams.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParams.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQSet.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQSet.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQSet.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQSet.hpp index cae94e980..82239924a 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQSet.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQSet.hpp @@ -26,7 +26,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp index 3b73b7699..3c9b0c287 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQToken.hpp b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQToken.hpp similarity index 95% rename from opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQToken.hpp rename to opm/input/eclipse/EclipseState/Schedule/UDQ/UDQToken.hpp index 70451f208..96ad1c6e3 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQToken.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQToken.hpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp b/opm/input/eclipse/EclipseState/Schedule/VFPInjTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp rename to opm/input/eclipse/EclipseState/Schedule/VFPInjTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp b/opm/input/eclipse/EclipseState/Schedule/VFPProdTable.hpp similarity index 99% rename from opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp rename to opm/input/eclipse/EclipseState/Schedule/VFPProdTable.hpp index 4c952a2b4..7cc1c085f 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/VFPProdTable.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/Connection.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/Connection.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/InjectionControls.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/InjectionControls.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/InjectionControls.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/InjectionControls.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/NameOrder.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/NameOrder.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/NameOrder.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/NameOrder.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/PAvg.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/PAvg.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/PAvg.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/PAvg.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculator.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculator.hpp similarity index 96% rename from opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculator.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculator.hpp index 3b09dcb10..99a663d26 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculator.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculator.hpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp similarity index 90% rename from opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp index 38583ce30..52436ad82 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/ProductionControls.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/ProductionControls.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/ProductionControls.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/ProductionControls.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/WList.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/WList.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/WListManager.hpp similarity index 97% rename from opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/WListManager.hpp index 5cb626a68..0ce43b3c9 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Well/WListManager.hpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/Well.hpp similarity index 95% rename from opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/Well.hpp index 33a4abc16..3d823ce8a 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Well/Well.hpp @@ -32,24 +32,24 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WellBrineProperties.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/WellBrineProperties.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/WellBrineProperties.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/WellBrineProperties.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/WellConnections.hpp similarity index 99% rename from opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/WellConnections.hpp index 6ea10d0b5..393c9ed46 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Well/WellConnections.hpp @@ -21,7 +21,7 @@ #ifndef CONNECTIONSET_HPP_ #define CONNECTIONSET_HPP_ -#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WellFoamProperties.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/WellFoamProperties.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/WellFoamProperties.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/WellFoamProperties.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WellMICPProperties.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/WellMICPProperties.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/WellMICPProperties.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/WellMICPProperties.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WellMatcher.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/WellMatcher.hpp similarity index 90% rename from opm/parser/eclipse/EclipseState/Schedule/Well/WellMatcher.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/WellMatcher.hpp index 28fc89be0..6142ddce2 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well/WellMatcher.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Well/WellMatcher.hpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/WellProductionProperties.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/WellProductionProperties.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/WellTestState.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/WellTestState.hpp index dd0b8e114..4e5930766 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp +++ b/opm/input/eclipse/EclipseState/Schedule/Well/WellTestState.hpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp b/opm/input/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp rename to opm/input/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/WriteRestartFileEvents.hpp b/opm/input/eclipse/EclipseState/Schedule/WriteRestartFileEvents.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/WriteRestartFileEvents.hpp rename to opm/input/eclipse/EclipseState/Schedule/WriteRestartFileEvents.hpp diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.hpp b/opm/input/eclipse/EclipseState/SimulationConfig/BCConfig.hpp similarity index 97% rename from opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.hpp rename to opm/input/eclipse/EclipseState/SimulationConfig/BCConfig.hpp index 8221adb25..ac342ec05 100644 --- a/opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.hpp +++ b/opm/input/eclipse/EclipseState/SimulationConfig/BCConfig.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.hpp b/opm/input/eclipse/EclipseState/SimulationConfig/RockConfig.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.hpp rename to opm/input/eclipse/EclipseState/SimulationConfig/RockConfig.hpp diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp b/opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp similarity index 91% rename from opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp rename to opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp index e2652e897..735eccd06 100644 --- a/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp +++ b/opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp @@ -20,9 +20,9 @@ #ifndef OPM_SIMULATION_CONFIG_HPP #define OPM_SIMULATION_CONFIG_HPP -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp b/opm/input/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp rename to opm/input/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp diff --git a/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp b/opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp rename to opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp b/opm/input/eclipse/EclipseState/Tables/Aqudims.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp rename to opm/input/eclipse/EclipseState/Tables/Aqudims.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/AqutabTable.hpp b/opm/input/eclipse/EclipseState/Tables/AqutabTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/AqutabTable.hpp rename to opm/input/eclipse/EclipseState/Tables/AqutabTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/BrineDensityTable.hpp b/opm/input/eclipse/EclipseState/Tables/BrineDensityTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/BrineDensityTable.hpp rename to opm/input/eclipse/EclipseState/Tables/BrineDensityTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp b/opm/input/eclipse/EclipseState/Tables/ColumnSchema.hpp similarity index 96% rename from opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp rename to opm/input/eclipse/EclipseState/Tables/ColumnSchema.hpp index 67df736b0..ecb03669f 100644 --- a/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp +++ b/opm/input/eclipse/EclipseState/Tables/ColumnSchema.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Tables/DenT.hpp b/opm/input/eclipse/EclipseState/Tables/DenT.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/DenT.hpp rename to opm/input/eclipse/EclipseState/Tables/DenT.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/EnkrvdTable.hpp b/opm/input/eclipse/EclipseState/Tables/EnkrvdTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/EnkrvdTable.hpp rename to opm/input/eclipse/EclipseState/Tables/EnkrvdTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/EnptvdTable.hpp b/opm/input/eclipse/EclipseState/Tables/EnptvdTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/EnptvdTable.hpp rename to opm/input/eclipse/EclipseState/Tables/EnptvdTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/Eqldims.hpp b/opm/input/eclipse/EclipseState/Tables/Eqldims.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/Eqldims.hpp rename to opm/input/eclipse/EclipseState/Tables/Eqldims.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/FlatTable.hpp b/opm/input/eclipse/EclipseState/Tables/FlatTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/FlatTable.hpp rename to opm/input/eclipse/EclipseState/Tables/FlatTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/FoamadsTable.hpp b/opm/input/eclipse/EclipseState/Tables/FoamadsTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/FoamadsTable.hpp rename to opm/input/eclipse/EclipseState/Tables/FoamadsTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/FoammobTable.hpp b/opm/input/eclipse/EclipseState/Tables/FoammobTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/FoammobTable.hpp rename to opm/input/eclipse/EclipseState/Tables/FoammobTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/GasvisctTable.hpp b/opm/input/eclipse/EclipseState/Tables/GasvisctTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/GasvisctTable.hpp rename to opm/input/eclipse/EclipseState/Tables/GasvisctTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/ImkrvdTable.hpp b/opm/input/eclipse/EclipseState/Tables/ImkrvdTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/ImkrvdTable.hpp rename to opm/input/eclipse/EclipseState/Tables/ImkrvdTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/ImptvdTable.hpp b/opm/input/eclipse/EclipseState/Tables/ImptvdTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/ImptvdTable.hpp rename to opm/input/eclipse/EclipseState/Tables/ImptvdTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/JFunc.hpp b/opm/input/eclipse/EclipseState/Tables/JFunc.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/JFunc.hpp rename to opm/input/eclipse/EclipseState/Tables/JFunc.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/MiscTable.hpp b/opm/input/eclipse/EclipseState/Tables/MiscTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/MiscTable.hpp rename to opm/input/eclipse/EclipseState/Tables/MiscTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/MsfnTable.hpp b/opm/input/eclipse/EclipseState/Tables/MsfnTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/MsfnTable.hpp rename to opm/input/eclipse/EclipseState/Tables/MsfnTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/OilvisctTable.hpp b/opm/input/eclipse/EclipseState/Tables/OilvisctTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/OilvisctTable.hpp rename to opm/input/eclipse/EclipseState/Tables/OilvisctTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/OverburdTable.hpp b/opm/input/eclipse/EclipseState/Tables/OverburdTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/OverburdTable.hpp rename to opm/input/eclipse/EclipseState/Tables/OverburdTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PbvdTable.hpp b/opm/input/eclipse/EclipseState/Tables/PbvdTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PbvdTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PbvdTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PdvdTable.hpp b/opm/input/eclipse/EclipseState/Tables/PdvdTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PdvdTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PdvdTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PermfactTable.hpp b/opm/input/eclipse/EclipseState/Tables/PermfactTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PermfactTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PermfactTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PlyadsTable.hpp b/opm/input/eclipse/EclipseState/Tables/PlyadsTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PlyadsTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PlyadsTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PlydhflfTable.hpp b/opm/input/eclipse/EclipseState/Tables/PlydhflfTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PlydhflfTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PlydhflfTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PlymaxTable.hpp b/opm/input/eclipse/EclipseState/Tables/PlymaxTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PlymaxTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PlymaxTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PlymwinjTable.hpp b/opm/input/eclipse/EclipseState/Tables/PlymwinjTable.hpp similarity index 94% rename from opm/parser/eclipse/EclipseState/Tables/PlymwinjTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PlymwinjTable.hpp index 9b6167460..fbae717b4 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PlymwinjTable.hpp +++ b/opm/input/eclipse/EclipseState/Tables/PlymwinjTable.hpp @@ -20,7 +20,7 @@ #ifndef OPM_PARSER_PLYMWINJ_TABLE_HPP #define OPM_PARSER_PLYMWINJ_TABLE_HPP -#include +#include namespace Opm { class DeckKeyword; diff --git a/opm/parser/eclipse/EclipseState/Tables/PlyrockTable.hpp b/opm/input/eclipse/EclipseState/Tables/PlyrockTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PlyrockTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PlyrockTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PlyshlogTable.hpp b/opm/input/eclipse/EclipseState/Tables/PlyshlogTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PlyshlogTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PlyshlogTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PlyviscTable.hpp b/opm/input/eclipse/EclipseState/Tables/PlyviscTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PlyviscTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PlyviscTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PmiscTable.hpp b/opm/input/eclipse/EclipseState/Tables/PmiscTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PmiscTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PmiscTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PolyInjTable.hpp b/opm/input/eclipse/EclipseState/Tables/PolyInjTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PolyInjTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PolyInjTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PvdgTable.hpp b/opm/input/eclipse/EclipseState/Tables/PvdgTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PvdgTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PvdgTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PvdoTable.hpp b/opm/input/eclipse/EclipseState/Tables/PvdoTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PvdoTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PvdoTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp b/opm/input/eclipse/EclipseState/Tables/PvdsTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PvdsTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PvtgTable.hpp b/opm/input/eclipse/EclipseState/Tables/PvtgTable.hpp similarity index 94% rename from opm/parser/eclipse/EclipseState/Tables/PvtgTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PvtgTable.hpp index 676c47aff..f6e7147af 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PvtgTable.hpp +++ b/opm/input/eclipse/EclipseState/Tables/PvtgTable.hpp @@ -19,7 +19,7 @@ #ifndef OPM_PARSER_PVTG_TABLE_HPP #define OPM_PARSER_PVTG_TABLE_HPP -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Tables/PvtgwTable.hpp b/opm/input/eclipse/EclipseState/Tables/PvtgwTable.hpp similarity index 94% rename from opm/parser/eclipse/EclipseState/Tables/PvtgwTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PvtgwTable.hpp index c4da8a7d9..43e421da2 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PvtgwTable.hpp +++ b/opm/input/eclipse/EclipseState/Tables/PvtgwTable.hpp @@ -20,7 +20,7 @@ #ifndef OPM_PARSER_PVTGW_TABLE_HPP #define OPM_PARSER_PVTGW_TABLE_HPP -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Tables/PvtgwoTable.hpp b/opm/input/eclipse/EclipseState/Tables/PvtgwoTable.hpp similarity index 94% rename from opm/parser/eclipse/EclipseState/Tables/PvtgwoTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PvtgwoTable.hpp index 50ae4373d..5aceec7f4 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PvtgwoTable.hpp +++ b/opm/input/eclipse/EclipseState/Tables/PvtgwoTable.hpp @@ -20,7 +20,7 @@ #ifndef OPM_PARSER_PVTGWO_TABLE_HPP #define OPM_PARSER_PVTGWO_TABLE_HPP -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp b/opm/input/eclipse/EclipseState/Tables/PvtoTable.hpp similarity index 95% rename from opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PvtoTable.hpp index d7c8a00d4..a5c5e3e7e 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp +++ b/opm/input/eclipse/EclipseState/Tables/PvtoTable.hpp @@ -19,7 +19,7 @@ #ifndef OPM_PARSER_PVTO_TABLE_HPP #define OPM_PARSER_PVTO_TABLE_HPP -#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Tables/PvtsolTable.hpp b/opm/input/eclipse/EclipseState/Tables/PvtsolTable.hpp similarity index 94% rename from opm/parser/eclipse/EclipseState/Tables/PvtsolTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PvtsolTable.hpp index 5d7b0d4aa..80506b274 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PvtsolTable.hpp +++ b/opm/input/eclipse/EclipseState/Tables/PvtsolTable.hpp @@ -19,7 +19,7 @@ #ifndef OPM_PARSER_PVTSOL_TABLE_HPP #define OPM_PARSER_PVTSOL_TABLE_HPP -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Tables/PvtwsaltTable.hpp b/opm/input/eclipse/EclipseState/Tables/PvtwsaltTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/PvtwsaltTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PvtwsaltTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/PvtxTable.hpp b/opm/input/eclipse/EclipseState/Tables/PvtxTable.hpp similarity index 95% rename from opm/parser/eclipse/EclipseState/Tables/PvtxTable.hpp rename to opm/input/eclipse/EclipseState/Tables/PvtxTable.hpp index b64b2a662..49e44af54 100644 --- a/opm/parser/eclipse/EclipseState/Tables/PvtxTable.hpp +++ b/opm/input/eclipse/EclipseState/Tables/PvtxTable.hpp @@ -19,10 +19,10 @@ #ifndef OPM_PARSER_PVTX_TABLE_HPP #define OPM_PARSER_PVTX_TABLE_HPP -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Tables/Regdims.hpp b/opm/input/eclipse/EclipseState/Tables/Regdims.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/Regdims.hpp rename to opm/input/eclipse/EclipseState/Tables/Regdims.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/Rock2dTable.hpp b/opm/input/eclipse/EclipseState/Tables/Rock2dTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/Rock2dTable.hpp rename to opm/input/eclipse/EclipseState/Tables/Rock2dTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.hpp b/opm/input/eclipse/EclipseState/Tables/Rock2dtrTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.hpp rename to opm/input/eclipse/EclipseState/Tables/Rock2dtrTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/RocktabTable.hpp b/opm/input/eclipse/EclipseState/Tables/RocktabTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/RocktabTable.hpp rename to opm/input/eclipse/EclipseState/Tables/RocktabTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/RockwnodTable.hpp b/opm/input/eclipse/EclipseState/Tables/RockwnodTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/RockwnodTable.hpp rename to opm/input/eclipse/EclipseState/Tables/RockwnodTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/RsvdTable.hpp b/opm/input/eclipse/EclipseState/Tables/RsvdTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/RsvdTable.hpp rename to opm/input/eclipse/EclipseState/Tables/RsvdTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/RtempvdTable.hpp b/opm/input/eclipse/EclipseState/Tables/RtempvdTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/RtempvdTable.hpp rename to opm/input/eclipse/EclipseState/Tables/RtempvdTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/RvvdTable.hpp b/opm/input/eclipse/EclipseState/Tables/RvvdTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/RvvdTable.hpp rename to opm/input/eclipse/EclipseState/Tables/RvvdTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/RwgsaltTable.hpp b/opm/input/eclipse/EclipseState/Tables/RwgsaltTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/RwgsaltTable.hpp rename to opm/input/eclipse/EclipseState/Tables/RwgsaltTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SaltSolubilityTable.hpp b/opm/input/eclipse/EclipseState/Tables/SaltSolubilityTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SaltSolubilityTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SaltSolubilityTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SaltpvdTable.hpp b/opm/input/eclipse/EclipseState/Tables/SaltpvdTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SaltpvdTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SaltpvdTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SaltvdTable.hpp b/opm/input/eclipse/EclipseState/Tables/SaltvdTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SaltvdTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SaltvdTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SgcwmisTable.hpp b/opm/input/eclipse/EclipseState/Tables/SgcwmisTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SgcwmisTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SgcwmisTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SgfnTable.hpp b/opm/input/eclipse/EclipseState/Tables/SgfnTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SgfnTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SgfnTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SgofTable.hpp b/opm/input/eclipse/EclipseState/Tables/SgofTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SgofTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SgofTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SgwfnTable.hpp b/opm/input/eclipse/EclipseState/Tables/SgwfnTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SgwfnTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SgwfnTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp b/opm/input/eclipse/EclipseState/Tables/SimpleTable.hpp similarity index 93% rename from opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SimpleTable.hpp index 8482110a1..bdb444d87 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp +++ b/opm/input/eclipse/EclipseState/Tables/SimpleTable.hpp @@ -19,9 +19,9 @@ #ifndef OPM_PARSER_SIMPLE_TABLE_HPP #define OPM_PARSER_SIMPLE_TABLE_HPP -#include -#include -#include +#include +#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Tables/SkprpolyTable.hpp b/opm/input/eclipse/EclipseState/Tables/SkprpolyTable.hpp similarity index 95% rename from opm/parser/eclipse/EclipseState/Tables/SkprpolyTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SkprpolyTable.hpp index a66542e12..73a0a63eb 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SkprpolyTable.hpp +++ b/opm/input/eclipse/EclipseState/Tables/SkprpolyTable.hpp @@ -20,7 +20,7 @@ #ifndef OPM_PARSER_SKPRPOLY_TABLE_HPP #define OPM_PARSER_SKPRPOLY_TABLE_HPP -#include +#include namespace Opm { class DeckKeyword; diff --git a/opm/parser/eclipse/EclipseState/Tables/SkprwatTable.hpp b/opm/input/eclipse/EclipseState/Tables/SkprwatTable.hpp similarity index 94% rename from opm/parser/eclipse/EclipseState/Tables/SkprwatTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SkprwatTable.hpp index c19e328b4..efa2f2569 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SkprwatTable.hpp +++ b/opm/input/eclipse/EclipseState/Tables/SkprwatTable.hpp @@ -20,7 +20,7 @@ #ifndef OPM_PARSER_SKPRWAT_TABLE_HPP #define OPM_PARSER_SKPRWAT_TABLE_HPP -#include +#include namespace Opm { class DeckKeyword; diff --git a/opm/parser/eclipse/EclipseState/Tables/SlgofTable.hpp b/opm/input/eclipse/EclipseState/Tables/SlgofTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SlgofTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SlgofTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp b/opm/input/eclipse/EclipseState/Tables/Sof2Table.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp rename to opm/input/eclipse/EclipseState/Tables/Sof2Table.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/Sof3Table.hpp b/opm/input/eclipse/EclipseState/Tables/Sof3Table.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/Sof3Table.hpp rename to opm/input/eclipse/EclipseState/Tables/Sof3Table.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SolventDensityTable.hpp b/opm/input/eclipse/EclipseState/Tables/SolventDensityTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SolventDensityTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SolventDensityTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SorwmisTable.hpp b/opm/input/eclipse/EclipseState/Tables/SorwmisTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SorwmisTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SorwmisTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SpecheatTable.hpp b/opm/input/eclipse/EclipseState/Tables/SpecheatTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SpecheatTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SpecheatTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SpecrockTable.hpp b/opm/input/eclipse/EclipseState/Tables/SpecrockTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SpecrockTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SpecrockTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SsfnTable.hpp b/opm/input/eclipse/EclipseState/Tables/SsfnTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SsfnTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SsfnTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/StandardCond.hpp b/opm/input/eclipse/EclipseState/Tables/StandardCond.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/StandardCond.hpp rename to opm/input/eclipse/EclipseState/Tables/StandardCond.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SwfnTable.hpp b/opm/input/eclipse/EclipseState/Tables/SwfnTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SwfnTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SwfnTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/SwofTable.hpp b/opm/input/eclipse/EclipseState/Tables/SwofTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/SwofTable.hpp rename to opm/input/eclipse/EclipseState/Tables/SwofTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/TLMixpar.hpp b/opm/input/eclipse/EclipseState/Tables/TLMixpar.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/TLMixpar.hpp rename to opm/input/eclipse/EclipseState/Tables/TLMixpar.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/Tabdims.hpp b/opm/input/eclipse/EclipseState/Tables/Tabdims.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/Tabdims.hpp rename to opm/input/eclipse/EclipseState/Tables/Tabdims.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp b/opm/input/eclipse/EclipseState/Tables/TableColumn.hpp similarity index 95% rename from opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp rename to opm/input/eclipse/EclipseState/Tables/TableColumn.hpp index a9214e88f..9a8399064 100644 --- a/opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp +++ b/opm/input/eclipse/EclipseState/Tables/TableColumn.hpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp b/opm/input/eclipse/EclipseState/Tables/TableContainer.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp rename to opm/input/eclipse/EclipseState/Tables/TableContainer.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/TableEnums.hpp b/opm/input/eclipse/EclipseState/Tables/TableEnums.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/TableEnums.hpp rename to opm/input/eclipse/EclipseState/Tables/TableEnums.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/TableIndex.hpp b/opm/input/eclipse/EclipseState/Tables/TableIndex.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/TableIndex.hpp rename to opm/input/eclipse/EclipseState/Tables/TableIndex.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp b/opm/input/eclipse/EclipseState/Tables/TableManager.hpp similarity index 88% rename from opm/parser/eclipse/EclipseState/Tables/TableManager.hpp rename to opm/input/eclipse/EclipseState/Tables/TableManager.hpp index 53481961d..54c2ac4d6 100644 --- a/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp +++ b/opm/input/eclipse/EclipseState/Tables/TableManager.hpp @@ -25,37 +25,37 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Tables/TableSchema.hpp b/opm/input/eclipse/EclipseState/Tables/TableSchema.hpp similarity index 91% rename from opm/parser/eclipse/EclipseState/Tables/TableSchema.hpp rename to opm/input/eclipse/EclipseState/Tables/TableSchema.hpp index 1f1726859..a70bd5d7a 100644 --- a/opm/parser/eclipse/EclipseState/Tables/TableSchema.hpp +++ b/opm/input/eclipse/EclipseState/Tables/TableSchema.hpp @@ -23,8 +23,8 @@ #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Tables/TlpmixpaTable.hpp b/opm/input/eclipse/EclipseState/Tables/TlpmixpaTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/TlpmixpaTable.hpp rename to opm/input/eclipse/EclipseState/Tables/TlpmixpaTable.hpp diff --git a/opm/parser/eclipse/EclipseState/Tables/TracerVdTable.hpp b/opm/input/eclipse/EclipseState/Tables/TracerVdTable.hpp similarity index 95% rename from opm/parser/eclipse/EclipseState/Tables/TracerVdTable.hpp rename to opm/input/eclipse/EclipseState/Tables/TracerVdTable.hpp index 05282aab0..a75af67a0 100644 --- a/opm/parser/eclipse/EclipseState/Tables/TracerVdTable.hpp +++ b/opm/input/eclipse/EclipseState/Tables/TracerVdTable.hpp @@ -24,7 +24,7 @@ #ifndef TRACER_VD_TABLE_HPP #define TRACER_VD_TABLE_HPP -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp b/opm/input/eclipse/EclipseState/Tables/WatvisctTable.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp rename to opm/input/eclipse/EclipseState/Tables/WatvisctTable.hpp diff --git a/opm/parser/eclipse/EclipseState/TracerConfig.hpp b/opm/input/eclipse/EclipseState/TracerConfig.hpp similarity index 97% rename from opm/parser/eclipse/EclipseState/TracerConfig.hpp rename to opm/input/eclipse/EclipseState/TracerConfig.hpp index 795be2029..689bd24d0 100644 --- a/opm/parser/eclipse/EclipseState/TracerConfig.hpp +++ b/opm/input/eclipse/EclipseState/TracerConfig.hpp @@ -20,8 +20,8 @@ #ifndef OPM_TRACER_CONFIG_HPP #define OPM_TRACER_CONFIG_HPP -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Util/IOrderSet.hpp b/opm/input/eclipse/EclipseState/Util/IOrderSet.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Util/IOrderSet.hpp rename to opm/input/eclipse/EclipseState/Util/IOrderSet.hpp diff --git a/opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp b/opm/input/eclipse/EclipseState/Util/OrderedMap.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp rename to opm/input/eclipse/EclipseState/Util/OrderedMap.hpp diff --git a/opm/parser/eclipse/EclipseState/checkDeck.hpp b/opm/input/eclipse/EclipseState/checkDeck.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/checkDeck.hpp rename to opm/input/eclipse/EclipseState/checkDeck.hpp diff --git a/opm/parser/eclipse/Generator/KeywordGenerator.hpp b/opm/input/eclipse/Generator/KeywordGenerator.hpp similarity index 100% rename from opm/parser/eclipse/Generator/KeywordGenerator.hpp rename to opm/input/eclipse/Generator/KeywordGenerator.hpp diff --git a/opm/parser/eclipse/Generator/KeywordLoader.hpp b/opm/input/eclipse/Generator/KeywordLoader.hpp similarity index 96% rename from opm/parser/eclipse/Generator/KeywordLoader.hpp rename to opm/input/eclipse/Generator/KeywordLoader.hpp index 7df16a430..22f0ecf8d 100644 --- a/opm/parser/eclipse/Generator/KeywordLoader.hpp +++ b/opm/input/eclipse/Generator/KeywordLoader.hpp @@ -25,7 +25,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/Parser/ErrorGuard.hpp b/opm/input/eclipse/Parser/ErrorGuard.hpp similarity index 100% rename from opm/parser/eclipse/Parser/ErrorGuard.hpp rename to opm/input/eclipse/Parser/ErrorGuard.hpp diff --git a/opm/parser/eclipse/Parser/InputErrorAction.hpp b/opm/input/eclipse/Parser/InputErrorAction.hpp similarity index 100% rename from opm/parser/eclipse/Parser/InputErrorAction.hpp rename to opm/input/eclipse/Parser/InputErrorAction.hpp diff --git a/opm/parser/eclipse/Parser/ParseContext.hpp b/opm/input/eclipse/Parser/ParseContext.hpp similarity index 99% rename from opm/parser/eclipse/Parser/ParseContext.hpp rename to opm/input/eclipse/Parser/ParseContext.hpp index 8f974c578..dcdb074fe 100644 --- a/opm/parser/eclipse/Parser/ParseContext.hpp +++ b/opm/input/eclipse/Parser/ParseContext.hpp @@ -29,7 +29,7 @@ #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/Parser/Parser.hpp b/opm/input/eclipse/Parser/Parser.hpp similarity index 98% rename from opm/parser/eclipse/Parser/Parser.hpp rename to opm/input/eclipse/Parser/Parser.hpp index 7de103bc9..0c162b373 100644 --- a/opm/parser/eclipse/Parser/Parser.hpp +++ b/opm/input/eclipse/Parser/Parser.hpp @@ -31,8 +31,8 @@ #include -#include -#include +#include +#include namespace Json { class JsonObject; diff --git a/opm/parser/eclipse/Parser/ParserConst.hpp b/opm/input/eclipse/Parser/ParserConst.hpp similarity index 100% rename from opm/parser/eclipse/Parser/ParserConst.hpp rename to opm/input/eclipse/Parser/ParserConst.hpp diff --git a/opm/parser/eclipse/Parser/ParserEnums.hpp b/opm/input/eclipse/Parser/ParserEnums.hpp similarity index 100% rename from opm/parser/eclipse/Parser/ParserEnums.hpp rename to opm/input/eclipse/Parser/ParserEnums.hpp diff --git a/opm/parser/eclipse/Parser/ParserItem.hpp b/opm/input/eclipse/Parser/ParserItem.hpp similarity index 96% rename from opm/parser/eclipse/Parser/ParserItem.hpp rename to opm/input/eclipse/Parser/ParserItem.hpp index 5978accec..8147c797d 100644 --- a/opm/parser/eclipse/Parser/ParserItem.hpp +++ b/opm/input/eclipse/Parser/ParserItem.hpp @@ -23,9 +23,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace Json { class JsonObject; diff --git a/opm/parser/eclipse/Parser/ParserKeyword.hpp b/opm/input/eclipse/Parser/ParserKeyword.hpp similarity index 98% rename from opm/parser/eclipse/Parser/ParserKeyword.hpp rename to opm/input/eclipse/Parser/ParserKeyword.hpp index ae0dec686..c1d6f2aa7 100644 --- a/opm/parser/eclipse/Parser/ParserKeyword.hpp +++ b/opm/input/eclipse/Parser/ParserKeyword.hpp @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include namespace Json { class JsonObject; diff --git a/opm/parser/eclipse/Parser/ParserRecord.hpp b/opm/input/eclipse/Parser/ParserRecord.hpp similarity index 97% rename from opm/parser/eclipse/Parser/ParserRecord.hpp rename to opm/input/eclipse/Parser/ParserRecord.hpp index 201e5c1ed..546e01d77 100644 --- a/opm/parser/eclipse/Parser/ParserRecord.hpp +++ b/opm/input/eclipse/Parser/ParserRecord.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/Python/Python.hpp b/opm/input/eclipse/Python/Python.hpp similarity index 100% rename from opm/parser/eclipse/Python/Python.hpp rename to opm/input/eclipse/Python/Python.hpp diff --git a/opm/parser/eclipse/Units/Dimension.hpp b/opm/input/eclipse/Units/Dimension.hpp similarity index 100% rename from opm/parser/eclipse/Units/Dimension.hpp rename to opm/input/eclipse/Units/Dimension.hpp diff --git a/opm/parser/eclipse/Units/UnitSystem.hpp b/opm/input/eclipse/Units/UnitSystem.hpp similarity index 97% rename from opm/parser/eclipse/Units/UnitSystem.hpp rename to opm/input/eclipse/Units/UnitSystem.hpp index 1f8fb83cd..80a22c997 100644 --- a/opm/parser/eclipse/Units/UnitSystem.hpp +++ b/opm/input/eclipse/Units/UnitSystem.hpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/parser/eclipse/Units/Units.hpp b/opm/input/eclipse/Units/Units.hpp similarity index 100% rename from opm/parser/eclipse/Units/Units.hpp rename to opm/input/eclipse/Units/Units.hpp diff --git a/opm/parser/eclipse/Utility/Functional.hpp b/opm/input/eclipse/Utility/Functional.hpp similarity index 100% rename from opm/parser/eclipse/Utility/Functional.hpp rename to opm/input/eclipse/Utility/Functional.hpp diff --git a/opm/parser/eclipse/Utility/Typetools.hpp b/opm/input/eclipse/Utility/Typetools.hpp similarity index 97% rename from opm/parser/eclipse/Utility/Typetools.hpp rename to opm/input/eclipse/Utility/Typetools.hpp index 6c1d54e33..badd66553 100644 --- a/opm/parser/eclipse/Utility/Typetools.hpp +++ b/opm/input/eclipse/Utility/Typetools.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/io/eclipse/ExtSmryOutput.hpp b/opm/io/eclipse/ExtSmryOutput.hpp index f9646ce26..31afeb800 100644 --- a/opm/io/eclipse/ExtSmryOutput.hpp +++ b/opm/io/eclipse/ExtSmryOutput.hpp @@ -21,7 +21,7 @@ #include -#include +#include namespace Opm { diff --git a/opm/io/eclipse/rst/action.hpp b/opm/io/eclipse/rst/action.hpp index a8ebc8d32..93039a241 100644 --- a/opm/io/eclipse/rst/action.hpp +++ b/opm/io/eclipse/rst/action.hpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/io/eclipse/rst/aquifer.hpp b/opm/io/eclipse/rst/aquifer.hpp index 13be5b83d..229e8dfb2 100644 --- a/opm/io/eclipse/rst/aquifer.hpp +++ b/opm/io/eclipse/rst/aquifer.hpp @@ -20,7 +20,7 @@ #ifndef OPM_RESTART_AQUIFER_HPP #define OPM_RESTART_AQUIFER_HPP -#include +#include #include #include diff --git a/opm/io/eclipse/rst/connection.hpp b/opm/io/eclipse/rst/connection.hpp index b0d865d57..d049d5707 100644 --- a/opm/io/eclipse/rst/connection.hpp +++ b/opm/io/eclipse/rst/connection.hpp @@ -21,7 +21,7 @@ #include -#include +#include namespace Opm { class UnitSystem; diff --git a/opm/io/eclipse/rst/header.hpp b/opm/io/eclipse/rst/header.hpp index 7d7a7a372..d7ec86ea1 100644 --- a/opm/io/eclipse/rst/header.hpp +++ b/opm/io/eclipse/rst/header.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include namespace Opm { class UnitSystem; diff --git a/opm/io/eclipse/rst/segment.hpp b/opm/io/eclipse/rst/segment.hpp index 27e68c515..7f531a7b4 100644 --- a/opm/io/eclipse/rst/segment.hpp +++ b/opm/io/eclipse/rst/segment.hpp @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include namespace Opm { class UnitSystem; diff --git a/opm/io/eclipse/rst/state.hpp b/opm/io/eclipse/rst/state.hpp index 6786fe1d0..a3478a572 100644 --- a/opm/io/eclipse/rst/state.hpp +++ b/opm/io/eclipse/rst/state.hpp @@ -32,10 +32,10 @@ #include #include -#include -#include +#include +#include -#include +#include namespace Opm { class EclipseGrid; diff --git a/opm/io/eclipse/rst/udq.hpp b/opm/io/eclipse/rst/udq.hpp index 65d5ea34e..f57685de9 100644 --- a/opm/io/eclipse/rst/udq.hpp +++ b/opm/io/eclipse/rst/udq.hpp @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/io/eclipse/rst/well.hpp b/opm/io/eclipse/rst/well.hpp index 1314c5531..0a5a6c21b 100644 --- a/opm/io/eclipse/rst/well.hpp +++ b/opm/io/eclipse/rst/well.hpp @@ -27,7 +27,7 @@ #include #include -#include +#include namespace Opm { class UnitSystem; diff --git a/opm/output/OutputWriter.hpp b/opm/output/OutputWriter.hpp index 680a1f53b..abf33716a 100644 --- a/opm/output/OutputWriter.hpp +++ b/opm/output/OutputWriter.hpp @@ -20,7 +20,7 @@ #ifndef OPM_OUTPUT_WRITER_HPP #define OPM_OUTPUT_WRITER_HPP -#include +#include #include #include diff --git a/opm/output/data/Cells.hpp b/opm/output/data/Cells.hpp index 4d7e93511..113a085ae 100644 --- a/opm/output/data/Cells.hpp +++ b/opm/output/data/Cells.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/output/data/Groups.hpp b/opm/output/data/Groups.hpp index f46f326b9..9e065a09b 100644 --- a/opm/output/data/Groups.hpp +++ b/opm/output/data/Groups.hpp @@ -29,7 +29,7 @@ #include #include -#include +#include namespace Opm { namespace data { diff --git a/opm/output/data/Solution.hpp b/opm/output/data/Solution.hpp index f635f6987..f42b4d2b3 100644 --- a/opm/output/data/Solution.hpp +++ b/opm/output/data/Solution.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include namespace Opm { namespace data { diff --git a/opm/output/data/Wells.hpp b/opm/output/data/Wells.hpp index 29084098c..66b57af9d 100644 --- a/opm/output/data/Wells.hpp +++ b/opm/output/data/Wells.hpp @@ -32,7 +32,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/output/eclipse/AggregateActionxData.hpp b/opm/output/eclipse/AggregateActionxData.hpp index 905ea20e0..50377b5ba 100644 --- a/opm/output/eclipse/AggregateActionxData.hpp +++ b/opm/output/eclipse/AggregateActionxData.hpp @@ -23,14 +23,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/opm/output/eclipse/AggregateGroupData.hpp b/opm/output/eclipse/AggregateGroupData.hpp index 952a1fb48..0e2b20627 100644 --- a/opm/output/eclipse/AggregateGroupData.hpp +++ b/opm/output/eclipse/AggregateGroupData.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/opm/output/eclipse/AggregateNetworkData.hpp b/opm/output/eclipse/AggregateNetworkData.hpp index 91e594ec7..1e4334f06 100644 --- a/opm/output/eclipse/AggregateNetworkData.hpp +++ b/opm/output/eclipse/AggregateNetworkData.hpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/opm/output/eclipse/AggregateWellData.hpp b/opm/output/eclipse/AggregateWellData.hpp index 0025e75ca..dd58d17e6 100644 --- a/opm/output/eclipse/AggregateWellData.hpp +++ b/opm/output/eclipse/AggregateWellData.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/opm/output/eclipse/EclipseGridInspector.hpp b/opm/output/eclipse/EclipseGridInspector.hpp index 2e46f460b..aacdcb651 100644 --- a/opm/output/eclipse/EclipseGridInspector.hpp +++ b/opm/output/eclipse/EclipseGridInspector.hpp @@ -38,7 +38,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/output/eclipse/EclipseIO.hpp b/opm/output/eclipse/EclipseIO.hpp index 5e9c1deee..7767d07be 100644 --- a/opm/output/eclipse/EclipseIO.hpp +++ b/opm/output/eclipse/EclipseIO.hpp @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/opm/output/eclipse/RestartValue.hpp b/opm/output/eclipse/RestartValue.hpp index ea40cc816..36f351961 100644 --- a/opm/output/eclipse/RestartValue.hpp +++ b/opm/output/eclipse/RestartValue.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/opm/output/eclipse/Summary.hpp b/opm/output/eclipse/Summary.hpp index 0c273b3b4..a06b80674 100644 --- a/opm/output/eclipse/Summary.hpp +++ b/opm/output/eclipse/Summary.hpp @@ -20,8 +20,8 @@ #ifndef OPM_OUTPUT_SUMMARY_HPP #define OPM_OUTPUT_SUMMARY_HPP -#include -#include +#include +#include #include #include diff --git a/opm/output/eclipse/Tables.hpp b/opm/output/eclipse/Tables.hpp index f6bae029f..ee4fde576 100644 --- a/opm/output/eclipse/Tables.hpp +++ b/opm/output/eclipse/Tables.hpp @@ -24,7 +24,7 @@ #include -#include +#include namespace Opm { class UnitSystem; diff --git a/opm/output/eclipse/WriteInit.hpp b/opm/output/eclipse/WriteInit.hpp index 6f6c5f0b8..d29ba6329 100644 --- a/opm/output/eclipse/WriteInit.hpp +++ b/opm/output/eclipse/WriteInit.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/utility/EModel.hpp b/opm/utility/EModel.hpp index 3982435a3..222cc7ac2 100644 --- a/opm/utility/EModel.hpp +++ b/opm/utility/EModel.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/python/cxx/connection.cpp b/python/cxx/connection.cpp index 90a5e266b..ed1a4ed23 100644 --- a/python/cxx/connection.cpp +++ b/python/cxx/connection.cpp @@ -1,4 +1,4 @@ -#include +#include #include "export.hpp" diff --git a/python/cxx/deck.cpp b/python/cxx/deck.cpp index a8fa36615..e1a0a9c4c 100644 --- a/python/cxx/deck.cpp +++ b/python/cxx/deck.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include "converters.hpp" diff --git a/python/cxx/deck_keyword.cpp b/python/cxx/deck_keyword.cpp index 3856972a9..6f9481f85 100644 --- a/python/cxx/deck_keyword.cpp +++ b/python/cxx/deck_keyword.cpp @@ -1,15 +1,15 @@ #include -#include +#include -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "export.hpp" #include "converters.hpp" diff --git a/python/cxx/eclipse_config.cpp b/python/cxx/eclipse_config.cpp index 43f561394..c9f2287d4 100644 --- a/python/cxx/eclipse_config.cpp +++ b/python/cxx/eclipse_config.cpp @@ -1,12 +1,12 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "export.hpp" diff --git a/python/cxx/eclipse_grid.cpp b/python/cxx/eclipse_grid.cpp index fb29a261b..f4aa15634 100644 --- a/python/cxx/eclipse_grid.cpp +++ b/python/cxx/eclipse_grid.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include "converters.hpp" diff --git a/python/cxx/eclipse_state.cpp b/python/cxx/eclipse_state.cpp index 4768743b4..fc045170d 100644 --- a/python/cxx/eclipse_state.cpp +++ b/python/cxx/eclipse_state.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include #include "export.hpp" diff --git a/python/cxx/field_props.cpp b/python/cxx/field_props.cpp index 8fd011669..29e57c171 100644 --- a/python/cxx/field_props.cpp +++ b/python/cxx/field_props.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include diff --git a/python/cxx/group.cpp b/python/cxx/group.cpp index 809dfd4c4..106655ed5 100644 --- a/python/cxx/group.cpp +++ b/python/cxx/group.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "export.hpp" diff --git a/python/cxx/parsecontext.cpp b/python/cxx/parsecontext.cpp index 04ed22f59..00a458b23 100644 --- a/python/cxx/parsecontext.cpp +++ b/python/cxx/parsecontext.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include "export.hpp" diff --git a/python/cxx/parser.cpp b/python/cxx/parser.cpp index 7f2073011..8056ac8ff 100644 --- a/python/cxx/parser.cpp +++ b/python/cxx/parser.cpp @@ -2,13 +2,13 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include "export.hpp" diff --git a/python/cxx/schedule.cpp b/python/cxx/schedule.cpp index 8c23f7029..4950fd15a 100644 --- a/python/cxx/schedule.cpp +++ b/python/cxx/schedule.cpp @@ -1,13 +1,13 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include -#include +#include #include #include diff --git a/python/cxx/summary_state.cpp b/python/cxx/summary_state.cpp index 1ace42322..e4f6522e6 100644 --- a/python/cxx/summary_state.cpp +++ b/python/cxx/summary_state.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include diff --git a/python/cxx/table_manager.cpp b/python/cxx/table_manager.cpp index 9a2be9813..f3265245f 100644 --- a/python/cxx/table_manager.cpp +++ b/python/cxx/table_manager.cpp @@ -1,4 +1,4 @@ -#include +#include #include "export.hpp" diff --git a/python/cxx/unit_system.cpp b/python/cxx/unit_system.cpp index 640fd7c0e..b3b32b5fa 100644 --- a/python/cxx/unit_system.cpp +++ b/python/cxx/unit_system.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include "export.hpp" diff --git a/python/cxx/well.cpp b/python/cxx/well.cpp index 1332aa65e..3b739d2c4 100644 --- a/python/cxx/well.cpp +++ b/python/cxx/well.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include #include "export.hpp" diff --git a/src/opm/parser/eclipse/Deck/Deck.cpp b/src/opm/input/eclipse/Deck/Deck.cpp similarity index 96% rename from src/opm/parser/eclipse/Deck/Deck.cpp rename to src/opm/input/eclipse/Deck/Deck.cpp index 881bce6a1..a96bdacd3 100644 --- a/src/opm/parser/eclipse/Deck/Deck.cpp +++ b/src/opm/input/eclipse/Deck/Deck.cpp @@ -20,11 +20,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace fs = std::filesystem; diff --git a/src/opm/parser/eclipse/Deck/DeckItem.cpp b/src/opm/input/eclipse/Deck/DeckItem.cpp similarity index 99% rename from src/opm/parser/eclipse/Deck/DeckItem.cpp rename to src/opm/input/eclipse/Deck/DeckItem.cpp index a109b67ac..694da8444 100644 --- a/src/opm/parser/eclipse/Deck/DeckItem.cpp +++ b/src/opm/input/eclipse/Deck/DeckItem.cpp @@ -17,9 +17,9 @@ along with OPM. If not, see . */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/opm/parser/eclipse/Deck/DeckKeyword.cpp b/src/opm/input/eclipse/Deck/DeckKeyword.cpp similarity index 97% rename from src/opm/parser/eclipse/Deck/DeckKeyword.cpp rename to src/opm/input/eclipse/Deck/DeckKeyword.cpp index 9166a8d76..3aa6e285d 100644 --- a/src/opm/parser/eclipse/Deck/DeckKeyword.cpp +++ b/src/opm/input/eclipse/Deck/DeckKeyword.cpp @@ -18,15 +18,15 @@ */ #include -#include +#include -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/Deck/DeckOutput.cpp b/src/opm/input/eclipse/Deck/DeckOutput.cpp similarity index 96% rename from src/opm/parser/eclipse/Deck/DeckOutput.cpp rename to src/opm/input/eclipse/Deck/DeckOutput.cpp index 763067c52..f0e23b534 100644 --- a/src/opm/parser/eclipse/Deck/DeckOutput.cpp +++ b/src/opm/input/eclipse/Deck/DeckOutput.cpp @@ -19,9 +19,9 @@ #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/Deck/DeckRecord.cpp b/src/opm/input/eclipse/Deck/DeckRecord.cpp similarity index 97% rename from src/opm/parser/eclipse/Deck/DeckRecord.cpp rename to src/opm/input/eclipse/Deck/DeckRecord.cpp index d9ddbc12a..31e260839 100644 --- a/src/opm/parser/eclipse/Deck/DeckRecord.cpp +++ b/src/opm/input/eclipse/Deck/DeckRecord.cpp @@ -23,9 +23,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/Deck/DeckSection.cpp b/src/opm/input/eclipse/Deck/DeckSection.cpp similarity index 88% rename from src/opm/parser/eclipse/Deck/DeckSection.cpp rename to src/opm/input/eclipse/Deck/DeckSection.cpp index 531fd9e55..f60a1f380 100644 --- a/src/opm/parser/eclipse/Deck/DeckSection.cpp +++ b/src/opm/input/eclipse/Deck/DeckSection.cpp @@ -26,14 +26,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/Deck/DeckTree.cpp b/src/opm/input/eclipse/Deck/DeckTree.cpp similarity index 98% rename from src/opm/parser/eclipse/Deck/DeckTree.cpp rename to src/opm/input/eclipse/Deck/DeckTree.cpp index f0a29db5d..5a82f1422 100644 --- a/src/opm/parser/eclipse/Deck/DeckTree.cpp +++ b/src/opm/input/eclipse/Deck/DeckTree.cpp @@ -16,7 +16,7 @@ along with OPM. If not, see . */ -#include +#include #include diff --git a/src/opm/parser/eclipse/Deck/DeckValue.cpp b/src/opm/input/eclipse/Deck/DeckValue.cpp similarity index 98% rename from src/opm/parser/eclipse/Deck/DeckValue.cpp rename to src/opm/input/eclipse/Deck/DeckValue.cpp index 26e50dd40..4242a97d2 100644 --- a/src/opm/parser/eclipse/Deck/DeckValue.cpp +++ b/src/opm/input/eclipse/Deck/DeckValue.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/Deck/DeckView.cpp b/src/opm/input/eclipse/Deck/DeckView.cpp similarity index 98% rename from src/opm/parser/eclipse/Deck/DeckView.cpp rename to src/opm/input/eclipse/Deck/DeckView.cpp index 8055206d3..c3e2b3c18 100644 --- a/src/opm/parser/eclipse/Deck/DeckView.cpp +++ b/src/opm/input/eclipse/Deck/DeckView.cpp @@ -18,7 +18,7 @@ #include -#include +#include void Opm::DeckView::add_keyword(const Opm::DeckKeyword& kw) { diff --git a/src/opm/parser/eclipse/Deck/FileDeck.cpp b/src/opm/input/eclipse/Deck/FileDeck.cpp similarity index 97% rename from src/opm/parser/eclipse/Deck/FileDeck.cpp rename to src/opm/input/eclipse/Deck/FileDeck.cpp index 41cd03279..61d2dc489 100644 --- a/src/opm/parser/eclipse/Deck/FileDeck.cpp +++ b/src/opm/input/eclipse/Deck/FileDeck.cpp @@ -18,14 +18,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace fs = std::filesystem; diff --git a/src/opm/parser/eclipse/Deck/ImportContainer.cpp b/src/opm/input/eclipse/Deck/ImportContainer.cpp similarity index 96% rename from src/opm/parser/eclipse/Deck/ImportContainer.cpp rename to src/opm/input/eclipse/Deck/ImportContainer.cpp index 4cc4d8929..4c67bff97 100644 --- a/src/opm/parser/eclipse/Deck/ImportContainer.cpp +++ b/src/opm/input/eclipse/Deck/ImportContainer.cpp @@ -16,7 +16,7 @@ along with OPM. If not, see . */ -#include +#include #include #include @@ -26,7 +26,7 @@ #include #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/Deck/UDAValue.cpp b/src/opm/input/eclipse/Deck/UDAValue.cpp similarity index 98% rename from src/opm/parser/eclipse/Deck/UDAValue.cpp rename to src/opm/input/eclipse/Deck/UDAValue.cpp index 2e724a05c..897138041 100644 --- a/src/opm/parser/eclipse/Deck/UDAValue.cpp +++ b/src/opm/input/eclipse/Deck/UDAValue.cpp @@ -20,7 +20,7 @@ #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Aquifer/Aquancon.cpp b/src/opm/input/eclipse/EclipseState/Aquifer/Aquancon.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Aquifer/Aquancon.cpp rename to src/opm/input/eclipse/EclipseState/Aquifer/Aquancon.cpp index 6e8537030..f701e699d 100644 --- a/src/opm/parser/eclipse/EclipseState/Aquifer/Aquancon.cpp +++ b/src/opm/input/eclipse/EclipseState/Aquifer/Aquancon.cpp @@ -17,23 +17,23 @@ along with OPM. If not, see . */ -#include +#include #include -#include -#include +#include +#include #include #include #include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Aquifer/AquiferCT.cpp b/src/opm/input/eclipse/EclipseState/Aquifer/AquiferCT.cpp similarity index 94% rename from src/opm/parser/eclipse/EclipseState/Aquifer/AquiferCT.cpp rename to src/opm/input/eclipse/EclipseState/Aquifer/AquiferCT.cpp index ebd2724ea..17b47a7f1 100644 --- a/src/opm/parser/eclipse/EclipseState/Aquifer/AquiferCT.cpp +++ b/src/opm/input/eclipse/EclipseState/Aquifer/AquiferCT.cpp @@ -17,25 +17,25 @@ along with OPM. If not, see . */ -#include +#include #include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Aquifer/AquiferConfig.cpp b/src/opm/input/eclipse/EclipseState/Aquifer/AquiferConfig.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Aquifer/AquiferConfig.cpp rename to src/opm/input/eclipse/EclipseState/Aquifer/AquiferConfig.cpp index c58ea0ce9..544633d18 100644 --- a/src/opm/parser/eclipse/EclipseState/Aquifer/AquiferConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/Aquifer/AquiferConfig.cpp @@ -18,9 +18,9 @@ */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Aquifer/AquiferHelpers.cpp b/src/opm/input/eclipse/EclipseState/Aquifer/AquiferHelpers.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Aquifer/AquiferHelpers.cpp rename to src/opm/input/eclipse/EclipseState/Aquifer/AquiferHelpers.cpp index 8588ef56c..cfce5289b 100644 --- a/src/opm/parser/eclipse/EclipseState/Aquifer/AquiferHelpers.cpp +++ b/src/opm/input/eclipse/EclipseState/Aquifer/AquiferHelpers.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include "AquiferHelpers.hpp" namespace Opm::AquiferHelpers { @@ -56,4 +56,4 @@ namespace Opm::AquiferHelpers { throw std::runtime_error("Unknown FaceDir enum " + std::to_string(faceDir)); } } -} \ No newline at end of file +} diff --git a/src/opm/parser/eclipse/EclipseState/Aquifer/AquiferHelpers.hpp b/src/opm/input/eclipse/EclipseState/Aquifer/AquiferHelpers.hpp similarity index 94% rename from src/opm/parser/eclipse/EclipseState/Aquifer/AquiferHelpers.hpp rename to src/opm/input/eclipse/EclipseState/Aquifer/AquiferHelpers.hpp index ece3cd9b1..f62ab4f26 100644 --- a/src/opm/parser/eclipse/EclipseState/Aquifer/AquiferHelpers.hpp +++ b/src/opm/input/eclipse/EclipseState/Aquifer/AquiferHelpers.hpp @@ -19,7 +19,7 @@ #ifndef OPM_AQUIFERHELPERS_HPP #define OPM_AQUIFERHELPERS_HPP -#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/Aquifer/Aquifetp.cpp b/src/opm/input/eclipse/EclipseState/Aquifer/Aquifetp.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Aquifer/Aquifetp.cpp rename to src/opm/input/eclipse/EclipseState/Aquifer/Aquifetp.cpp index e66633ee7..108fba41c 100644 --- a/src/opm/parser/eclipse/EclipseState/Aquifer/Aquifetp.cpp +++ b/src/opm/input/eclipse/EclipseState/Aquifer/Aquifetp.cpp @@ -17,17 +17,17 @@ along with OPM. If not, see . */ -#include +#include #include -#include -#include +#include +#include -#include +#include -#include -#include +#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.cpp b/src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.cpp similarity index 92% rename from src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.cpp rename to src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.cpp index 1a87a9ac8..8877ea60a 100644 --- a/src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.cpp +++ b/src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.cpp @@ -16,13 +16,13 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#include +#include -#include -#include -#include +#include +#include +#include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.cpp b/src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.cpp similarity index 94% rename from src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.cpp rename to src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.cpp index b201fec81..9fb4a52b8 100644 --- a/src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.cpp +++ b/src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.cpp @@ -14,13 +14,13 @@ */ -#include +#include -#include +#include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.cpp b/src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.cpp similarity index 94% rename from src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.cpp rename to src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.cpp index c7c27ea6d..b31fad109 100644 --- a/src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.cpp +++ b/src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.cpp @@ -17,21 +17,21 @@ along with OPM. If not, see . */ -#include +#include -#include -#include +#include +#include -#include -#include +#include +#include #include #include #include -#include +#include -#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.cpp b/src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.cpp similarity index 92% rename from src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.cpp rename to src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.cpp index 8f1e41884..811eb77e5 100644 --- a/src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.cpp +++ b/src/opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.cpp @@ -17,13 +17,13 @@ along with OPM. If not, see . */ -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include #include "../AquiferHelpers.hpp" namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/EclipseConfig.cpp b/src/opm/input/eclipse/EclipseState/EclipseConfig.cpp similarity index 87% rename from src/opm/parser/eclipse/EclipseState/EclipseConfig.cpp rename to src/opm/input/eclipse/EclipseState/EclipseConfig.cpp index fe50729ee..ca6d5356e 100644 --- a/src/opm/parser/eclipse/EclipseState/EclipseConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/EclipseConfig.cpp @@ -19,11 +19,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/EclipseState.cpp b/src/opm/input/eclipse/EclipseState/EclipseState.cpp similarity index 92% rename from src/opm/parser/eclipse/EclipseState/EclipseState.cpp rename to src/opm/input/eclipse/EclipseState/EclipseState.cpp index 9712320d7..48987c93b 100644 --- a/src/opm/parser/eclipse/EclipseState/EclipseState.cpp +++ b/src/opm/input/eclipse/EclipseState/EclipseState.cpp @@ -30,26 +30,26 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/EndpointScaling.cpp b/src/opm/input/eclipse/EclipseState/EndpointScaling.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/EndpointScaling.cpp rename to src/opm/input/eclipse/EclipseState/EndpointScaling.cpp index 2eac4b7d7..a4c5d3ef3 100644 --- a/src/opm/parser/eclipse/EclipseState/EndpointScaling.cpp +++ b/src/opm/input/eclipse/EclipseState/EndpointScaling.cpp @@ -16,12 +16,12 @@ OPM. If not, see . */ -#include +#include -#include +#include -#include -#include +#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/Grid/Box.cpp b/src/opm/input/eclipse/EclipseState/Grid/Box.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Grid/Box.cpp rename to src/opm/input/eclipse/EclipseState/Grid/Box.cpp index 359592d1f..aa9977a19 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/Box.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/Box.cpp @@ -19,11 +19,11 @@ #include -#include -#include +#include +#include -#include -#include +#include +#include namespace { diff --git a/src/opm/parser/eclipse/EclipseState/Grid/BoxManager.cpp b/src/opm/input/eclipse/EclipseState/Grid/BoxManager.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Grid/BoxManager.cpp rename to src/opm/input/eclipse/EclipseState/Grid/BoxManager.cpp index 4a9032a59..5ceda4d94 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/BoxManager.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/BoxManager.cpp @@ -19,7 +19,7 @@ #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp b/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp rename to src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp index 9cab6a4b4..0bdae226b 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp @@ -37,30 +37,30 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Grid/FaceDir.cpp b/src/opm/input/eclipse/EclipseState/Grid/FaceDir.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Grid/FaceDir.cpp rename to src/opm/input/eclipse/EclipseState/Grid/FaceDir.cpp index 25e7e2ac5..1addc8ba4 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/FaceDir.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/FaceDir.cpp @@ -19,7 +19,7 @@ #include -#include +#include diff --git a/src/opm/parser/eclipse/EclipseState/Grid/Fault.cpp b/src/opm/input/eclipse/EclipseState/Grid/Fault.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Grid/Fault.cpp rename to src/opm/input/eclipse/EclipseState/Grid/Fault.cpp index dd6d2172a..0791892af 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/Fault.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/Fault.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp b/src/opm/input/eclipse/EclipseState/Grid/FaultCollection.cpp similarity index 87% rename from src/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp rename to src/opm/input/eclipse/EclipseState/Grid/FaultCollection.cpp index 2af016123..b8b210450 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/FaultCollection.cpp @@ -25,17 +25,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Grid/FaultFace.cpp b/src/opm/input/eclipse/EclipseState/Grid/FaultFace.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Grid/FaultFace.cpp rename to src/opm/input/eclipse/EclipseState/Grid/FaultFace.cpp index d0bd07486..7e9d9d2af 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/FaultFace.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/FaultFace.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Grid/FieldProps.cpp b/src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Grid/FieldProps.cpp rename to src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp index aaf161a42..595382dfa 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/FieldProps.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp @@ -25,26 +25,26 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include "FieldProps.hpp" #include "Operate.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Grid/FieldProps.hpp b/src/opm/input/eclipse/EclipseState/Grid/FieldProps.hpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Grid/FieldProps.hpp rename to src/opm/input/eclipse/EclipseState/Grid/FieldProps.hpp index 63394a323..e93b1af8c 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/FieldProps.hpp +++ b/src/opm/input/eclipse/EclipseState/Grid/FieldProps.hpp @@ -25,16 +25,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.cpp b/src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.cpp rename to src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp index f740d7190..0fb005e9e 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp @@ -17,13 +17,13 @@ */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include "FieldProps.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Grid/GridDims.cpp b/src/opm/input/eclipse/EclipseState/Grid/GridDims.cpp similarity index 92% rename from src/opm/parser/eclipse/EclipseState/Grid/GridDims.cpp rename to src/opm/input/eclipse/EclipseState/Grid/GridDims.cpp index fc7e37ee0..e9a7430d3 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/GridDims.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/GridDims.cpp @@ -23,14 +23,14 @@ #include -#include -#include -#include +#include +#include +#include -#include +#include -#include // DIMENS -#include // SPECGRID +#include // DIMENS +#include // SPECGRID namespace Opm { GridDims::GridDims(std::array xyz) : diff --git a/src/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp b/src/opm/input/eclipse/EclipseState/Grid/MULTREGTScanner.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp rename to src/opm/input/eclipse/EclipseState/Grid/MULTREGTScanner.cpp index 3e9729e45..7b687f300 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/MULTREGTScanner.cpp @@ -20,13 +20,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Grid/MapAxes.cpp b/src/opm/input/eclipse/EclipseState/Grid/MapAxes.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Grid/MapAxes.cpp rename to src/opm/input/eclipse/EclipseState/Grid/MapAxes.cpp index 7a1d363e1..281a15448 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/MapAxes.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/MapAxes.cpp @@ -22,12 +22,12 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Grid/NNC.cpp b/src/opm/input/eclipse/EclipseState/Grid/NNC.cpp similarity index 94% rename from src/opm/parser/eclipse/EclipseState/Grid/NNC.cpp rename to src/opm/input/eclipse/EclipseState/Grid/NNC.cpp index 3cffd54be..35747668b 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/NNC.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/NNC.cpp @@ -18,14 +18,14 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Grid/Operate.cpp b/src/opm/input/eclipse/EclipseState/Grid/Operate.cpp similarity index 100% rename from src/opm/parser/eclipse/EclipseState/Grid/Operate.cpp rename to src/opm/input/eclipse/EclipseState/Grid/Operate.cpp diff --git a/src/opm/parser/eclipse/EclipseState/Grid/Operate.hpp b/src/opm/input/eclipse/EclipseState/Grid/Operate.hpp similarity index 100% rename from src/opm/parser/eclipse/EclipseState/Grid/Operate.hpp rename to src/opm/input/eclipse/EclipseState/Grid/Operate.hpp diff --git a/src/opm/parser/eclipse/EclipseState/Grid/PinchMode.cpp b/src/opm/input/eclipse/EclipseState/Grid/PinchMode.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Grid/PinchMode.cpp rename to src/opm/input/eclipse/EclipseState/Grid/PinchMode.cpp index 21169f624..2bf7c7027 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/PinchMode.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/PinchMode.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp b/src/opm/input/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp rename to src/opm/input/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp index be223acc0..b5e5b19e6 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp @@ -17,24 +17,24 @@ OPM. If not, see . */ -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Grid/SparseScheduleGrid.cpp b/src/opm/input/eclipse/EclipseState/Grid/SparseScheduleGrid.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Grid/SparseScheduleGrid.cpp rename to src/opm/input/eclipse/EclipseState/Grid/SparseScheduleGrid.cpp index cc8be51f4..2322a31c3 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/SparseScheduleGrid.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/SparseScheduleGrid.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/Grid/TranCalculator.cpp b/src/opm/input/eclipse/EclipseState/Grid/TranCalculator.cpp similarity index 91% rename from src/opm/parser/eclipse/EclipseState/Grid/TranCalculator.cpp rename to src/opm/input/eclipse/EclipseState/Grid/TranCalculator.cpp index a4c45d24e..9dccfd4f6 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/TranCalculator.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/TranCalculator.cpp @@ -17,8 +17,8 @@ along with OPM. If not, see . */ -#include -#include +#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp b/src/opm/input/eclipse/EclipseState/Grid/TransMult.cpp similarity index 89% rename from src/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp rename to src/opm/input/eclipse/EclipseState/Grid/TransMult.cpp index 8333b1e61..356db72c4 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/TransMult.cpp @@ -25,16 +25,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Grid/setKeywordBox.cpp b/src/opm/input/eclipse/EclipseState/Grid/setKeywordBox.cpp similarity index 100% rename from src/opm/parser/eclipse/EclipseState/Grid/setKeywordBox.cpp rename to src/opm/input/eclipse/EclipseState/Grid/setKeywordBox.cpp diff --git a/src/opm/parser/eclipse/EclipseState/Grid/setKeywordBox.hpp b/src/opm/input/eclipse/EclipseState/Grid/setKeywordBox.hpp similarity index 88% rename from src/opm/parser/eclipse/EclipseState/Grid/setKeywordBox.hpp rename to src/opm/input/eclipse/EclipseState/Grid/setKeywordBox.hpp index 76864bec7..393a205a2 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/setKeywordBox.hpp +++ b/src/opm/input/eclipse/EclipseState/Grid/setKeywordBox.hpp @@ -20,8 +20,8 @@ #ifndef SET_KEYWORDBOX_HPP #define SET_KEYWORDBOX_HPP -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp b/src/opm/input/eclipse/EclipseState/IOConfig/IOConfig.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp rename to src/opm/input/eclipse/EclipseState/IOConfig/IOConfig.cpp index 4f84aadfb..1f4ca8a4e 100644 --- a/src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/IOConfig/IOConfig.cpp @@ -24,11 +24,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/InitConfig/Equil.cpp b/src/opm/input/eclipse/EclipseState/InitConfig/Equil.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/InitConfig/Equil.cpp rename to src/opm/input/eclipse/EclipseState/InitConfig/Equil.cpp index f7f0a245e..ddf387121 100644 --- a/src/opm/parser/eclipse/EclipseState/InitConfig/Equil.cpp +++ b/src/opm/input/eclipse/EclipseState/InitConfig/Equil.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.cpp b/src/opm/input/eclipse/EclipseState/InitConfig/FoamConfig.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.cpp rename to src/opm/input/eclipse/EclipseState/InitConfig/FoamConfig.cpp index 4cb5f7111..0d00cda3b 100644 --- a/src/opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/InitConfig/FoamConfig.cpp @@ -17,13 +17,13 @@ along with OPM. If not, see . */ -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp b/src/opm/input/eclipse/EclipseState/InitConfig/InitConfig.cpp similarity index 89% rename from src/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp rename to src/opm/input/eclipse/EclipseState/InitConfig/InitConfig.cpp index 50ed87a17..0090d7c6f 100644 --- a/src/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/InitConfig/InitConfig.cpp @@ -19,17 +19,17 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/MICPpara.cpp b/src/opm/input/eclipse/EclipseState/MICPpara.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/MICPpara.cpp rename to src/opm/input/eclipse/EclipseState/MICPpara.cpp index 8c2497661..9d49c3bca 100644 --- a/src/opm/parser/eclipse/EclipseState/MICPpara.cpp +++ b/src/opm/input/eclipse/EclipseState/MICPpara.cpp @@ -17,10 +17,10 @@ along with OPM. If not, see . */ -#include -#include +#include +#include -#include +#include Opm::MICPpara::MICPpara() : m_density_biofilm( ParserKeywords::MICPPARA::DENSITY_BIOFILM::defaultValue ), diff --git a/src/opm/parser/eclipse/EclipseState/Runspec.cpp b/src/opm/input/eclipse/EclipseState/Runspec.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Runspec.cpp rename to src/opm/input/eclipse/EclipseState/Runspec.cpp index 39b80c371..ed94d5916 100644 --- a/src/opm/parser/eclipse/EclipseState/Runspec.cpp +++ b/src/opm/input/eclipse/EclipseState/Runspec.cpp @@ -16,23 +16,23 @@ OPM. If not, see . */ -#include +#include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/ASTNode.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/ASTNode.cpp index b1641899d..68ee9583b 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Action/ASTNode.cpp @@ -20,10 +20,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/Actdims.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/Actdims.cpp similarity index 93% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/Actdims.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/Actdims.cpp index 43ab3a14e..6217e8902 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/Actdims.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Action/Actdims.cpp @@ -18,9 +18,9 @@ */ #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionAST.cpp similarity index 85% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/ActionAST.cpp index 63e3dc2b6..1dfbfd322 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionAST.cpp @@ -23,10 +23,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "ActionParser.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionContext.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionContext.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionContext.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/ActionContext.cpp index 8db9e532a..667190987 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionContext.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionContext.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionParser.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionParser.cpp similarity index 99% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionParser.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/ActionParser.cpp index a36f9b696..fcde26ece 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionParser.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionParser.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include "ActionParser.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionParser.hpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionParser.hpp similarity index 92% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionParser.hpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/ActionParser.hpp index 6f26d9833..595f9d9eb 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionParser.hpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionParser.hpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionResult.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionResult.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionResult.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/ActionResult.cpp index 495b799a6..137f0ea3f 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionResult.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionResult.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include namespace Opm { namespace Action { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionValue.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionValue.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionValue.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/ActionValue.cpp index f731a23c9..4e637c4ec 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionValue.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionValue.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionX.cpp similarity index 93% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/ActionX.cpp index 04885b6cd..c2902c894 100755 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionX.cpp @@ -22,15 +22,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/Actions.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/Actions.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/Actions.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/Actions.cpp index aa8783c71..96d2d8e0e 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/Actions.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Action/Actions.cpp @@ -18,8 +18,8 @@ */ #include -#include -#include +#include +#include namespace Opm { namespace Action { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/Condition.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/Condition.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/Condition.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/Condition.cpp index a6a3bde98..52fec67d9 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/Condition.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Action/Condition.cpp @@ -23,10 +23,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "ActionParser.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/Enums.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/Enums.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/Enums.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/Enums.cpp index a7b48e875..27ac3d070 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/Enums.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Action/Enums.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace Opm { namespace Action { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/PyAction.cpp similarity index 92% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/PyAction.cpp index 008a0dbab..5fc72bf4e 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Action/PyAction.cpp @@ -20,7 +20,7 @@ #include #ifdef EMBEDDED_PYTHON -#include "src/opm/parser/eclipse/Python/PyRunModule.hpp" +#include "src/opm/input/eclipse/Python/PyRunModule.hpp" #include #include namespace py = pybind11; @@ -28,10 +28,10 @@ namespace py = pybind11; #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/State.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/State.cpp similarity index 93% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/State.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/State.cpp index de7993d47..4a533dae7 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/State.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Action/State.cpp @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/WGNames.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Action/WGNames.cpp similarity index 100% rename from src/opm/parser/eclipse/EclipseState/Schedule/Action/WGNames.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Action/WGNames.cpp diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp b/src/opm/input/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp similarity index 94% rename from src/opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp index 0188a0d78..876c7738e 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp @@ -24,15 +24,15 @@ #include #include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/CompletedCells.cpp b/src/opm/input/eclipse/EclipseState/Schedule/CompletedCells.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/CompletedCells.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/CompletedCells.cpp index 6f7bbea02..77b525057 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/CompletedCells.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/CompletedCells.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include Opm::CompletedCells::CompletedCells(std::size_t nx, std::size_t ny, std::size_t nz) @@ -65,4 +65,4 @@ std::size_t Opm::CompletedCells::Cell::active_index() const{ bool Opm::CompletedCells::Cell::is_active() const{ return this->props.has_value(); -} \ No newline at end of file +} diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Events.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Events.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/Events.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Events.cpp index ff7ffed1d..2d4968519 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Events.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Events.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/GasLiftOpt.cpp b/src/opm/input/eclipse/EclipseState/Schedule/GasLiftOpt.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/GasLiftOpt.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/GasLiftOpt.cpp index 20d11cf0d..51ba44f4a 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/GasLiftOpt.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/GasLiftOpt.cpp @@ -19,7 +19,7 @@ #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Group/GConSale.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Group/GConSale.cpp index 76cfe4273..59b9d083e 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Group/GConSale.cpp @@ -17,10 +17,10 @@ along with OPM. If not, see . */ -#include +#include -#include -#include +#include +#include #include "../eval_uda.hpp" namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Group/GConSump.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Group/GConSump.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Schedule/Group/GConSump.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Group/GConSump.cpp index 5af338d16..d7a4594ef 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Group/GConSump.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Group/GConSump.cpp @@ -17,8 +17,8 @@ along with OPM. If not, see . */ -#include -#include +#include +#include #include "../eval_uda.hpp" namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Group/GPMaint.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Group/GPMaint.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Schedule/Group/GPMaint.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Group/GPMaint.cpp index f48c2b5d6..4f9486f33 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Group/GPMaint.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Group/GPMaint.cpp @@ -17,9 +17,9 @@ along with OPM. If not, see . */ -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Group/GTNode.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Group/GTNode.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/Group/GTNode.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Group/GTNode.cpp index ebfc0c650..5b1070773 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Group/GTNode.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Group/GTNode.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Group/Group.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Group/Group.cpp similarity index 99% rename from src/opm/parser/eclipse/EclipseState/Schedule/Group/Group.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Group/Group.cpp index ec5c7933e..6eb1d20af 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Group/Group.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Group/Group.cpp @@ -22,10 +22,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "../eval_uda.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRate.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRate.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRate.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRate.cpp index be53d329c..b7cde19c3 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRate.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRate.cpp @@ -17,12 +17,12 @@ along with OPM. If not, see . */ -#include +#include -#include -#include +#include +#include -#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateConfig.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateConfig.cpp index 373dbe9d7..19eb7d4b0 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateConfig.cpp @@ -18,7 +18,7 @@ */ -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateModel.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateModel.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateModel.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateModel.cpp index b0776e833..50bb67602 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateModel.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateModel.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp b/src/opm/input/eclipse/EclipseState/Schedule/KeywordHandlers.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/KeywordHandlers.cpp index 7ee8fca6c..3ad61c77e 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/KeywordHandlers.cpp @@ -36,55 +36,55 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Well/injection.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/AICD.cpp b/src/opm/input/eclipse/EclipseState/Schedule/MSW/AICD.cpp similarity index 92% rename from src/opm/parser/eclipse/EclipseState/Schedule/MSW/AICD.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/MSW/AICD.cpp index 7b754b45c..a505ee3c2 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/AICD.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/MSW/AICD.cpp @@ -18,12 +18,12 @@ */ -#include -#include -#include -#include +#include +#include +#include +#include -#include "src/opm/parser/eclipse/EclipseState/Schedule/MSW/FromWSEG.hpp" +#include "src/opm/input/eclipse/EclipseState/Schedule/MSW/FromWSEG.hpp" namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp b/src/opm/input/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp index e46d20add..9af1776f4 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp @@ -23,19 +23,19 @@ #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "Compsegs.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.hpp b/src/opm/input/eclipse/EclipseState/Schedule/MSW/Compsegs.hpp similarity index 100% rename from src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.hpp rename to src/opm/input/eclipse/EclipseState/Schedule/MSW/Compsegs.hpp diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/FromWSEG.hpp b/src/opm/input/eclipse/EclipseState/Schedule/MSW/FromWSEG.hpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/MSW/FromWSEG.hpp rename to src/opm/input/eclipse/EclipseState/Schedule/MSW/FromWSEG.hpp index 142eca44b..595e05301 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/FromWSEG.hpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/MSW/FromWSEG.hpp @@ -21,7 +21,7 @@ #ifndef FROM_WSEG_HPP #define FROM_WSEG_HPP -#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/SICD.cpp b/src/opm/input/eclipse/EclipseState/Schedule/MSW/SICD.cpp similarity index 94% rename from src/opm/parser/eclipse/EclipseState/Schedule/MSW/SICD.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/MSW/SICD.cpp index 0ce9ac228..37c010713 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/SICD.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/MSW/SICD.cpp @@ -18,16 +18,16 @@ along with OPM. If not, see . */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include "src/opm/parser/eclipse/EclipseState/Schedule/MSW/icd_convert.hpp" -#include "src/opm/parser/eclipse/EclipseState/Schedule/MSW/FromWSEG.hpp" +#include "src/opm/input/eclipse/EclipseState/Schedule/MSW/icd_convert.hpp" +#include "src/opm/input/eclipse/EclipseState/Schedule/MSW/FromWSEG.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.cpp b/src/opm/input/eclipse/EclipseState/Schedule/MSW/Segment.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/MSW/Segment.cpp index 4d6c60057..37044be47 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/MSW/Segment.cpp @@ -18,9 +18,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.cpp b/src/opm/input/eclipse/EclipseState/Schedule/MSW/Valve.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/MSW/Valve.cpp index 896e9a939..8a93e4fcb 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/MSW/Valve.cpp @@ -17,9 +17,9 @@ along with OPM. If not, see . */ -#include -#include -#include +#include +#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.cpp b/src/opm/input/eclipse/EclipseState/Schedule/MSW/WellSegments.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/MSW/WellSegments.cpp index b8c9f19ef..06cd6105a 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/MSW/WellSegments.cpp @@ -30,14 +30,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/icd.cpp b/src/opm/input/eclipse/EclipseState/Schedule/MSW/icd.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Schedule/MSW/icd.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/MSW/icd.cpp index 48cdea838..e97ea701b 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/icd.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/MSW/icd.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include #include "icd_convert.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/icd_convert.hpp b/src/opm/input/eclipse/EclipseState/Schedule/MSW/icd_convert.hpp similarity index 100% rename from src/opm/parser/eclipse/EclipseState/Schedule/MSW/icd_convert.hpp rename to src/opm/input/eclipse/EclipseState/Schedule/MSW/icd_convert.hpp diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MessageLimits.cpp b/src/opm/input/eclipse/EclipseState/Schedule/MessageLimits.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/MessageLimits.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/MessageLimits.cpp index 5a50e92ca..959c51e3e 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/MessageLimits.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/MessageLimits.cpp @@ -19,11 +19,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Network/Balance.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Network/Balance.cpp similarity index 93% rename from src/opm/parser/eclipse/EclipseState/Schedule/Network/Balance.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Network/Balance.cpp index 1ee9419d9..95a273e56 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Network/Balance.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Network/Balance.cpp @@ -18,11 +18,11 @@ */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Opm { namespace Network { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Network/Branch.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Network/Branch.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/Network/Branch.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Network/Branch.cpp index a674fc2fe..e9132b216 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Network/Branch.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Network/Branch.cpp @@ -18,7 +18,7 @@ */ -#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Network/ExtNetwork.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Network/ExtNetwork.cpp index 5731f8ff5..7c14bb192 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Network/ExtNetwork.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace Opm { namespace Network { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Network/Node.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Network/Node.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/Network/Node.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Network/Node.cpp index 9fc3f0f73..3bea0b101 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Network/Node.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Network/Node.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include namespace Opm { namespace Network { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp b/src/opm/input/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp index c758ae82e..62ad6442a 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/RFTConfig.cpp b/src/opm/input/eclipse/EclipseState/Schedule/RFTConfig.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/RFTConfig.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/RFTConfig.cpp index 6a05b1184..f3c44993d 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/RFTConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/RFTConfig.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/RPTConfig.cpp b/src/opm/input/eclipse/EclipseState/Schedule/RPTConfig.cpp similarity index 94% rename from src/opm/parser/eclipse/EclipseState/Schedule/RPTConfig.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/RPTConfig.cpp index d7bd324d2..a719e88be 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/RPTConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/RPTConfig.cpp @@ -17,8 +17,8 @@ along with OPM. If not, see . */ -#include -#include +#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/RSTConfig.cpp b/src/opm/input/eclipse/EclipseState/Schedule/RSTConfig.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/RSTConfig.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/RSTConfig.cpp index 7bf5cbc8a..30bfd4b03 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/RSTConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/RSTConfig.cpp @@ -19,13 +19,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Schedule.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Schedule.cpp index a464c7319..535c1ad45 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Schedule.cpp @@ -40,53 +40,53 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Well/injection.hpp" #include "MSW/Compsegs.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/ScheduleDeck.cpp b/src/opm/input/eclipse/EclipseState/Schedule/ScheduleDeck.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/ScheduleDeck.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/ScheduleDeck.cpp index b68437e21..42c32a04b 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/ScheduleDeck.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/ScheduleDeck.cpp @@ -22,15 +22,15 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/ScheduleGrid.cpp b/src/opm/input/eclipse/EclipseState/Schedule/ScheduleGrid.cpp similarity index 91% rename from src/opm/parser/eclipse/EclipseState/Schedule/ScheduleGrid.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/ScheduleGrid.cpp index eaed3d902..2527438df 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/ScheduleGrid.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/ScheduleGrid.cpp @@ -18,10 +18,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include Opm::ScheduleGrid::ScheduleGrid(const Opm::EclipseGrid& ecl_grid, const Opm::FieldPropsManager& fpm, Opm::CompletedCells& completed_cells) : grid(&ecl_grid) diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/ScheduleState.cpp b/src/opm/input/eclipse/EclipseState/Schedule/ScheduleState.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/ScheduleState.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/ScheduleState.cpp index 8f35eb811..b1266f420 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/ScheduleState.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/ScheduleState.cpp @@ -18,12 +18,12 @@ */ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.cpp b/src/opm/input/eclipse/EclipseState/Schedule/ScheduleTypes.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/ScheduleTypes.cpp index 12f27631d..0869cf370 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/ScheduleTypes.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/SummaryState.cpp b/src/opm/input/eclipse/EclipseState/Schedule/SummaryState.cpp similarity index 99% rename from src/opm/parser/eclipse/EclipseState/Schedule/SummaryState.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/SummaryState.cpp index a3efc8242..3b26e3418 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/SummaryState.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/SummaryState.cpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include namespace Opm{ namespace { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Tuning.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Tuning.cpp index eb5550fb5..0a2ab973c 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Tuning.cpp @@ -17,11 +17,11 @@ along with OPM. If not, see . */ -#include +#include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp index 8873e9d9a..0ef4c7e93 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp @@ -18,10 +18,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp index ec762919b..aba4bfbad 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp @@ -20,10 +20,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQAssign.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQAssign.cpp index e31d0aa5c..b38d86be4 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQAssign.cpp @@ -17,8 +17,8 @@ along with OPM. If not, see . */ -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQConfig.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQConfig.cpp index ac4873d51..41860c51f 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQConfig.cpp @@ -22,12 +22,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp index eea6bb777..4b26df59f 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp @@ -18,9 +18,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp index 389209073..5828f1ce0 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp @@ -23,12 +23,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include "../../../Parser/raw/RawConsts.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQEnums.cpp similarity index 99% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQEnums.cpp index f1dc8da5b..3eb47b707 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQEnums.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunction.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunction.cpp similarity index 99% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunction.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunction.cpp index e6ad3c3f4..6bfa67c90 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunction.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunction.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.cpp similarity index 99% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.cpp index fb5aca772..65e53eb89 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQInput.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQInput.cpp index 3003aacbc..106226519 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQInput.cpp @@ -18,7 +18,7 @@ */ -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParams.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParams.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParams.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParams.cpp index 94a33de89..af73be444 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParams.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParams.cpp @@ -17,9 +17,9 @@ */ #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParser.cpp similarity index 99% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParser.cpp index 5aa3a96fa..161a10b19 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParser.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include #include "UDQParser.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp similarity index 89% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp index f2a7eb4e9..90aa3061a 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp @@ -24,11 +24,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQSet.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQSet.cpp similarity index 99% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQSet.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQSet.cpp index b8546e273..2a124c516 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQSet.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQSet.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQState.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQState.cpp similarity index 99% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQState.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQState.cpp index 27a32d690..ae4bf4497 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQState.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQState.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQToken.cpp b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQToken.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQToken.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQToken.cpp index a4cd3812d..5c11ba578 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQToken.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQToken.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.cpp b/src/opm/input/eclipse/EclipseState/Schedule/VFPInjTable.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/VFPInjTable.cpp index dd8e4f286..e314650c5 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/VFPInjTable.cpp @@ -22,14 +22,14 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include +#include //Anonymous namespace namespace { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.cpp b/src/opm/input/eclipse/EclipseState/Schedule/VFPProdTable.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/VFPProdTable.cpp index ac6cdfae4..a73617c21 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/VFPProdTable.cpp @@ -26,14 +26,14 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/Connection.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/Connection.cpp index 22e362fb4..b5ad78fe4 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/Connection.cpp @@ -26,14 +26,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/NameOrder.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/NameOrder.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/NameOrder.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/NameOrder.cpp index bb798d599..44adf3155 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/NameOrder.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/NameOrder.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvg.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/PAvg.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvg.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/PAvg.cpp index bdb3f0473..4d2b99f0b 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvg.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/PAvg.cpp @@ -18,9 +18,9 @@ */ #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculator.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculator.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculator.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculator.cpp index fdf82707e..b4de8eba5 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculator.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculator.cpp @@ -21,10 +21,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.cpp index 24cb4e8d5..4a1f616bb 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WList.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/WList.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/WList.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/WList.cpp index 998a9824a..23fcc03d4 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WList.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/WList.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/WListManager.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/WListManager.cpp index d6b8ab3c5..b9bb70072 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/WListManager.cpp @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/Well.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/Well.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/Well.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/Well.cpp index 9f73f56a8..47484213c 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/Well.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/Well.cpp @@ -19,19 +19,19 @@ #include -#include -#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "../MSW/Compsegs.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellBrineProperties.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellBrineProperties.cpp similarity index 88% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/WellBrineProperties.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/WellBrineProperties.cpp index 5ac973c97..2bf3b54f4 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellBrineProperties.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellBrineProperties.cpp @@ -17,10 +17,10 @@ along with OPM. If not, see . */ -#include +#include -#include -#include +#include +#include Opm::WellBrineProperties Opm::WellBrineProperties::serializeObject() { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellConnections.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/WellConnections.cpp index 4ecdf3bf1..88556b65a 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellConnections.cpp @@ -30,15 +30,15 @@ #include #include -#include +#include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp index b9fd5c507..7db0769eb 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp @@ -20,10 +20,10 @@ #include -#include -#include +#include +#include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellFoamProperties.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellFoamProperties.cpp similarity index 88% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/WellFoamProperties.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/WellFoamProperties.cpp index e7dfb6c78..981fddd31 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellFoamProperties.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellFoamProperties.cpp @@ -17,10 +17,10 @@ along with OPM. If not, see . */ -#include +#include -#include -#include +#include +#include Opm::WellFoamProperties Opm::WellFoamProperties::serializeObject() { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp index 91d8541bb..3f1427fc8 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp @@ -20,15 +20,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "injection.hpp" #include "../eval_uda.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellMICPProperties.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellMICPProperties.cpp similarity index 90% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/WellMICPProperties.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/WellMICPProperties.cpp index fc057ebd6..6296671e9 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellMICPProperties.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellMICPProperties.cpp @@ -17,10 +17,10 @@ along with OPM. If not, see . */ -#include +#include -#include -#include +#include +#include Opm::WellMICPProperties Opm::WellMICPProperties::serializeObject() { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellMatcher.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellMatcher.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/WellMatcher.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/WellMatcher.cpp index eb7086a3e..047299eb7 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellMatcher.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellMatcher.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp similarity index 94% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp index 3b429c154..f7ab61a40 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp @@ -17,9 +17,9 @@ along with OPM. If not, see . */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp index 4daa55c87..ca30cdf27 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp @@ -23,14 +23,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "../eval_uda.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp index 84f85df78..3cc370765 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellTestState.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/WellTestState.cpp index 8a9d1b558..9f2f03583 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellTestState.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp index 1b316430e..cafe5ad64 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/injection.cpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/injection.cpp similarity index 94% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/injection.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/injection.cpp index 48c1c5a57..cbcef8451 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/injection.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/injection.cpp @@ -21,8 +21,8 @@ #include -#include -#include +#include +#include #include "injection.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/injection.hpp b/src/opm/input/eclipse/EclipseState/Schedule/Well/injection.hpp similarity index 83% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well/injection.hpp rename to src/opm/input/eclipse/EclipseState/Schedule/Well/injection.hpp index 39cc38018..d6e81d5df 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/injection.hpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/Well/injection.hpp @@ -20,9 +20,9 @@ #ifndef INJECTION_HPP #define INJECTION_HPP -#include -#include -#include +#include +#include +#include namespace Opm { namespace injection { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/WriteRestartFileEvents.cpp b/src/opm/input/eclipse/EclipseState/Schedule/WriteRestartFileEvents.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/WriteRestartFileEvents.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/WriteRestartFileEvents.cpp index 86d3d0ed3..9d6845f8e 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/WriteRestartFileEvents.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/WriteRestartFileEvents.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/eval_uda.cpp b/src/opm/input/eclipse/EclipseState/Schedule/eval_uda.cpp similarity index 94% rename from src/opm/parser/eclipse/EclipseState/Schedule/eval_uda.cpp rename to src/opm/input/eclipse/EclipseState/Schedule/eval_uda.cpp index f5cd257ec..49152cd2a 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/eval_uda.cpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/eval_uda.cpp @@ -18,9 +18,9 @@ */ -#include -#include -#include +#include +#include +#include #include "Well/injection.hpp" #include "eval_uda.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/eval_uda.hpp b/src/opm/input/eclipse/EclipseState/Schedule/eval_uda.hpp similarity index 91% rename from src/opm/parser/eclipse/EclipseState/Schedule/eval_uda.hpp rename to src/opm/input/eclipse/EclipseState/Schedule/eval_uda.hpp index b3c25a83f..0cc2d97e9 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/eval_uda.hpp +++ b/src/opm/input/eclipse/EclipseState/Schedule/eval_uda.hpp @@ -22,8 +22,8 @@ #include -#include -#include +#include +#include namespace Opm { class UDAvalue; diff --git a/src/opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.cpp b/src/opm/input/eclipse/EclipseState/SimulationConfig/BCConfig.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.cpp rename to src/opm/input/eclipse/EclipseState/SimulationConfig/BCConfig.cpp index 08a75421a..0fcf81310 100644 --- a/src/opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/SimulationConfig/BCConfig.cpp @@ -19,9 +19,9 @@ #include -#include -#include -#include +#include +#include +#include namespace Opm { namespace { diff --git a/src/opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.cpp b/src/opm/input/eclipse/EclipseState/SimulationConfig/RockConfig.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.cpp rename to src/opm/input/eclipse/EclipseState/SimulationConfig/RockConfig.cpp index 875bca07d..da3b8b39e 100644 --- a/src/opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/SimulationConfig/RockConfig.cpp @@ -19,10 +19,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp b/src/opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp similarity index 90% rename from src/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp rename to src/opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp index 5cc492cb7..0995b9270 100644 --- a/src/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp @@ -18,17 +18,17 @@ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp b/src/opm/input/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp similarity index 94% rename from src/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp rename to src/opm/input/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp index 7a8b9c9d3..358e5bece 100644 --- a/src/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp +++ b/src/opm/input/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp @@ -18,14 +18,14 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp b/src/opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp rename to src/opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp index e4aefe00c..f49749b2d 100644 --- a/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp @@ -31,28 +31,28 @@ #include -#include -#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/Aqudims.cpp b/src/opm/input/eclipse/EclipseState/Tables/Aqudims.cpp similarity index 87% rename from src/opm/parser/eclipse/EclipseState/Tables/Aqudims.cpp rename to src/opm/input/eclipse/EclipseState/Tables/Aqudims.cpp index 58b6265d6..599208361 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/Aqudims.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/Aqudims.cpp @@ -17,12 +17,12 @@ along with OPM. If not, see . */ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/Bdensity.cpp b/src/opm/input/eclipse/EclipseState/Tables/Bdensity.cpp similarity index 94% rename from src/opm/parser/eclipse/EclipseState/Tables/Bdensity.cpp rename to src/opm/input/eclipse/EclipseState/Tables/Bdensity.cpp index c883f86d2..7ba77202c 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/Bdensity.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/Bdensity.cpp @@ -18,10 +18,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/BrineDensityTable.cpp b/src/opm/input/eclipse/EclipseState/Tables/BrineDensityTable.cpp similarity index 86% rename from src/opm/parser/eclipse/EclipseState/Tables/BrineDensityTable.cpp rename to src/opm/input/eclipse/EclipseState/Tables/BrineDensityTable.cpp index 073c89c00..5b06135b8 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/BrineDensityTable.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/BrineDensityTable.cpp @@ -18,10 +18,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { BrineDensityTable BrineDensityTable::serializeObject() diff --git a/src/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.cpp b/src/opm/input/eclipse/EclipseState/Tables/ColumnSchema.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.cpp rename to src/opm/input/eclipse/EclipseState/Tables/ColumnSchema.cpp index 20d3ddeb8..5f63d7689 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/ColumnSchema.cpp @@ -19,7 +19,7 @@ #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/DenT.cpp b/src/opm/input/eclipse/EclipseState/Tables/DenT.cpp similarity index 91% rename from src/opm/parser/eclipse/EclipseState/Tables/DenT.cpp rename to src/opm/input/eclipse/EclipseState/Tables/DenT.cpp index c9779cce1..37530c522 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/DenT.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/DenT.cpp @@ -16,9 +16,9 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/Eqldims.cpp b/src/opm/input/eclipse/EclipseState/Tables/Eqldims.cpp similarity index 90% rename from src/opm/parser/eclipse/EclipseState/Tables/Eqldims.cpp rename to src/opm/input/eclipse/EclipseState/Tables/Eqldims.cpp index ac11c8a54..4d3feff66 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/Eqldims.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/Eqldims.cpp @@ -17,9 +17,9 @@ along with OPM. If not, see . */ -#include +#include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/JFunc.cpp b/src/opm/input/eclipse/EclipseState/Tables/JFunc.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Tables/JFunc.cpp rename to src/opm/input/eclipse/EclipseState/Tables/JFunc.cpp index 71de1118d..e2cb13b47 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/JFunc.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/JFunc.cpp @@ -17,9 +17,9 @@ along with OPM. If not, see . */ -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/PolyInjTables.cpp b/src/opm/input/eclipse/EclipseState/Tables/PolyInjTables.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Tables/PolyInjTables.cpp rename to src/opm/input/eclipse/EclipseState/Tables/PolyInjTables.cpp index 170348fa9..6862b5a1e 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/PolyInjTables.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/PolyInjTables.cpp @@ -23,15 +23,15 @@ * PLYMWINJ, SKPRWAT, SKPRPOLY */ -#include +#include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm{ diff --git a/src/opm/parser/eclipse/EclipseState/Tables/PvtwsaltTable.cpp b/src/opm/input/eclipse/EclipseState/Tables/PvtwsaltTable.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Tables/PvtwsaltTable.cpp rename to src/opm/input/eclipse/EclipseState/Tables/PvtwsaltTable.cpp index 0be6225bf..1442ad198 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/PvtwsaltTable.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/PvtwsaltTable.cpp @@ -18,10 +18,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/PvtxTable.cpp b/src/opm/input/eclipse/EclipseState/Tables/PvtxTable.cpp similarity index 93% rename from src/opm/parser/eclipse/EclipseState/Tables/PvtxTable.cpp rename to src/opm/input/eclipse/EclipseState/Tables/PvtxTable.cpp index d832a58bb..e3b9b1c5c 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/PvtxTable.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/PvtxTable.cpp @@ -17,13 +17,13 @@ along with OPM. If not, see . */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/Regdims.cpp b/src/opm/input/eclipse/EclipseState/Tables/Regdims.cpp similarity index 85% rename from src/opm/parser/eclipse/EclipseState/Tables/Regdims.cpp rename to src/opm/input/eclipse/EclipseState/Tables/Regdims.cpp index abd0368b3..5e3161de5 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/Regdims.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/Regdims.cpp @@ -17,12 +17,12 @@ along with OPM. If not, see . */ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/Rock2dTable.cpp b/src/opm/input/eclipse/EclipseState/Tables/Rock2dTable.cpp similarity index 90% rename from src/opm/parser/eclipse/EclipseState/Tables/Rock2dTable.cpp rename to src/opm/input/eclipse/EclipseState/Tables/Rock2dTable.cpp index 6fbf60a5a..0e95e7076 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/Rock2dTable.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/Rock2dTable.cpp @@ -18,10 +18,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.cpp b/src/opm/input/eclipse/EclipseState/Tables/Rock2dtrTable.cpp similarity index 90% rename from src/opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.cpp rename to src/opm/input/eclipse/EclipseState/Tables/Rock2dtrTable.cpp index 1001c454d..9dd80b664 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/Rock2dtrTable.cpp @@ -18,10 +18,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/RwgsaltTable.cpp b/src/opm/input/eclipse/EclipseState/Tables/RwgsaltTable.cpp similarity index 92% rename from src/opm/parser/eclipse/EclipseState/Tables/RwgsaltTable.cpp rename to src/opm/input/eclipse/EclipseState/Tables/RwgsaltTable.cpp index 3203fe551..87ad1fd0c 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/RwgsaltTable.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/RwgsaltTable.cpp @@ -19,10 +19,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp b/src/opm/input/eclipse/EclipseState/Tables/SimpleTable.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp rename to src/opm/input/eclipse/EclipseState/Tables/SimpleTable.cpp index 6043cd38a..1f4e77a20 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/SimpleTable.cpp @@ -19,9 +19,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/SolventDensityTable.cpp b/src/opm/input/eclipse/EclipseState/Tables/SolventDensityTable.cpp similarity index 86% rename from src/opm/parser/eclipse/EclipseState/Tables/SolventDensityTable.cpp rename to src/opm/input/eclipse/EclipseState/Tables/SolventDensityTable.cpp index 7bd849eff..066daa154 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/SolventDensityTable.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/SolventDensityTable.cpp @@ -18,10 +18,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { SolventDensityTable SolventDensityTable::serializeObject() diff --git a/src/opm/parser/eclipse/EclipseState/Tables/StandardCond.cpp b/src/opm/input/eclipse/EclipseState/Tables/StandardCond.cpp similarity index 88% rename from src/opm/parser/eclipse/EclipseState/Tables/StandardCond.cpp rename to src/opm/input/eclipse/EclipseState/Tables/StandardCond.cpp index b16703ec1..b6131f116 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/StandardCond.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/StandardCond.cpp @@ -17,9 +17,9 @@ along with OPM. If not, see . */ -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/TLMixpar.cpp b/src/opm/input/eclipse/EclipseState/Tables/TLMixpar.cpp similarity index 91% rename from src/opm/parser/eclipse/EclipseState/Tables/TLMixpar.cpp rename to src/opm/input/eclipse/EclipseState/Tables/TLMixpar.cpp index 494e331e1..263219da5 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/TLMixpar.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/TLMixpar.cpp @@ -18,9 +18,9 @@ */ -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/Tabdims.cpp b/src/opm/input/eclipse/EclipseState/Tables/Tabdims.cpp similarity index 86% rename from src/opm/parser/eclipse/EclipseState/Tables/Tabdims.cpp rename to src/opm/input/eclipse/EclipseState/Tables/Tabdims.cpp index acdbffec2..56a71e43b 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/Tabdims.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/Tabdims.cpp @@ -17,12 +17,12 @@ along with OPM. If not, see . */ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/TableColumn.cpp b/src/opm/input/eclipse/EclipseState/Tables/TableColumn.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Tables/TableColumn.cpp rename to src/opm/input/eclipse/EclipseState/Tables/TableColumn.cpp index 6e0c77f58..9d658689d 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/TableColumn.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/TableColumn.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/TableContainer.cpp b/src/opm/input/eclipse/EclipseState/Tables/TableContainer.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Tables/TableContainer.cpp rename to src/opm/input/eclipse/EclipseState/Tables/TableContainer.cpp index 1f8a3da4b..c55ba65bf 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/TableContainer.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/TableContainer.cpp @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/TableIndex.cpp b/src/opm/input/eclipse/EclipseState/Tables/TableIndex.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Tables/TableIndex.cpp rename to src/opm/input/eclipse/EclipseState/Tables/TableIndex.cpp index d5b48a58b..f55bc79be 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/TableIndex.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/TableIndex.cpp @@ -19,7 +19,7 @@ -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp b/src/opm/input/eclipse/EclipseState/Tables/TableManager.cpp similarity index 92% rename from src/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp rename to src/opm/input/eclipse/EclipseState/Tables/TableManager.cpp index 9a9d0000d..59e93ab00 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/TableManager.cpp @@ -35,82 +35,82 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/TableSchema.cpp b/src/opm/input/eclipse/EclipseState/Tables/TableSchema.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/Tables/TableSchema.cpp rename to src/opm/input/eclipse/EclipseState/Tables/TableSchema.cpp index 890cd5a72..ab8e98c38 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/TableSchema.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/TableSchema.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Tables/Tables.cpp b/src/opm/input/eclipse/EclipseState/Tables/Tables.cpp similarity index 92% rename from src/opm/parser/eclipse/EclipseState/Tables/Tables.cpp rename to src/opm/input/eclipse/EclipseState/Tables/Tables.cpp index c69dd7750..4302cbe72 100644 --- a/src/opm/parser/eclipse/EclipseState/Tables/Tables.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/Tables.cpp @@ -17,74 +17,74 @@ along with OPM. If not, see . */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/TracerConfig.cpp b/src/opm/input/eclipse/EclipseState/TracerConfig.cpp similarity index 96% rename from src/opm/parser/eclipse/EclipseState/TracerConfig.cpp rename to src/opm/input/eclipse/EclipseState/TracerConfig.cpp index 56f9a8fc8..082c11f1d 100644 --- a/src/opm/parser/eclipse/EclipseState/TracerConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/TracerConfig.cpp @@ -23,13 +23,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/checkDeck.cpp b/src/opm/input/eclipse/EclipseState/checkDeck.cpp similarity index 89% rename from src/opm/parser/eclipse/EclipseState/checkDeck.cpp rename to src/opm/input/eclipse/EclipseState/checkDeck.cpp index 36ba98e5e..ca3ea491e 100644 --- a/src/opm/parser/eclipse/EclipseState/checkDeck.cpp +++ b/src/opm/input/eclipse/EclipseState/checkDeck.cpp @@ -16,16 +16,16 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#include +#include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace Opm { diff --git a/src/opm/parser/eclipse/Generator/KeywordGenerator.cpp b/src/opm/input/eclipse/Generator/KeywordGenerator.cpp similarity index 86% rename from src/opm/parser/eclipse/Generator/KeywordGenerator.cpp rename to src/opm/input/eclipse/Generator/KeywordGenerator.cpp index f5dc882d6..f2179cf51 100644 --- a/src/opm/parser/eclipse/Generator/KeywordGenerator.cpp +++ b/src/opm/input/eclipse/Generator/KeywordGenerator.cpp @@ -26,18 +26,18 @@ #include #include -#include -#include -#include +#include +#include +#include namespace { const std::string sourceHeader = R"( -#include -#include -#include -#include +#include +#include +#include +#include )"; @@ -53,7 +53,7 @@ namespace Opm { std::string KeywordGenerator::headerHeader(const std::string& suffix) { std::string header = fmt::format("#ifndef PARSER_KEYWORDS_{0}_HPP\n" "#define PARSER_KEYWORDS_{0}_HPP\n" - "#include \n" + "#include \n" "namespace Opm {{\n" "namespace ParserKeywords {{\n\n", suffix); return header; @@ -87,7 +87,7 @@ namespace Opm { for(const auto& kw_pair : loader) { const auto& first_char = kw_pair.first; - newSource << fmt::format("#include \n", first_char); + newSource << fmt::format("#include \n", first_char); } newSource << R"( @@ -144,13 +144,13 @@ private: void KeywordGenerator::updateInitSource(const KeywordLoader& loader , const std::string& sourceFile ) const { std::stringstream newSource; newSource << R"( -#include -#include +#include +#include )"; for(const auto& kw_pair : loader) { const auto& first_char = kw_pair.first; - newSource << fmt::format("#include \n", first_char); + newSource << fmt::format("#include \n", first_char); } newSource << R"( @@ -185,11 +185,11 @@ void Parser::addDefaultKeywords() { #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "export.hpp" @@ -220,7 +220,7 @@ void python::common::export_ParserKeywords(py::module& module) { const auto& keywords = kw_pair.second; std::stringstream newSource; newSource << sourceHeader << std::endl; - newSource << std::endl << std::endl << "#include " << std::endl; + newSource << std::endl << std::endl << "#include " << std::endl; newSource << "namespace Opm {" << std::endl; newSource << "namespace ParserKeywords {" << std::endl; for (const auto& kw: keywords) @@ -266,7 +266,7 @@ void python::common::export_ParserKeywords(py::module& module) { for(const auto& kw_pair : loader) { const auto& first_char = kw_pair.first; - stream << "#include " << std::endl; + stream << "#include " << std::endl; } stream << R"( @@ -276,10 +276,10 @@ void python::common::export_ParserKeywords(py::module& module) { #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include auto unitSystem = Opm::UnitSystem::newMETRIC(); namespace Opm { diff --git a/src/opm/parser/eclipse/Generator/KeywordLoader.cpp b/src/opm/input/eclipse/Generator/KeywordLoader.cpp similarity index 96% rename from src/opm/parser/eclipse/Generator/KeywordLoader.cpp rename to src/opm/input/eclipse/Generator/KeywordLoader.cpp index f1ba582e3..8437ab1c4 100644 --- a/src/opm/parser/eclipse/Generator/KeywordLoader.cpp +++ b/src/opm/input/eclipse/Generator/KeywordLoader.cpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/Parser/ErrorGuard.cpp b/src/opm/input/eclipse/Parser/ErrorGuard.cpp similarity index 97% rename from src/opm/parser/eclipse/Parser/ErrorGuard.cpp rename to src/opm/input/eclipse/Parser/ErrorGuard.cpp index ee7764f78..d1fa5d30b 100644 --- a/src/opm/parser/eclipse/Parser/ErrorGuard.cpp +++ b/src/opm/input/eclipse/Parser/ErrorGuard.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/Parser/ParseContext.cpp b/src/opm/input/eclipse/Parser/ParseContext.cpp similarity index 98% rename from src/opm/parser/eclipse/Parser/ParseContext.cpp rename to src/opm/input/eclipse/Parser/ParseContext.cpp index d144ba5c0..2a6a4d245 100644 --- a/src/opm/parser/eclipse/Parser/ParseContext.cpp +++ b/src/opm/input/eclipse/Parser/ParseContext.cpp @@ -22,9 +22,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/opm/parser/eclipse/Parser/Parser.cpp b/src/opm/input/eclipse/Parser/Parser.cpp similarity index 98% rename from src/opm/parser/eclipse/Parser/Parser.cpp rename to src/opm/input/eclipse/Parser/Parser.cpp index cf170e1d8..d151f97fe 100644 --- a/src/opm/parser/eclipse/Parser/Parser.cpp +++ b/src/opm/input/eclipse/Parser/Parser.cpp @@ -35,25 +35,25 @@ #include #include #include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include "raw/RawConsts.hpp" diff --git a/src/opm/parser/eclipse/Parser/ParserEnums.cpp b/src/opm/input/eclipse/Parser/ParserEnums.cpp similarity index 98% rename from src/opm/parser/eclipse/Parser/ParserEnums.cpp rename to src/opm/input/eclipse/Parser/ParserEnums.cpp index 1d0ce03ea..29715a6df 100644 --- a/src/opm/parser/eclipse/Parser/ParserEnums.cpp +++ b/src/opm/input/eclipse/Parser/ParserEnums.cpp @@ -19,7 +19,7 @@ #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/Parser/ParserItem.cpp b/src/opm/input/eclipse/Parser/ParserItem.cpp similarity index 99% rename from src/opm/parser/eclipse/Parser/ParserItem.cpp rename to src/opm/input/eclipse/Parser/ParserItem.cpp index f2e2ec20e..2c08f5a84 100644 --- a/src/opm/parser/eclipse/Parser/ParserItem.cpp +++ b/src/opm/input/eclipse/Parser/ParserItem.cpp @@ -24,10 +24,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "raw/RawRecord.hpp" #include "raw/StarToken.hpp" diff --git a/src/opm/parser/eclipse/Parser/ParserKeyword.cpp b/src/opm/input/eclipse/Parser/ParserKeyword.cpp similarity index 99% rename from src/opm/parser/eclipse/Parser/ParserKeyword.cpp rename to src/opm/input/eclipse/Parser/ParserKeyword.cpp index 8a35caea1..96c7bb591 100644 --- a/src/opm/parser/eclipse/Parser/ParserKeyword.cpp +++ b/src/opm/input/eclipse/Parser/ParserKeyword.cpp @@ -26,11 +26,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "raw/RawConsts.hpp" #include "raw/RawKeyword.hpp" diff --git a/src/opm/parser/eclipse/Parser/ParserRecord.cpp b/src/opm/input/eclipse/Parser/ParserRecord.cpp similarity index 94% rename from src/opm/parser/eclipse/Parser/ParserRecord.cpp rename to src/opm/input/eclipse/Parser/ParserRecord.cpp index 8db6fc8d8..2f37b2c75 100644 --- a/src/opm/parser/eclipse/Parser/ParserRecord.cpp +++ b/src/opm/input/eclipse/Parser/ParserRecord.cpp @@ -19,12 +19,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/opm/parser/eclipse/Parser/createDefaultKeywordList.cpp b/src/opm/input/eclipse/Parser/createDefaultKeywordList.cpp similarity index 94% rename from src/opm/parser/eclipse/Parser/createDefaultKeywordList.cpp rename to src/opm/input/eclipse/Parser/createDefaultKeywordList.cpp index a1bfa53d0..9c654053d 100644 --- a/src/opm/parser/eclipse/Parser/createDefaultKeywordList.cpp +++ b/src/opm/input/eclipse/Parser/createDefaultKeywordList.cpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include int main(int argc, char ** argv) { diff --git a/src/opm/parser/eclipse/Parser/raw/RawConsts.hpp b/src/opm/input/eclipse/Parser/raw/RawConsts.hpp similarity index 100% rename from src/opm/parser/eclipse/Parser/raw/RawConsts.hpp rename to src/opm/input/eclipse/Parser/raw/RawConsts.hpp diff --git a/src/opm/parser/eclipse/Parser/raw/RawEnums.hpp b/src/opm/input/eclipse/Parser/raw/RawEnums.hpp similarity index 100% rename from src/opm/parser/eclipse/Parser/raw/RawEnums.hpp rename to src/opm/input/eclipse/Parser/raw/RawEnums.hpp diff --git a/src/opm/parser/eclipse/Parser/raw/RawKeyword.cpp b/src/opm/input/eclipse/Parser/raw/RawKeyword.cpp similarity index 99% rename from src/opm/parser/eclipse/Parser/raw/RawKeyword.cpp rename to src/opm/input/eclipse/Parser/raw/RawKeyword.cpp index e28669373..16ec9f892 100644 --- a/src/opm/parser/eclipse/Parser/raw/RawKeyword.cpp +++ b/src/opm/input/eclipse/Parser/raw/RawKeyword.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include "RawConsts.hpp" diff --git a/src/opm/parser/eclipse/Parser/raw/RawKeyword.hpp b/src/opm/input/eclipse/Parser/raw/RawKeyword.hpp similarity index 100% rename from src/opm/parser/eclipse/Parser/raw/RawKeyword.hpp rename to src/opm/input/eclipse/Parser/raw/RawKeyword.hpp diff --git a/src/opm/parser/eclipse/Parser/raw/RawRecord.cpp b/src/opm/input/eclipse/Parser/raw/RawRecord.cpp similarity index 100% rename from src/opm/parser/eclipse/Parser/raw/RawRecord.cpp rename to src/opm/input/eclipse/Parser/raw/RawRecord.cpp diff --git a/src/opm/parser/eclipse/Parser/raw/RawRecord.hpp b/src/opm/input/eclipse/Parser/raw/RawRecord.hpp similarity index 100% rename from src/opm/parser/eclipse/Parser/raw/RawRecord.hpp rename to src/opm/input/eclipse/Parser/raw/RawRecord.hpp diff --git a/src/opm/parser/eclipse/Parser/raw/StarToken.cpp b/src/opm/input/eclipse/Parser/raw/StarToken.cpp similarity index 99% rename from src/opm/parser/eclipse/Parser/raw/StarToken.cpp rename to src/opm/input/eclipse/Parser/raw/StarToken.cpp index f7679a478..0d0eb18d4 100644 --- a/src/opm/parser/eclipse/Parser/raw/StarToken.cpp +++ b/src/opm/input/eclipse/Parser/raw/StarToken.cpp @@ -26,7 +26,7 @@ #include -#include +#include #include "StarToken.hpp" diff --git a/src/opm/parser/eclipse/Parser/raw/StarToken.hpp b/src/opm/input/eclipse/Parser/raw/StarToken.hpp similarity index 98% rename from src/opm/parser/eclipse/Parser/raw/StarToken.hpp rename to src/opm/input/eclipse/Parser/raw/StarToken.hpp index 3f9dfd273..3fbaf115f 100644 --- a/src/opm/parser/eclipse/Parser/raw/StarToken.hpp +++ b/src/opm/input/eclipse/Parser/raw/StarToken.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include namespace Opm { bool isStarToken(const std::string_view& token, diff --git a/src/opm/parser/eclipse/Python/EmbedModule.hpp b/src/opm/input/eclipse/Python/EmbedModule.hpp similarity index 100% rename from src/opm/parser/eclipse/Python/EmbedModule.hpp rename to src/opm/input/eclipse/Python/EmbedModule.hpp diff --git a/src/opm/parser/eclipse/Python/PyRunModule.cpp b/src/opm/input/eclipse/Python/PyRunModule.cpp similarity index 91% rename from src/opm/parser/eclipse/Python/PyRunModule.cpp rename to src/opm/input/eclipse/Python/PyRunModule.cpp index 1301db903..35131d26f 100644 --- a/src/opm/parser/eclipse/Python/PyRunModule.cpp +++ b/src/opm/input/eclipse/Python/PyRunModule.cpp @@ -21,11 +21,11 @@ error BUG: The PyRunModule.hpp header should *not* be included in a configuratio #endif -#include -#include -#include +#include +#include +#include -#include "src/opm/parser/eclipse/Python/PyRunModule.hpp" +#include "src/opm/input/eclipse/Python/PyRunModule.hpp" #include diff --git a/src/opm/parser/eclipse/Python/PyRunModule.hpp b/src/opm/input/eclipse/Python/PyRunModule.hpp similarity index 96% rename from src/opm/parser/eclipse/Python/PyRunModule.hpp rename to src/opm/input/eclipse/Python/PyRunModule.hpp index 36dd1a817..78f185db7 100644 --- a/src/opm/parser/eclipse/Python/PyRunModule.hpp +++ b/src/opm/input/eclipse/Python/PyRunModule.hpp @@ -29,7 +29,7 @@ namespace py = pybind11; #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/Python/Python.cpp b/src/opm/input/eclipse/Python/Python.cpp similarity index 89% rename from src/opm/parser/eclipse/Python/Python.cpp rename to src/opm/input/eclipse/Python/Python.cpp index bc8bf5089..47c025a10 100644 --- a/src/opm/parser/eclipse/Python/Python.cpp +++ b/src/opm/input/eclipse/Python/Python.cpp @@ -17,9 +17,9 @@ along with OPM. If not, see . */ -#include -#include -#include +#include +#include +#include #include "PythonInterp.hpp" namespace Opm { diff --git a/src/opm/parser/eclipse/Python/PythonInterp.cpp b/src/opm/input/eclipse/Python/PythonInterp.cpp similarity index 96% rename from src/opm/parser/eclipse/Python/PythonInterp.cpp rename to src/opm/input/eclipse/Python/PythonInterp.cpp index 4ce2241b1..b67134322 100644 --- a/src/opm/parser/eclipse/Python/PythonInterp.cpp +++ b/src/opm/input/eclipse/Python/PythonInterp.cpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include #include "python/cxx/export.hpp" diff --git a/src/opm/parser/eclipse/Python/PythonInterp.hpp b/src/opm/input/eclipse/Python/PythonInterp.hpp similarity index 89% rename from src/opm/parser/eclipse/Python/PythonInterp.hpp rename to src/opm/input/eclipse/Python/PythonInterp.hpp index e8b4a28a8..96741d29f 100644 --- a/src/opm/parser/eclipse/Python/PythonInterp.hpp +++ b/src/opm/input/eclipse/Python/PythonInterp.hpp @@ -25,10 +25,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef EMBEDDED_PYTHON diff --git a/src/opm/parser/eclipse/Units/Dimension.cpp b/src/opm/input/eclipse/Units/Dimension.cpp similarity index 98% rename from src/opm/parser/eclipse/Units/Dimension.cpp rename to src/opm/input/eclipse/Units/Dimension.cpp index a37edd451..d6d9682ec 100644 --- a/src/opm/parser/eclipse/Units/Dimension.cpp +++ b/src/opm/input/eclipse/Units/Dimension.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/parser/eclipse/Units/UnitSystem.cpp b/src/opm/input/eclipse/Units/UnitSystem.cpp similarity index 99% rename from src/opm/parser/eclipse/Units/UnitSystem.cpp rename to src/opm/input/eclipse/Units/UnitSystem.cpp index f9546dc55..e1174bf72 100644 --- a/src/opm/parser/eclipse/Units/UnitSystem.cpp +++ b/src/opm/input/eclipse/Units/UnitSystem.cpp @@ -17,11 +17,11 @@ along with OPM. If not, see . */ -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/src/opm/parser/eclipse/Utility/Functional.cpp b/src/opm/input/eclipse/Utility/Functional.cpp similarity index 97% rename from src/opm/parser/eclipse/Utility/Functional.cpp rename to src/opm/input/eclipse/Utility/Functional.cpp index efa60b910..082295612 100644 --- a/src/opm/parser/eclipse/Utility/Functional.cpp +++ b/src/opm/input/eclipse/Utility/Functional.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#include +#include namespace Opm { namespace fun { diff --git a/src/opm/parser/eclipse/keyword_list.argv.in b/src/opm/input/eclipse/keyword_list.argv.in similarity index 100% rename from src/opm/parser/eclipse/keyword_list.argv.in rename to src/opm/input/eclipse/keyword_list.argv.in diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTION b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTION similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTION rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTION diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTIONG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTIONG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTIONG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTIONG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTIONR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTIONR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTIONR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTIONR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTIONS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTIONS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTIONS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTIONS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTIONW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTIONW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTIONW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTIONW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTIONX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTIONX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTIONX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTIONX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTPARAM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTPARAM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ACTPARAM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ACTPARAM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ADD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ADD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADDREG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ADDREG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADDREG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ADDREG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADDZCORN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ADDZCORN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADDZCORN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ADDZCORN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADSALNOD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ADSALNOD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADSALNOD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ADSALNOD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADSORP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ADSORP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ADSORP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ADSORP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AITS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AITS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AITS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AITS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AITSOFF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AITSOFF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AITSOFF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AITSOFF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALKADS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ALKADS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALKADS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ALKADS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALKALINE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ALKALINE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALKALINE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ALKALINE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALKROCK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ALKROCK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALKROCK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ALKROCK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ALL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ALL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALPOLADS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ALPOLADS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALPOLADS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ALPOLADS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALSURFAD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ALSURFAD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALSURFAD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ALSURFAD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALSURFST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ALSURFST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/ALSURFST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/ALSURFST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AMALGAM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AMALGAM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AMALGAM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AMALGAM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/API b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/API similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/API rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/API diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/APIGROUP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/APIGROUP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/APIGROUP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/APIGROUP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/APILIM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/APILIM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/APILIM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/APILIM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/APIVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/APIVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/APIVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/APIVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQANCONL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQANCONL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQANCONL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQANCONL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQANNC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQANNC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQANNC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQANNC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQANTRC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQANTRC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQANTRC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQANTRC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUALIST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUALIST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUALIST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUALIST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUANCON b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUANCON similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUANCON rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUANCON diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUCHGAS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUCHGAS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUCHGAS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUCHGAS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUCHWAT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUCHWAT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUCHWAT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUCHWAT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUCON b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUCON similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUCON rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUCON diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUCT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUCT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUCT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUCT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUCWFAC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUCWFAC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUCWFAC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUCWFAC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUFET b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUFET similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUFET rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUFET diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUFETP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUFETP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUFETP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUFETP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUFLUX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUFLUX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUFLUX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUFLUX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_ANALYTIC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_ANALYTIC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_ANALYTIC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_ANALYTIC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_ANALYTIC_NAMED b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_ANALYTIC_NAMED similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_ANALYTIC_NAMED rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_ANALYTIC_NAMED diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_NUMERIC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_NUMERIC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_NUMERIC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUIFER_PROBE_NUMERIC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUNNC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUNNC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUNNC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUNNC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUTAB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUTAB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AQUTAB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AQUTAB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AUTOCOAR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AUTOCOAR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AUTOCOAR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AUTOCOAR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AUTOREF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AUTOREF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/A/AUTOREF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/A/AUTOREF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BDENSITY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BDENSITY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BDENSITY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BDENSITY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BGGI b/src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BGGI similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BGGI rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BGGI diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BIGMODEL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BIGMODEL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BIGMODEL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BIGMODEL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BLACKOIL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BLACKOIL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BLACKOIL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BLACKOIL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BLOCK_PROBE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BLOCK_PROBE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BLOCK_PROBE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BLOCK_PROBE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BOGI b/src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BOGI similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BOGI rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BOGI diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BOUNDARY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BOUNDARY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BOUNDARY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BOUNDARY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BOX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BOX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BOX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BOX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BPARA b/src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BPARA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BPARA rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BPARA diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BPIDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BPIDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BPIDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BPIDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BRANPROP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BRANPROP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BRANPROP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BRANPROP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BRINE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BRINE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BRINE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BRINE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BTOBALFA b/src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BTOBALFA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BTOBALFA rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BTOBALFA diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BTOBALFV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BTOBALFV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BTOBALFV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/B/BTOBALFV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CALTRAC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CALTRAC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CALTRAC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CALTRAC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CARFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CARFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CARFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CARFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CART b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CART similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CART rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CART diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CBMOPTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CBMOPTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CBMOPTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CBMOPTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CECON b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CECON similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CECON rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CECON diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CECONT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CECONT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CECONT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CECONT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COAL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COAL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COAL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COAL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COALADS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COALADS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COALADS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COALADS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COALNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COALNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COALNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COALNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COALPP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COALPP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COALPP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COALPP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COARSEN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COARSEN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COARSEN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COARSEN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COLLAPSE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COLLAPSE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COLLAPSE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COLLAPSE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COLUMNS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COLUMNS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COLUMNS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COLUMNS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPDAT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPDAT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPDAT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPDAT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPDATX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPDATX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPDATX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPDATX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPFLSH b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPFLSH similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPFLSH rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPFLSH diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPIMB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPIMB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPIMB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPIMB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPINJK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPINJK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPINJK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPINJK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPLMPL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPLMPL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPLMPL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPLMPL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPLUMP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPLUMP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPLUMP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPLUMP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPOFF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPOFF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPOFF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPOFF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPORD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPORD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPORD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPORD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPRIV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPRIV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPRIV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPRIV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPRP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPRP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPRP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPRP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPRPL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPRPL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPRPL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPRPL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPSEGL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPSEGL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPSEGL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPSEGL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPSEGS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPSEGS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPSEGS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPSEGS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPVE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPVE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPVE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPVE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPVEL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPVEL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPVEL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPVEL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CONNECTION_PROBE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CONNECTION_PROBE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CONNECTION_PROBE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CONNECTION_PROBE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COORD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COORD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COORD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COORD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COORDSYS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COORDSYS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COORDSYS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COORDSYS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COPY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COPY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COPY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COPY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COPYBOX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COPYBOX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COPYBOX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COPYBOX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COPYREG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COPYREG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COPYREG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COPYREG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CPIFACT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CPIFACT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CPIFACT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CPIFACT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CPIFACTL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CPIFACTL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CPIFACTL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CPIFACTL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CPR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CPR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CPR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CPR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CRITPERM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CRITPERM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CRITPERM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CRITPERM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CSKIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CSKIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CSKIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/C/CSKIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DATE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DATE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATES b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DATES similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATES rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DATES diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DATUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DATUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATUMR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DATUMR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATUMR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DATUMR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATUMRX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DATUMRX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DATUMRX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DATUMRX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DCQDEFN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DCQDEFN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DCQDEFN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DCQDEFN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEBUG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DEBUG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEBUG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DEBUG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DELAYACT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DELAYACT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DELAYACT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DELAYACT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DENSITY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DENSITY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DENSITY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DENSITY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEPTH b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DEPTH similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEPTH rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DEPTH diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEPTHTAB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DEPTHTAB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEPTHTAB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DEPTHTAB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEPTHZ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DEPTHZ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEPTHZ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DEPTHZ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIAGDISP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIAGDISP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIAGDISP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIAGDISP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFCOAL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFCOAL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFCOAL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFCOAL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFDP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFDP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFDP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFDP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFMMF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFMMF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFMMF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFMMF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFMR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFMR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFMR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFMR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFMTHT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFMTHT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFMTHT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFMTHT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFMX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFMX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFMX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFMX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFMY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFMY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFMY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFMY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFMZ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFMZ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFMZ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFMZ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFTHT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFTHT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFTHT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFTHT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFUSE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFUSE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFUSE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFUSE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFZ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFZ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFZ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIFFZ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIMENS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIMENS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIMENS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIMENS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIMPES b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIMPES similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIMPES rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIMPES diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIMPLICT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIMPLICT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIMPLICT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DIMPLICT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DISGAS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DISGAS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DISGAS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DISGAS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DISPDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DISPDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DISPDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DISPDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DISPERSE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DISPERSE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DISPERSE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DISPERSE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DOMAINS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DOMAINS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DOMAINS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DOMAINS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPGRID b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DPGRID similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPGRID rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DPGRID diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPKRMOD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DPKRMOD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPKRMOD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DPKRMOD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DPNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DPNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRILPRI b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DRILPRI similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRILPRI rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DRILPRI diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRSDT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DRSDT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRSDT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DRSDT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRSDTR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DRSDTR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRSDTR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DRSDTR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DRV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DRV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRVDT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DRVDT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRVDT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DRVDT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRVDTR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DRVDTR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRVDTR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DRVDTR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DSPDEINT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DSPDEINT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DSPDEINT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DSPDEINT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DTHETA b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DTHETA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DTHETA rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DTHETA diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DTHETAV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DTHETAV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DTHETAV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DTHETAV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUALPERM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DUALPERM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUALPERM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DUALPERM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUALPORO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DUALPORO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUALPORO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DUALPORO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUMPCUPL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DUMPCUPL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUMPCUPL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DUMPCUPL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUMPFLUX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DUMPFLUX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUMPFLUX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DUMPFLUX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DXV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DXV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DXV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DXV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DYNAMICR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DYNAMICR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DYNAMICR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DYNAMICR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DYNRDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DYNRDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DYNRDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DYNRDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DYV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DYV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DYV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DYV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DZ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DZ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMATRIX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DZMATRIX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMATRIX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DZMATRIX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMTRX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DZMTRX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMTRX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DZMTRX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMTRXV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DZMTRXV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMTRXV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DZMTRXV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZNET b/src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DZNET similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZNET rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/D/DZNET diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ECHO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ECHO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ECHO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ECHO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ECLMC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ECLMC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ECLMC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ECLMC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EDIT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EDIT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EDIT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EDIT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EDITNNC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EDITNNC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EDITNNC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EDITNNC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EDITNNCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EDITNNCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EDITNNCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EDITNNCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EHYSTR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EHYSTR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EHYSTR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EHYSTR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EHYSTRR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EHYSTRR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EHYSTRR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EHYSTRR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/END b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/END similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/END rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/END diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDACTIO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDACTIO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDACTIO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDACTIO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDBOX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDBOX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDBOX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDBOX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDDYN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDDYN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDDYN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDDYN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDINC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDINC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDINC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDINC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDPOINT_SPECIFIERS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDPOINT_SPECIFIERS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDPOINT_SPECIFIERS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDPOINT_SPECIFIERS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDSCALE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDSCALE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDSCALE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDSCALE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDSKIP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDSKIP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENDSKIP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENDSKIP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENKRVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENKRVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENKRVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENKRVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENPCVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENPCVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENPCVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENPCVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENPTVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENPTVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENPTVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENPTVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENSPCVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENSPCVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ENSPCVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ENSPCVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EPSDBGS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EPSDBGS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EPSDBGS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EPSDBGS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EPSDEBUG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EPSDEBUG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EPSDEBUG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EPSDEBUG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQLDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQLDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQLDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQLDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQLNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQLNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQLNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQLNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQLOPTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQLOPTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQLOPTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQLOPTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQLZCORN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQLZCORN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQLZCORN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQLZCORN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQUALREG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQUALREG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQUALREG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQUALREG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQUALS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQUALS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQUALS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQUALS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQUIL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQUIL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EQUIL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQUIL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ESSNODE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ESSNODE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/ESSNODE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/ESSNODE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXCAVATE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EXCAVATE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXCAVATE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EXCAVATE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXCEL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EXCEL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXCEL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EXCEL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXTFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EXTFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXTFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EXTFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXTHOST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EXTHOST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXTHOST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EXTHOST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXTRAPMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EXTRAPMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXTRAPMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EXTRAPMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXTREPGL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EXTREPGL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/E/EXTREPGL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EXTREPGL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FAULTDIM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FAULTDIM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FAULTDIM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FAULTDIM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FAULTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FAULTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FAULTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FAULTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FBHPDEF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FBHPDEF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FBHPDEF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FBHPDEF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FHERCHBL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FHERCHBL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FHERCHBL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FHERCHBL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIELD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIELD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIELD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIELD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIELD_PROBE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIELD_PROBE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIELD_PROBE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIELD_PROBE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FILEUNIT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FILEUNIT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FILEUNIT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FILEUNIT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FILLEPS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FILLEPS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FILLEPS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FILLEPS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIPNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIPNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIPNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIPNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIPOWG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIPOWG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIPOWG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIPOWG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIPSEP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIPSEP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIPSEP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIPSEP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIP_PROBE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIP_PROBE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIP_PROBE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIP_PROBE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FLUXNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FLUXNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FLUXNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FLUXNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FLUXREG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FLUXREG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FLUXREG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FLUXREG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FLUXTYPE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FLUXTYPE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FLUXTYPE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FLUXTYPE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FMTHMD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FMTHMD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FMTHMD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FMTHMD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FMTIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FMTIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FMTIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FMTIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FMTOUT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FMTOUT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FMTOUT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FMTOUT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FMWSET b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FMWSET similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FMWSET rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FMWSET diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMADS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMADS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMADS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMADS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMDCYO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMDCYO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMDCYO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMDCYO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMDCYW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMDCYW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMDCYW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMDCYW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMFCN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMFCN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMFCN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMFCN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMFRM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMFRM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMFRM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMFRM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMFSC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMFSC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMFSC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMFSC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMFSO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMFSO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMFSO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMFSO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMFST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMFST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMFST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMFST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMFSW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMFSW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMFSW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMFSW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMMOB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMMOB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMMOB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMMOB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMMOBP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMMOBP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMMOBP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMMOBP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMMOBS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMMOBS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMMOBS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMMOBS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMOPTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMOPTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMOPTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMOPTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMROCK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMROCK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FOAMROCK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FOAMROCK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FORMFEED b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FORMFEED similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FORMFEED rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FORMFEED diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FRICTION b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FRICTION similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FRICTION rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FRICTION diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FULLIMP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FULLIMP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FULLIMP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FULLIMP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GAS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GAS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GAS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GAS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASBEGIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASBEGIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASBEGIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASBEGIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASCONC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASCONC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASCONC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASCONC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASEND b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASEND similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASEND rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASEND diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASFCOMP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASFCOMP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASFCOMP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASFCOMP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASFDECR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASFDECR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASFDECR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASFDECR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASFDELC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASFDELC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASFDELC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASFDELC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASFIELD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASFIELD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASFIELD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASFIELD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASFTARG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASFTARG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASFTARG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASFTARG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASMONTH b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASMONTH similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASMONTH rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASMONTH diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASPERIO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASPERIO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASPERIO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASPERIO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASSATC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASSATC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASSATC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASSATC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASYEAR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASYEAR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GASYEAR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GASYEAR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCALECON b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCALECON similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCALECON rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCALECON diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONCAL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONCAL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONCAL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONCAL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONENG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONENG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONENG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONENG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONINJE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONINJE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONINJE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONINJE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONPRI b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONPRI similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONPRI rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONPRI diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONPROD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONPROD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONPROD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONPROD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONSALE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONSALE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONSALE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONSALE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONSUMP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONSUMP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONSUMP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONSUMP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONTOL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONTOL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONTOL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCONTOL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCUTBACK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCUTBACK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCUTBACK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCUTBACK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCUTBACT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCUTBACT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCUTBACT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCUTBACT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GCVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GDCQ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GDCQ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GDCQ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GDCQ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GDCQECON b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GDCQECON similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GDCQECON rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GDCQECON diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GDFILE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GDFILE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GDFILE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GDFILE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GDORIENT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GDORIENT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GDORIENT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GDORIENT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GDRILPOT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GDRILPOT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GDRILPOT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GDRILPOT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GECON b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GECON similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GECON rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GECON diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GECONT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GECONT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GECONT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GECONT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GEFAC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GEFAC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GEFAC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GEFAC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GETDATA b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GETDATA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GETDATA rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GETDATA diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GETGLOB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GETGLOB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GETGLOB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GETGLOB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GI b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GI similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GI rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GI diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GIALL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GIALL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GIALL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GIALL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GIMODEL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GIMODEL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GIMODEL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GIMODEL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GINODE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GINODE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GINODE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GINODE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GLIFTLIM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GLIFTLIM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GLIFTLIM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GLIFTLIM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GLIFTOPT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GLIFTOPT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GLIFTOPT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GLIFTOPT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GMWSET b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GMWSET similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GMWSET rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GMWSET diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GNETDP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GNETDP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GNETDP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GNETDP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GNETINJE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GNETINJE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GNETINJE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GNETINJE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GNETPUMP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GNETPUMP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GNETPUMP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GNETPUMP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GPMAINT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GPMAINT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GPMAINT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GPMAINT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRADGRUP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRADGRUP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRADGRUP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRADGRUP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRADRESV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRADRESV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRADRESV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRADRESV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRADRFT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRADRFT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRADRFT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRADRFT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRADWELL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRADWELL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRADWELL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRADWELL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRAVCONS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRAVCONS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRAVCONS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRAVCONS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRAVDR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRAVDR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRAVDR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRAVDR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRAVDRB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRAVDRB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRAVDRB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRAVDRB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRAVDRM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRAVDRM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRAVDRM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRAVDRM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRAVITY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRAVITY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRAVITY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRAVITY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRDREACH b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRDREACH similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRDREACH rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRDREACH diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRID b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRID similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRID rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRID diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRIDFILE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRIDFILE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRIDFILE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRIDFILE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRIDOPTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRIDOPTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRIDOPTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRIDOPTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRIDUNIT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRIDUNIT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRIDUNIT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRIDUNIT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GROUP_PROBE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GROUP_PROBE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GROUP_PROBE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GROUP_PROBE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPMAST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRUPMAST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPMAST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRUPMAST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPNET b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRUPNET similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPNET rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRUPNET diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPRIG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRUPRIG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPRIG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRUPRIG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPSLAV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRUPSLAV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPSLAV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRUPSLAV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPTARG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRUPTARG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPTARG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRUPTARG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPTREE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRUPTREE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GRUPTREE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GRUPTREE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GSATINJE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GSATINJE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GSATINJE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GSATINJE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GSATPROD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GSATPROD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GSATPROD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GSATPROD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GSEPCOND b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GSEPCOND similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GSEPCOND rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GSEPCOND diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GSSCPTST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GSSCPTST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GSSCPTST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GSSCPTST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GSWINGF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GSWINGF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GSWINGF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GSWINGF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GTADD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GTADD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GTADD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GTADD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GTMULT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GTMULT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GTMULT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GTMULT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GUIDECAL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GUIDECAL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GUIDECAL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GUIDECAL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GUIDERAT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GUIDERAT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GUIDERAT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GUIDERAT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GUPFREQ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GUPFREQ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GUPFREQ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GUPFREQ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GWRTWCV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GWRTWCV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GWRTWCV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/G/GWRTWCV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HALFTRAN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HALFTRAN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HALFTRAN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HALFTRAN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HAxxxxxx b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HAxxxxxx similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HAxxxxxx rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HAxxxxxx diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HBNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HBNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HBNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HBNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HDISP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HDISP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HDISP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HDISP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMAQUCT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMAQUCT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMAQUCT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMAQUCT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMAQUFET b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMAQUFET similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMAQUFET rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMAQUFET diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMAQUNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMAQUNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMAQUNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMAQUNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMFAULTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMFAULTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMFAULTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMFAULTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMMLAQUN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMMLAQUN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMMLAQUN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMMLAQUN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMMLCTAQ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMMLCTAQ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMMLCTAQ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMMLCTAQ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMMLFTAQ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMMLFTAQ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMMLFTAQ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMMLFTAQ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMMLTWCN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMMLTWCN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMMLTWCN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMMLTWCN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMMULTFT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMMULTFT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMMULTFT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMMULTFT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMMULTSG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMMULTSG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMMULTSG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMMULTSG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMMULTxx b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMMULTxx similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMMULTxx rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMMULTxx diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMPROPS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMPROPS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMPROPS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMPROPS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMROCK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMROCK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMROCK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMROCK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMROCKT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMROCKT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMROCKT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMROCKT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMRREF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMRREF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMRREF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMRREF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMWELCON b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMWELCON similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMWELCON rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMWELCON diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMWPIMLT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMWPIMLT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMWPIMLT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMWPIMLT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMxxxxxx b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMxxxxxx similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HMxxxxxx rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HMxxxxxx diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HRFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HRFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HRFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HRFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWKRO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWKRO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWKRO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWKRO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWKRORG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWKRORG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWKRORG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWKRORG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWKRORW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWKRORW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWKRORW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWKRORW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWKRW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWKRW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWKRW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWKRW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWKRWR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWKRWR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWKRWR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWKRWR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWPCW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWPCW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWPCW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWPCW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWSNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWSNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWSNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWSNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWSOGCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWSOGCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWSOGCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWSOGCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWSOWCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWSOWCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWSOWCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWSOWCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWSWCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWSWCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWSWCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWSWCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWSWL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWSWL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWSWL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWSWL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWSWLPC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWSWLPC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWSWLPC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWSWLPC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWSWU b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWSWU similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HWSWU rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HWSWU diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HXFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HXFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HXFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HXFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HYDRHEAD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HYDRHEAD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HYDRHEAD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HYDRHEAD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HYFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HYFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HYFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HYFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HYMOBGDR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HYMOBGDR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HYMOBGDR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HYMOBGDR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HYST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HYST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HYST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HYST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HYSTCHCK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HYSTCHCK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HYSTCHCK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HYSTCHCK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HZFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HZFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/H/HZFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/H/HZFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IHOST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IHOST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IHOST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IHOST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMBNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMBNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMBNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMBNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMBNUMMF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMBNUMMF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMBNUMMF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMBNUMMF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMKRVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMKRVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMKRVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMKRVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMPCVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMPCVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMPCVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMPCVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMPES b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMPES similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMPES rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMPES diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMPLICIT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMPLICIT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMPLICIT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMPLICIT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMPORT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMPORT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMPORT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMPORT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMPTVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMPTVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMPTVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMPTVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMSPCVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMSPCVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IMSPCVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IMSPCVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/INCLUDE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/INCLUDE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/INCLUDE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/INCLUDE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/INIT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/INIT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/INIT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/INIT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/INRAD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/INRAD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/INRAD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/INRAD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/INSPEC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/INSPEC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/INSPEC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/INSPEC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/INTPC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/INTPC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/INTPC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/INTPC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IONROCK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IONROCK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IONROCK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IONROCK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IONXROCK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IONXROCK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IONXROCK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IONXROCK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IONXSURF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IONXSURF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IONXSURF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IONXSURF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IPCG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IPCG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IPCG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IPCG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IPCW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IPCW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/IPCW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/IPCW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISGCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISGCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISGCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISGCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISGL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISGL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISGL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISGL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISGLPC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISGLPC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISGLPC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISGLPC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISGU b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISGU similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISGU rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISGU diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISOGCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISOGCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISOGCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISOGCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISOLNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISOLNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISOLNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISOLNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISOWCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISOWCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISOWCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISOWCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISWCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISWCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISWCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISWCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISWL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISWL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISWL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISWL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISWLPC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISWLPC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISWLPC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISWLPC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISWU b/src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISWU similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/I/ISWU rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/I/ISWU diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/J/JFUNC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/J/JFUNC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/J/JFUNC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/J/JFUNC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/J/JFUNCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/J/JFUNCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/J/JFUNCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/J/JFUNCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/K/KRNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/K/KRNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/K/KRNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/K/KRNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/K/KRNUMMF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/K/KRNUMMF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/K/KRNUMMF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/K/KRNUMMF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LAB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LAB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LAB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LAB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LANGMPL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LANGMPL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LANGMPL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LANGMPL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LANGMUIR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LANGMUIR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LANGMUIR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LANGMUIR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LANGSOLV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LANGSOLV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LANGSOLV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LANGSOLV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LCUNIT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LCUNIT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LCUNIT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LCUNIT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LGR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LGR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LGR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LGR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LGRCOPY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LGRCOPY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LGRCOPY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LGRCOPY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LGRFREE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LGRFREE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LGRFREE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LGRFREE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LGRLOCK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LGRLOCK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LGRLOCK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LGRLOCK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LGROFF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LGROFF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LGROFF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LGROFF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LGRON b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LGRON similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LGRON rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LGRON diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LICENSES b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LICENSES similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LICENSES rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LICENSES diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LIFTOPT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LIFTOPT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LIFTOPT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LIFTOPT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LINCOM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LINCOM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LINCOM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LINCOM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LINKPERM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LINKPERM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LINKPERM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LINKPERM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LKRO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LKRO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LKRO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LKRO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LKRORG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LKRORG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LKRORG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LKRORG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LKRORW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LKRORW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LKRORW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LKRORW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LKRW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LKRW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LKRW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LKRW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LKRWR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LKRWR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LKRWR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LKRWR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LOAD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LOAD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LOAD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LOAD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LOWSALT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LOWSALT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LOWSALT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LOWSALT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LPCW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LPCW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LPCW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LPCW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSALTFNC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSALTFNC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSALTFNC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSALTFNC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSLTWNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSLTWNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSLTWNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSLTWNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSOGCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSOGCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSOGCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSOGCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSOWCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSOWCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSOWCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSOWCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSWCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSWCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSWCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSWCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSWL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSWL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSWL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSWL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSWLPC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSWLPC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSWLPC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSWLPC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSWU b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSWU similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LSWU rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LSWU diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LTOSIGMA b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LTOSIGMA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LTOSIGMA rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LTOSIGMA diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWKRO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWKRO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWKRO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWKRO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWKRORG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWKRORG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWKRORG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWKRORG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWKRORW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWKRORW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWKRORW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWKRORW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWKRW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWKRW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWKRW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWKRW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWKRWR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWKRWR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWKRWR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWKRWR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWPCW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWPCW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWPCW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWPCW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSLTNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSLTNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSLTNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSLTNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSOGCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSOGCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSOGCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSOGCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSOWCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSOWCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSOWCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSOWCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSWCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSWCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSWCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSWCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSWL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSWL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSWL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSWL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSWLPC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSWLPC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSWLPC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSWLPC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSWU b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSWU similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LWSWU rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LWSWU diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LXFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LXFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LXFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LXFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LYFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LYFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LYFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LYFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LZ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LZ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LZ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LZ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LZFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LZFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LZFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LZFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MAPAXES b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MAPAXES similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MAPAXES rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MAPAXES diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MAPUNITS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MAPUNITS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MAPUNITS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MAPUNITS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MASSFLOW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MASSFLOW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MASSFLOW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MASSFLOW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MATCORR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MATCORR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MATCORR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MATCORR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MAXVALUE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MAXVALUE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MAXVALUE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MAXVALUE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MEMORY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MEMORY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MEMORY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MEMORY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MESSAGE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MESSAGE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MESSAGE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MESSAGE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MESSAGES b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MESSAGES similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MESSAGES rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MESSAGES diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MESSOPTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MESSOPTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MESSOPTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MESSOPTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MESSSRVC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MESSSRVC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MESSSRVC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MESSSRVC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/METRIC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/METRIC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/METRIC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/METRIC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINNNCT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINNNCT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINNNCT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINNNCT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINPORV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPORV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINPORV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPORV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINPV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINPV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINPVV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPVV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINPVV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPVV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINVALUE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINVALUE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINVALUE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINVALUE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MISC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MISC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MISC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MISC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MISCIBLE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MISCIBLE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MISCIBLE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MISCIBLE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MISCNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MISCNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MISCNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MISCNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MLANG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MLANG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MLANG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MLANG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MLANGSLV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MLANGSLV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MLANGSLV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MLANGSLV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MONITOR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MONITOR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MONITOR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MONITOR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MPFANUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MPFANUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MPFANUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MPFANUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MPFNNC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MPFNNC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MPFNNC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MPFNNC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MSFN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MSFN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MSFN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MSFN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MSGFILE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MSGFILE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MSGFILE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MSGFILE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MSUM_PROBE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MSUM_PROBE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MSUM_PROBE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MSUM_PROBE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULSGGD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULSGGD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULSGGD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULSGGD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULSGGDV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULSGGDV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULSGGDV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULSGGDV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTFLT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTFLT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTFLT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTFLT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTIPLY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTIPLY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTIPLY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTIPLY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTIREG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTIREG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTIREG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTIREG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTOUT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTOUT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTOUT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTOUT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTOUTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTOUTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTOUTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTOUTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTPV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTPV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTPV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTPV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTREAL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTREAL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTREAL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTREAL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTREGD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTREGD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTREGD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTREGD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTREGH b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTREGH similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTREGH rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTREGH diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTREGP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTREGP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTREGP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTREGP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTREGT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTREGT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTREGT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTREGT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTSIG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTSIG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTSIG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTSIG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTSIGV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTSIGV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULTSIGV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULTSIGV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULT_XYZ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULT_XYZ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MULT_XYZ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MULT_XYZ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NARROW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NARROW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NARROW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NARROW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NCONSUMP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NCONSUMP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NCONSUMP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NCONSUMP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NEFAC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NEFAC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NEFAC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NEFAC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NETBALAN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NETBALAN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NETBALAN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NETBALAN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NETCOMPA b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NETCOMPA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NETCOMPA rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NETCOMPA diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NETWORK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NETWORK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NETWORK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NETWORK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NEWTRAN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NEWTRAN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NEWTRAN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NEWTRAN diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NEXT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NEXT new file mode 100644 index 000000000..6e8e75ad1 --- /dev/null +++ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NEXT @@ -0,0 +1,19 @@ +{ + "name": "NEXT", + "sections": [ + "SCHEDULE" + ], + "size": 1, + "items": [ + { + "name": "MAX_STEP", + "value_type": "DOUBLE", + "dimension": "Time" + }, + { + "name": "APPLY_TO_ALL", + "value_type": "STRING", + "default": "NO" + } + ] +} diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NEXTSTEP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NEXTSTEP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NEXTSTEP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NEXTSTEP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NEXTSTPL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NEXTSTPL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NEXTSTPL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NEXTSTPL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NINENUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NINENUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NINENUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NINENUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NINEPOIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NINEPOIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NINEPOIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NINEPOIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NMATOPTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NMATOPTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NMATOPTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NMATOPTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NMATRIX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NMATRIX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NMATRIX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NMATRIX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NMESSAGE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NMESSAGE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NMESSAGE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NMESSAGE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NNC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NNC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NNC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NNC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NNEWTF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NNEWTF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NNEWTF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NNEWTF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOCASC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOCASC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOCASC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOCASC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NODEPROP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NODEPROP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NODEPROP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NODEPROP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NODPPM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NODPPM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NODPPM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NODPPM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOECHO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOECHO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOECHO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOECHO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOGGF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOGGF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOGGF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOGGF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOHMD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOHMD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOHMD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOHMD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOHMO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOHMO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOHMO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOHMO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOHYST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOHYST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOHYST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOHYST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOINSPEC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOINSPEC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOINSPEC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOINSPEC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOMONITO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOMONITO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOMONITO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOMONITO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NONNC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NONNC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NONNC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NONNC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NORSSPEC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NORSSPEC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NORSSPEC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NORSSPEC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOSIM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOSIM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOSIM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOSIM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOWARN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOWARN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOWARN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOWARN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOWARNEP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOWARNEP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NOWARNEP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NOWARNEP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NRSOUT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NRSOUT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NRSOUT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NRSOUT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NSTACK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NSTACK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NSTACK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NSTACK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NTG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NTG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NTG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NTG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NUMRES b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NUMRES similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NUMRES rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NUMRES diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NUPCOL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NUPCOL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NUPCOL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NUPCOL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NWATREM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NWATREM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NWATREM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NWATREM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NXFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NXFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NXFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NXFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NYFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NYFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NYFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NYFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NZFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NZFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/N/NZFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/N/NZFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OFM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OFM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OFM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OFM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OIL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OIL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OIL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OIL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OILAPI b/src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OILAPI similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OILAPI rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OILAPI diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OILVISCT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OILVISCT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OILVISCT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OILVISCT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OLDTRAN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OLDTRAN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OLDTRAN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OLDTRAN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OLDTRANR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OLDTRANR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OLDTRANR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OLDTRANR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OPERATE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OPERATE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OPERATE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OPERATE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OPERATER b/src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OPERATER similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OPERATER rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OPERATER diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OPERNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OPERNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OPERNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OPERNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OPTIONS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OPTIONS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OPTIONS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OPTIONS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OUTRAD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OUTRAD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OUTRAD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OUTRAD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OUTSOL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OUTSOL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OUTSOL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OUTSOL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OVERBURD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OVERBURD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/O/OVERBURD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/O/OVERBURD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PARALLEL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PARALLEL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PARALLEL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PARALLEL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PARAOPTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PARAOPTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PARAOPTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PARAOPTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PARTTRAC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PARTTRAC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PARTTRAC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PARTTRAC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PATHS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PATHS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PATHS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PATHS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PBUB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PBUB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PBUB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PBUB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PBVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PBVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PBVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PBVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PCG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PCG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PCG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PCG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PCG32D b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PCG32D similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PCG32D rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PCG32D diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PCW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PCW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PCW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PCW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PCW32D b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PCW32D similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PCW32D rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PCW32D diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PDEW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PDEW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PDEW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PDEW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PDVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PDVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PDVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PDVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PEBI b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PEBI similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PEBI rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PEBI diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PECOEFS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PECOEFS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PECOEFS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PECOEFS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PEDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PEDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PEDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PEDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PEGTABX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PEGTABX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PEGTABX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PEGTABX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PEKTABX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PEKTABX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PEKTABX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PEKTABX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PENUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PENUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PENUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PENUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERFORMANCE_PROBE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERFORMANCE_PROBE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERFORMANCE_PROBE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERFORMANCE_PROBE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMAVE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMAVE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMAVE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMAVE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMJFUN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMJFUN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMJFUN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMJFUN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMTHT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMTHT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMTHT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMTHT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMXY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMXY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMXY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMXY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMYZ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMYZ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMYZ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMYZ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMZ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMZ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMZ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMZ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMZX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMZX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PERMZX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PERMZX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PETGRID b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PETGRID similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PETGRID rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PETGRID diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PETOPTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PETOPTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PETOPTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PETOPTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PICOND b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PICOND similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PICOND rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PICOND diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PIMTDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PIMTDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PIMTDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PIMTDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PIMULTAB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PIMULTAB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PIMULTAB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PIMULTAB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PINCH b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PINCH similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PINCH rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PINCH diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PINCHNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PINCHNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PINCHNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PINCHNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PINCHOUT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PINCHOUT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PINCHOUT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PINCHOUT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PINCHREG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PINCHREG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PINCHREG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PINCHREG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PINCHXY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PINCHXY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PINCHXY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PINCHXY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLMIXNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLMIXNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLMIXNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLMIXNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLMIXPAR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLMIXPAR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLMIXPAR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLMIXPAR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYADS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYADS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYADS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYADS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYADSS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYADSS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYADSS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYADSS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYATEMP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYATEMP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYATEMP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYATEMP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYCAMAX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYCAMAX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYCAMAX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYCAMAX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYDHFLF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYDHFLF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYDHFLF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYDHFLF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYESAL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYESAL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYESAL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYESAL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYKRRF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYKRRF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYKRRF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYKRRF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYMAX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYMAX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYMAX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYMAX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYOPTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYOPTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYOPTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYOPTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYRMDEN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYRMDEN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYRMDEN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYRMDEN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYROCK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYROCK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYROCK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYROCK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYROCKM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYROCKM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYROCKM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYROCKM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYSHEAR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYSHEAR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYSHEAR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYSHEAR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYSHLOG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYSHLOG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYSHLOG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYSHLOG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYTRRF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYTRRF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYTRRF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYTRRF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYTRRFA b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYTRRFA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYTRRFA rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYTRRFA diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYVISC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYVISC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYVISC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYVISC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYVISCS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYVISCS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYVISCS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYVISCS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYVISCT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYVISCT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYVISCT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYVISCT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYVSCST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYVSCST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PLYVSCST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PLYVSCST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PMAX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PMAX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PMAX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PMAX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PMISC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PMISC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PMISC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PMISC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/POLYMER b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/POLYMER similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/POLYMER rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/POLYMER diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PORO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PORO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PORO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PORO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PORV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PORV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PORV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PORV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PPCWMAX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PPCWMAX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PPCWMAX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PPCWMAX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PRESSURE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PRESSURE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PRESSURE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PRESSURE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PRIORITY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PRIORITY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PRIORITY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PRIORITY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PROPS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PROPS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PROPS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PROPS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PRORDER b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PRORDER similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PRORDER rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PRORDER diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PRVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PRVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PRVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PRVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PSTEADY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PSTEADY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PSTEADY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PSTEADY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PSWRG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PSWRG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PSWRG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PSWRG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PSWRO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PSWRO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PSWRO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PSWRO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVCDO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVCDO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVCDO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVCDO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVCO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVCO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVCO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVCO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVDG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVDG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVDG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVDG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVDO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVDO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVDO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVDO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVDS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVDS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVDS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVDS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVTG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVTG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVTNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVTNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVTO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVTO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVTW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVTW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTWSALT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVTWSALT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTWSALT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVTWSALT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVT_M b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVT_M similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVT_M rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVT_M diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVZG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVZG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVZG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/P/PVZG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/Q/QDRILL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/Q/QDRILL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/Q/QDRILL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/Q/QDRILL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/Q/QHRATING b/src/opm/input/eclipse/share/keywords/000_Eclipse100/Q/QHRATING similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/Q/QHRATING rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/Q/QHRATING diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/Q/QMOBIL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/Q/QMOBIL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/Q/QMOBIL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/Q/QMOBIL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RADFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RADFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RADFIN4 b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADFIN4 similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RADFIN4 rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADFIN4 diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RADIAL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADIAL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RADIAL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADIAL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RAINFALL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RAINFALL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RAINFALL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RAINFALL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RBEDCONT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RBEDCONT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RBEDCONT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RBEDCONT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RCMASTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RCMASTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RCMASTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RCMASTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REACACT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REACACT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REACACT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REACACT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REACHES b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REACHES similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REACHES rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REACHES diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/READDATA b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/READDATA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/READDATA rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/READDATA diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REFINE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REFINE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REFINE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REFINE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REGDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REGDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REGDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REGDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REGION2REGION_PROBE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REGION2REGION_PROBE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REGION2REGION_PROBE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REGION2REGION_PROBE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REGIONS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REGIONS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REGIONS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REGIONS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REGION_PROBE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REGION_PROBE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/REGION_PROBE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REGION_PROBE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RESIDNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RESIDNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RESIDNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RESIDNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RESTART b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RESTART similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RESTART rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RESTART diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RESVNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RESVNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RESVNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RESVNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RIVDEBUG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RIVDEBUG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RIVDEBUG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RIVDEBUG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RIVERSYS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RIVERSYS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RIVERSYS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RIVERSYS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RIVRDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RIVRDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RIVRDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RIVRDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RIVRPROP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RIVRPROP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RIVRPROP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RIVRPROP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RIVRXSEC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RIVRXSEC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RIVRXSEC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RIVRXSEC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RIVSALT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RIVSALT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RIVSALT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RIVSALT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RIVTRACE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RIVTRACE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RIVTRACE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RIVTRACE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RKTRMDIR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RKTRMDIR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RKTRMDIR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RKTRMDIR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCK2D b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCK2D similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCK2D rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCK2D diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCK2DTR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCK2DTR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCK2DTR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCK2DTR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKCOMP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKCOMP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKCOMP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKCOMP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKFRAC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKFRAC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKFRAC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKFRAC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKOPTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKOPTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKOPTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKOPTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKPAMA b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKPAMA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKPAMA rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKPAMA diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKTAB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKTAB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKTAB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKTAB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKTABH b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKTABH similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKTABH rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKTABH diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKTABW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKTABW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKTABW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKTABW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKTHSG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKTHSG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKTHSG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKTHSG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKTSIG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKTSIG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKTSIG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKTSIG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKWNOD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKWNOD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/ROCKWNOD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/ROCKWNOD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTCPL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTCPL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTCPL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTCPL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTGRID b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTGRID similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTGRID rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTGRID diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTGRIDL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTGRIDL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTGRIDL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTGRIDL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTHMD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTHMD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTHMD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTHMD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTHMG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTHMG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTHMG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTHMG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTHMW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTHMW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTHMW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTHMW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTINIT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTINIT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTINIT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTINIT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTISOL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTISOL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTISOL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTISOL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTONLY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTONLY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTONLY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTONLY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTONLYO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTONLYO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTONLYO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTONLYO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTPROPS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTPROPS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTPROPS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTPROPS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTREGS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTREGS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTREGS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTREGS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTRST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTRST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTRST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTRST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTRUNSP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTRUNSP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTRUNSP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTRUNSP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTSCHED b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTSCHED similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTSCHED rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTSCHED diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTSMRY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTSMRY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTSMRY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTSMRY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTSOL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTSOL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RPTSOL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RPTSOL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RSCONST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSCONST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RSCONST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSCONST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RSCONSTT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSCONSTT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RSCONSTT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSCONSTT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RSGI b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSGI similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RSGI rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSGI diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RSSPEC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSSPEC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RSSPEC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSSPEC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RSSSPEC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSSSPEC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RSSSPEC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSSSPEC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RSVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RSVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RTEMP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RTEMP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RTEMP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RTEMP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RTEMPA b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RTEMPA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RTEMPA rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RTEMPA diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RTEMPVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RTEMPVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RTEMPVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RTEMPVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RUNSPEC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RUNSPEC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RUNSPEC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RUNSPEC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RUNSUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RUNSUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RUNSUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RUNSUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RVCONST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RVCONST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RVCONST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RVCONST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RVCONSTT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RVCONSTT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RVCONSTT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RVCONSTT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RVGI b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RVGI similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RVGI rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RVGI diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RVVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RVVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/R/RVVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RVVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SALT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SALT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SALT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SALT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SALTNODE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SALTNODE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SALTNODE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SALTNODE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SALTREST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SALTREST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SALTREST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SALTREST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SALTVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SALTVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SALTVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SALTVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SAMG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SAMG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SAMG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SAMG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SATNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SATNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SATNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SATNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SATOPTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SATOPTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SATOPTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SATOPTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SAVE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SAVE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SAVE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SAVE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCALECRS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCALECRS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCALECRS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCALECRS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCALELIM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCALELIM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCALELIM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCALELIM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCDATAB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCDATAB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCDATAB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCDATAB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCDETAB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCDETAB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCDETAB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCDETAB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCDPDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCDPDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCDPDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCDPDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCDPTAB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCDPTAB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCDPTAB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCDPTAB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCDPTRAC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCDPTRAC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCDPTRAC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCDPTRAC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCHEDULE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCHEDULE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCHEDULE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCHEDULE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SCVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SCVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SDENSITY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SDENSITY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SDENSITY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SDENSITY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SEGMENT_PROBE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SEGMENT_PROBE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SEGMENT_PROBE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SEGMENT_PROBE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SEPARATE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SEPARATE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SEPARATE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SEPARATE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SEPVALS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SEPVALS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SEPVALS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SEPVALS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SFOAM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SFOAM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SFOAM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SFOAM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGAS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGAS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGAS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGAS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGCWMIS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGCWMIS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGCWMIS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGCWMIS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGF32D b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGF32D similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGF32D rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGF32D diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGFN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGFN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGFN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGFN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGLPC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGLPC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGLPC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGLPC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGOF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGOF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGOF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGOF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGU b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGU similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGU rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGU diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGWFN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGWFN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SGWFN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SGWFN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SHRATE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SHRATE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SHRATE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SHRATE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SIGMA b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SIGMA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SIGMA rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SIGMA diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SIGMAGD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SIGMAGD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SIGMAGD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SIGMAGD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SIGMAGDV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SIGMAGDV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SIGMAGDV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SIGMAGDV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SIGMATH b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SIGMATH similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SIGMATH rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SIGMATH diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SIGMAV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SIGMAV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SIGMAV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SIGMAV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SIMULATE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SIMULATE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SIMULATE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SIMULATE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKIP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKIP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIP100 b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKIP100 similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIP100 rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKIP100 diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIP300 b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKIP300 similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIP300 rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKIP300 diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIPREST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKIPREST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKIPREST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKIPREST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKRO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKRO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKRO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKRO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKRORG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKRORG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKRORG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKRORG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKRORW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKRORW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKRORW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKRORW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKRW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKRW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKRW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKRW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKRWR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKRWR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SKRWR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SKRWR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SLAVES b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SLAVES similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SLAVES rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SLAVES diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SLGOF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SLGOF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SLGOF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SLGOF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SMRYDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SMRYDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SMRYDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SMRYDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SMULTX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SMULTX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SMULTX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SMULTX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SMULTY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SMULTY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SMULTY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SMULTY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SMULTZ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SMULTZ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SMULTZ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SMULTZ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOCRS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOCRS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOCRS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOCRS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOF2 b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOF2 similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOF2 rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOF2 diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOF3 b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOF3 similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOF3 rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOF3 diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOF32D b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOF32D similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOF32D rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOF32D diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOGCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOGCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOGCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOGCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOIL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOIL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOIL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOIL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLUTION b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLUTION similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLUTION rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLUTION diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLVCONC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLVCONC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLVCONC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLVCONC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLVDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLVDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLVDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLVDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLVDIRS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLVDIRS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLVDIRS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLVDIRS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLVENT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLVENT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLVENT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLVENT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLVFRAC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLVFRAC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLVFRAC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLVFRAC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLVNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLVNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLVNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLVNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLWNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLWNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOLWNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOLWNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOMGAS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOMGAS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOMGAS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOMGAS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOMWAT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOMWAT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOMWAT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOMWAT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SORWMIS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SORWMIS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SORWMIS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SORWMIS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOWCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOWCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SOWCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SOWCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SPECGRID b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SPECGRID similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SPECGRID rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SPECGRID diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SPECHEAT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SPECHEAT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SPECHEAT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SPECHEAT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SPECROCK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SPECROCK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SPECROCK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SPECROCK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SPOLY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SPOLY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SPOLY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SPOLY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSFN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSFN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSFN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSFN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSGCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSGCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSGCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSGCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSGL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSGL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSGL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSGL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSOGCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSOGCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSOGCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSOGCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSOL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSOL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSOL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSOL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSOWCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSOWCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSOWCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSOWCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSWCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSWCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSWCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSWCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSWL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSWL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSWL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSWL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSWU b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSWU similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SSWU rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSWU diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/START b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/START similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/START rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/START diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STOG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/STOG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STOG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/STOG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STONE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/STONE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STONE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/STONE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STONE1 b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/STONE1 similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STONE1 rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/STONE1 diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STONE1EX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/STONE1EX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STONE1EX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/STONE1EX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STONE2 b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/STONE2 similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STONE2 rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/STONE2 diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STOW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/STOW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STOW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/STOW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STWG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/STWG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/STWG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/STWG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SUMMARY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SUMMARY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SUMMARY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SUMMARY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SUMTHIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SUMTHIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SUMTHIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SUMTHIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFACT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFACT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFACT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFACT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFACTW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFACTW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFACTW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFACTW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFADDW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFADDW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFADDW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFADDW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFADS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFADS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFADS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFADS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFCAPD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFCAPD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFCAPD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFCAPD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFESAL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFESAL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFESAL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFESAL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFOPTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFOPTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFOPTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFOPTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFROCK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFROCK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFROCK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFROCK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFSTES b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFSTES similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFSTES rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFSTES diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFVISC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFVISC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFVISC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFVISC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFWNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFWNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SURFWNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SURFWNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWAT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWAT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWAT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWAT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWATINIT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWATINIT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWATINIT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWATINIT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWCR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWCR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWF32D b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWF32D similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWF32D rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWF32D diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWFN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWFN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWFN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWFN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWINGFAC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWINGFAC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWINGFAC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWINGFAC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWLPC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWLPC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWLPC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWLPC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWOF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWOF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWOF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWOF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWU b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWU similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SWU rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWU diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TABDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TABDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TABDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TABDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TBLK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TBLK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TBLK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TBLK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TEMP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TEMP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TEMP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TEMP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TEMPNODE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TEMPNODE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TEMPNODE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TEMPNODE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TEMPTVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TEMPTVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TEMPTVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TEMPTVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TEMPVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TEMPVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TEMPVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TEMPVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/THCONR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/THCONR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/THCONR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/THCONR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/THERMAL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/THERMAL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/THERMAL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/THERMAL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/THPRES b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/THPRES similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/THPRES rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/THPRES diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/THPRESFT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/THPRESFT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/THPRESFT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/THPRESFT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TIGHTEN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TIGHTEN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TIGHTEN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TIGHTEN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TIGHTENP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TIGHTENP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TIGHTENP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TIGHTENP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TIME b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TIME similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TIME rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TIME diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TITLE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TITLE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TITLE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TITLE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TLMIXPAR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TLMIXPAR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TLMIXPAR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TLMIXPAR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TNUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TNUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TNUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TNUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TOLCRIT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TOLCRIT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TOLCRIT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TOLCRIT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TOPS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TOPS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TOPS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TOPS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TPAMEPS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TPAMEPS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TPAMEPS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TPAMEPS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TPAMEPSS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TPAMEPSS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TPAMEPSS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TPAMEPSS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACER b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRACER similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACER rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRACER diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACERKM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRACERKM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACERKM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRACERKM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACERKP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRACERKP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACERKP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRACERKP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACERS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRACERS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACERS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRACERS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACITVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRACITVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACITVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRACITVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACTVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRACTVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRACTVD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRACTVD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRADS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRADS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRADS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRADS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANGL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRANGL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANGL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRANGL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRANR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRANR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANTHT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRANTHT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANTHT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRANTHT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRANX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRANX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRANY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRANY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANZ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRANZ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRANZ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRANZ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRDCY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRDCY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRDCY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRDCY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRDIF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRDIF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRDIF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRDIF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRDIS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRDIS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRDIS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRDIS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRKPF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRKPF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRKPF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRKPF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRNHD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRNHD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRNHD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRNHD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRPLPORO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRPLPORO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRPLPORO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRPLPORO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRROCK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRROCK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TRROCK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TRROCK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TSTEP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TSTEP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TSTEP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TSTEP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TUNING b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TUNING similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TUNING rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TUNING diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TUNINGDP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TUNINGDP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TUNINGDP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TUNINGDP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TUNINGH b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TUNINGH similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TUNINGH rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TUNINGH diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TUNINGL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TUNINGL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TUNINGL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TUNINGL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TUNINGS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TUNINGS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TUNINGS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TUNINGS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TVDP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TVDP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TVDP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TVDP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TZONE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TZONE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/T/TZONE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TZONE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDADIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UDADIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDADIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UDADIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDQ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UDQ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDQ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UDQ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDQDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UDQDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDQDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UDQDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDQPARAM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UDQPARAM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDQPARAM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UDQPARAM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UDT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UDT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDTDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UDTDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UDTDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UDTDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UNCODHMD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UNCODHMD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UNCODHMD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UNCODHMD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UNIFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UNIFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UNIFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UNIFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UNIFOUT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UNIFOUT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UNIFOUT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UNIFOUT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UNIFOUTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UNIFOUTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UNIFOUTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UNIFOUTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UNIFSAVE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UNIFSAVE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/UNIFSAVE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/U/UNIFSAVE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/USECUPL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/U/USECUPL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/USECUPL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/U/USECUPL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/USEFLUX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/U/USEFLUX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/USEFLUX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/U/USEFLUX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/USENOFLO b/src/opm/input/eclipse/share/keywords/000_Eclipse100/U/USENOFLO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/U/USENOFLO rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/U/USENOFLO diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/DFLOWR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/DFLOWR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/DFLOWR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/DFLOWR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VAPOIL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VAPOIL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VAPOIL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VAPOIL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VAPPARS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VAPPARS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VAPPARS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VAPPARS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VDFLOW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VDFLOW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VDFLOW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VDFLOW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VDFLOWR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VDFLOWR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VDFLOWR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VDFLOWR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VEDEBUG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VEDEBUG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VEDEBUG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VEDEBUG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VEFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VEFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VEFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VEFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VEFRAC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VEFRAC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VEFRAC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VEFRAC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VEFRACP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VEFRACP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VEFRACP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VEFRACP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VEFRACPV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VEFRACPV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VEFRACPV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VEFRACPV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VEFRACV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VEFRACV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VEFRACV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VEFRACV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPCHK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VFPCHK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPCHK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VFPCHK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPIDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VFPIDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPIDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VFPIDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPINJ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VFPINJ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPINJ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VFPINJ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPPDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VFPPDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPPDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VFPPDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPPROD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VFPPROD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPPROD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VFPPROD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPTABL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VFPTABL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VFPTABL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VFPTABL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VISAGE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VISAGE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VISAGE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VISAGE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VISCD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VISCD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VISCD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VISCD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VISCREF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VISCREF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VISCREF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VISCREF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VISDATES b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VISDATES similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VISDATES rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VISDATES diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VISOPTS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VISOPTS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/V/VISOPTS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/V/VISOPTS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WAGHYSTR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WAGHYSTR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WAGHYSTR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WAGHYSTR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WAITBAL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WAITBAL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WAITBAL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WAITBAL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WALKALIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WALKALIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WALKALIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WALKALIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WALQCALC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WALQCALC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WALQCALC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WALQCALC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WAPI b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WAPI similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WAPI rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WAPI diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WARN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WARN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WARN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WARN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WATER b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WATER similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WATER rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WATER diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WATVISCT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WATVISCT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WATVISCT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WATVISCT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WBHGLR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WBHGLR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WBHGLR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WBHGLR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WBOREVOL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WBOREVOL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WBOREVOL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WBOREVOL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCALCVAL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCALCVAL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCALCVAL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCALCVAL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONHIST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCONHIST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONHIST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCONHIST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONINJ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCONINJ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONINJ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCONINJ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONINJE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCONINJE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONINJE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCONINJE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONINJH b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCONINJH similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONINJH rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCONINJH diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONINJP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCONINJP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONINJP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCONINJP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONPROD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCONPROD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCONPROD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCONPROD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCUTBACK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCUTBACK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCUTBACK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCUTBACK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCUTBACT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCUTBACT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCUTBACT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCUTBACT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCYCLE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCYCLE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WCYCLE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WCYCLE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WDFAC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WDFAC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WDFAC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WDFAC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WDFACCOR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WDFACCOR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WDFACCOR rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WDFACCOR diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WDRILPRI b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WDRILPRI similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WDRILPRI rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WDRILPRI diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WDRILRES b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WDRILRES similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WDRILRES rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WDRILRES diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WDRILTIM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WDRILTIM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WDRILTIM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WDRILTIM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WECON b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WECON similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WECON rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WECON diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WECONINJ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WECONINJ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WECONINJ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WECONINJ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WECONT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WECONT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WECONT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WECONT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WEFAC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WEFAC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WEFAC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WEFAC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELCNTL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELCNTL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELCNTL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELCNTL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELDEBUG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELDEBUG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELDEBUG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELDEBUG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELDRAW b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELDRAW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELDRAW rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELDRAW diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELEVNT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELEVNT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELEVNT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELEVNT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELLDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELLDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELLDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELLDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELL_COMPLETION_PROBE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELL_COMPLETION_PROBE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELL_COMPLETION_PROBE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELL_COMPLETION_PROBE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELL_PROBE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELL_PROBE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELL_PROBE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELL_PROBE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELMOVEL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELMOVEL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELMOVEL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELMOVEL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELOPEN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELOPEN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELOPEN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELOPEN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELOPENL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELOPENL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELOPENL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELOPENL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELPI b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELPI similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELPI rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELPI diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELPRI b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELPRI similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELPRI rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELPRI diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELSEGS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELSEGS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELSEGS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELSEGS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELSOMIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELSOMIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELSOMIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELSOMIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELSPECL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELSPECL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELSPECL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELSPECL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELSPECS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELSPECS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELSPECS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELSPECS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELTARG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELTARG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WELTARG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELTARG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WFOAM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WFOAM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WFOAM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WFOAM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WFRICSEG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WFRICSEG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WFRICSEG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WFRICSEG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WFRICSGL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WFRICSGL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WFRICSGL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WFRICSGL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WFRICTN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WFRICTN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WFRICTN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WFRICTN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WFRICTNL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WFRICTNL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WFRICTNL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WFRICTNL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WGASPROD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WGASPROD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WGASPROD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WGASPROD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WGORPEN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WGORPEN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WGORPEN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WGORPEN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WGRUPCON b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WGRUPCON similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WGRUPCON rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WGRUPCON diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WH2NUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WH2NUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WH2NUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WH2NUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WH3NUM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WH3NUM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WH3NUM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WH3NUM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WHEDREFD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WHEDREFD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WHEDREFD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WHEDREFD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WHISTCTL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WHISTCTL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WHISTCTL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WHISTCTL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WHTEMP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WHTEMP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WHTEMP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WHTEMP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WINJMULT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WINJMULT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WINJMULT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WINJMULT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WLIFT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WLIFT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WLIFT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WLIFT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WLIFTOPT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WLIFTOPT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WLIFTOPT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WLIFTOPT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WLIMTOL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WLIMTOL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WLIMTOL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WLIMTOL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WLIST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WLIST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WLIST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WLIST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WLISTARG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WLISTARG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WLISTARG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WLISTARG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WLISTNAM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WLISTNAM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WLISTNAM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WLISTNAM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WNETCTRL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WNETCTRL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WNETCTRL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WNETCTRL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WNETDP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WNETDP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WNETDP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WNETDP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WORKLIM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WORKLIM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WORKLIM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WORKLIM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WORKTHP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WORKTHP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WORKTHP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WORKTHP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPAVE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPAVE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPAVE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPAVE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPAVEDEP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPAVEDEP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPAVEDEP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPAVEDEP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPIMULT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPIMULT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPIMULT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPIMULT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPIMULTL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPIMULTL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPIMULTL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPIMULTL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPITAB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPITAB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPITAB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPITAB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPLUG b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPLUG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPLUG rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPLUG diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPOLYMER b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPOLYMER similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPOLYMER rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPOLYMER diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPOLYRED b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPOLYRED similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPOLYRED rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPOLYRED diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPOTCALC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPOTCALC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WPOTCALC rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WPOTCALC diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WREGROUP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WREGROUP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WREGROUP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WREGROUP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WRFT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WRFT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WRFT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WRFT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WRFTPLT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WRFTPLT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WRFTPLT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WRFTPLT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSALT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSALT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSALT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSALT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSCCLEAN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSCCLEAN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSCCLEAN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSCCLEAN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSCCLENL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSCCLENL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSCCLENL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSCCLENL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSCTAB b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSCTAB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSCTAB rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSCTAB diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGAICD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGAICD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGAICD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGAICD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGDFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGDFIN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGDFIN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGDFIN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGDFMD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGDFMD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGDFMD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGDFMD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGDFPA b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGDFPA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGDFPA rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGDFPA diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGDIMS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGDIMS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGDIMS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGEXSS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGEXSS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGEXSS rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGEXSS diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGFLIM b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGFLIM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGFLIM rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGFLIM diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGFMOD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGFMOD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGFMOD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGFMOD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGINIT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGINIT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGINIT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGINIT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGITER b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGITER similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGITER rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGITER diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGLABY b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGLABY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGLABY rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGLABY diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGLINK b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGLINK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGLINK rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGLINK diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGMULT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGMULT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGMULT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGMULT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGPROP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGPROP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGPROP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGPROP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGPULL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGPULL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGPULL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGPULL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGSEP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGSEP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGSEP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGSEP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGSICD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGSICD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGSICD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGSICD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGSOLV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGSOLV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGSOLV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGSOLV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGTABL b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGTABL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGTABL rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGTABL diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGVALV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGVALV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSEGVALV rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSEGVALV diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSOLVENT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSOLVENT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSOLVENT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSOLVENT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSURFACT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSURFACT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WSURFACT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSURFACT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTADD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WTADD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTADD rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WTADD diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTEMP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WTEMP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTEMP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WTEMP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTEMPQ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WTEMPQ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTEMPQ rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WTEMPQ diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTEST b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WTEST similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTEST rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WTEST diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTHPMAX b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WTHPMAX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTHPMAX rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WTHPMAX diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTMULT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WTMULT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTMULT rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WTMULT diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTRACER b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WTRACER similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WTRACER rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WTRACER diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WVFPDP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WVFPDP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WVFPDP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WVFPDP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WVFPEXP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WVFPEXP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WVFPEXP rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WVFPEXP diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WWPAVE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WWPAVE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/W/WWPAVE rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WWPAVE diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/Z/ZCORN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/Z/ZCORN similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/Z/ZCORN rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/Z/ZCORN diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/Z/ZIPP2OFF b/src/opm/input/eclipse/share/keywords/000_Eclipse100/Z/ZIPP2OFF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/Z/ZIPP2OFF rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/Z/ZIPP2OFF diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/Z/ZIPPY2 b/src/opm/input/eclipse/share/keywords/000_Eclipse100/Z/ZIPPY2 similarity index 100% rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/Z/ZIPPY2 rename to src/opm/input/eclipse/share/keywords/000_Eclipse100/Z/ZIPPY2 diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/B/BLOCK_PROBE300 b/src/opm/input/eclipse/share/keywords/001_Eclipse300/B/BLOCK_PROBE300 similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/B/BLOCK_PROBE300 rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/B/BLOCK_PROBE300 diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/CIRCLE b/src/opm/input/eclipse/share/keywords/001_Eclipse300/C/CIRCLE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/CIRCLE rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/C/CIRCLE diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/CO2STORE b/src/opm/input/eclipse/share/keywords/001_Eclipse300/C/CO2STORE similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/CO2STORE rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/C/CO2STORE diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/COMPS b/src/opm/input/eclipse/share/keywords/001_Eclipse300/C/COMPS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/COMPS rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/C/COMPS diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/CREF b/src/opm/input/eclipse/share/keywords/001_Eclipse300/C/CREF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/CREF rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/C/CREF diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/CREFS b/src/opm/input/eclipse/share/keywords/001_Eclipse300/C/CREFS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/C/CREFS rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/C/CREFS diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/D/DREF b/src/opm/input/eclipse/share/keywords/001_Eclipse300/D/DREF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/D/DREF rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/D/DREF diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/D/DREFS b/src/opm/input/eclipse/share/keywords/001_Eclipse300/D/DREFS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/D/DREFS rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/D/DREFS diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/D/DZV b/src/opm/input/eclipse/share/keywords/001_Eclipse300/D/DZV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/D/DZV rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/D/DZV diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/G/GASVISCT b/src/opm/input/eclipse/share/keywords/001_Eclipse300/G/GASVISCT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/G/GASVISCT rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/G/GASVISCT diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/G/GCONPROD b/src/opm/input/eclipse/share/keywords/001_Eclipse300/G/GCONPROD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/G/GCONPROD rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/G/GCONPROD diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/H/HEATCR b/src/opm/input/eclipse/share/keywords/001_Eclipse300/H/HEATCR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/H/HEATCR rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/H/HEATCR diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/H/HEATCRT b/src/opm/input/eclipse/share/keywords/001_Eclipse300/H/HEATCRT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/H/HEATCRT rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/H/HEATCRT diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/L/LIVEOIL b/src/opm/input/eclipse/share/keywords/001_Eclipse300/L/LIVEOIL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/L/LIVEOIL rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/L/LIVEOIL diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/M/MW b/src/opm/input/eclipse/share/keywords/001_Eclipse300/M/MW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/M/MW rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/M/MW diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/M/MWS b/src/opm/input/eclipse/share/keywords/001_Eclipse300/M/MWS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/M/MWS rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/M/MWS diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/O/OILCOMPR b/src/opm/input/eclipse/share/keywords/001_Eclipse300/O/OILCOMPR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/O/OILCOMPR rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/O/OILCOMPR diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/O/OILMW b/src/opm/input/eclipse/share/keywords/001_Eclipse300/O/OILMW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/O/OILMW rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/O/OILMW diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/O/OILVTIM b/src/opm/input/eclipse/share/keywords/001_Eclipse300/O/OILVTIM similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/O/OILVTIM rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/O/OILVTIM diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/O/OPTIONS3 b/src/opm/input/eclipse/share/keywords/001_Eclipse300/O/OPTIONS3 similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/O/OPTIONS3 rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/O/OPTIONS3 diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/P/PREF b/src/opm/input/eclipse/share/keywords/001_Eclipse300/P/PREF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/P/PREF rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/P/PREF diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/P/PREFS b/src/opm/input/eclipse/share/keywords/001_Eclipse300/P/PREFS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/P/PREFS rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/P/PREFS diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/S/SALINITY b/src/opm/input/eclipse/share/keywords/001_Eclipse300/S/SALINITY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/S/SALINITY rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/S/SALINITY diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/S/STCOND b/src/opm/input/eclipse/share/keywords/001_Eclipse300/S/STCOND similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/S/STCOND rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/S/STCOND diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TEMPI b/src/opm/input/eclipse/share/keywords/001_Eclipse300/T/TEMPI similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TEMPI rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/T/TEMPI diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TEMPVD b/src/opm/input/eclipse/share/keywords/001_Eclipse300/T/TEMPVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TEMPVD rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/T/TEMPVD diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THCGAS b/src/opm/input/eclipse/share/keywords/001_Eclipse300/T/THCGAS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THCGAS rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/T/THCGAS diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THCOIL b/src/opm/input/eclipse/share/keywords/001_Eclipse300/T/THCOIL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THCOIL rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/T/THCOIL diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THCONSF b/src/opm/input/eclipse/share/keywords/001_Eclipse300/T/THCONSF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THCONSF rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/T/THCONSF diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THCROCK b/src/opm/input/eclipse/share/keywords/001_Eclipse300/T/THCROCK similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THCROCK rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/T/THCROCK diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THCWATER b/src/opm/input/eclipse/share/keywords/001_Eclipse300/T/THCWATER similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THCWATER rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/T/THCWATER diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THERMAL b/src/opm/input/eclipse/share/keywords/001_Eclipse300/T/THERMAL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/THERMAL rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/T/THERMAL diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TREF b/src/opm/input/eclipse/share/keywords/001_Eclipse300/T/TREF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TREF rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/T/TREF diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TREFS b/src/opm/input/eclipse/share/keywords/001_Eclipse300/T/TREFS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/T/TREFS rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/T/TREFS diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/W/WATDENT b/src/opm/input/eclipse/share/keywords/001_Eclipse300/W/WATDENT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/W/WATDENT rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/W/WATDENT diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/W/WECONCMF b/src/opm/input/eclipse/share/keywords/001_Eclipse300/W/WECONCMF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/W/WECONCMF rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/W/WECONCMF diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/W/WINJTEMP b/src/opm/input/eclipse/share/keywords/001_Eclipse300/W/WINJTEMP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/W/WINJTEMP rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/W/WINJTEMP diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACT1 b/src/opm/input/eclipse/share/keywords/001_Eclipse300/Z/ZFACT1 similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACT1 rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/Z/ZFACT1 diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACT1S b/src/opm/input/eclipse/share/keywords/001_Eclipse300/Z/ZFACT1S similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACT1S rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/Z/ZFACT1S diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACTOR b/src/opm/input/eclipse/share/keywords/001_Eclipse300/Z/ZFACTOR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACTOR rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/Z/ZFACTOR diff --git a/src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACTORS b/src/opm/input/eclipse/share/keywords/001_Eclipse300/Z/ZFACTORS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/001_Eclipse300/Z/ZFACTORS rename to src/opm/input/eclipse/share/keywords/001_Eclipse300/Z/ZFACTORS diff --git a/src/opm/parser/eclipse/share/keywords/002_Frontsim/N/NOGRAV b/src/opm/input/eclipse/share/keywords/002_Frontsim/N/NOGRAV similarity index 100% rename from src/opm/parser/eclipse/share/keywords/002_Frontsim/N/NOGRAV rename to src/opm/input/eclipse/share/keywords/002_Frontsim/N/NOGRAV diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/B/BC b/src/opm/input/eclipse/share/keywords/900_OPM/B/BC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/B/BC rename to src/opm/input/eclipse/share/keywords/900_OPM/B/BC diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/C/CO2STOR b/src/opm/input/eclipse/share/keywords/900_OPM/C/CO2STOR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/C/CO2STOR rename to src/opm/input/eclipse/share/keywords/900_OPM/C/CO2STOR diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/D/DRSDTCON b/src/opm/input/eclipse/share/keywords/900_OPM/D/DRSDTCON similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/D/DRSDTCON rename to src/opm/input/eclipse/share/keywords/900_OPM/D/DRSDTCON diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/E/EXIT b/src/opm/input/eclipse/share/keywords/900_OPM/E/EXIT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/E/EXIT rename to src/opm/input/eclipse/share/keywords/900_OPM/E/EXIT diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/G/GASDENT b/src/opm/input/eclipse/share/keywords/900_OPM/G/GASDENT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/G/GASDENT rename to src/opm/input/eclipse/share/keywords/900_OPM/G/GASDENT diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/G/GCOMPIDX b/src/opm/input/eclipse/share/keywords/900_OPM/G/GCOMPIDX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/G/GCOMPIDX rename to src/opm/input/eclipse/share/keywords/900_OPM/G/GCOMPIDX diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/G/GRUPRIG b/src/opm/input/eclipse/share/keywords/900_OPM/G/GRUPRIG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/G/GRUPRIG rename to src/opm/input/eclipse/share/keywords/900_OPM/G/GRUPRIG diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/M/MICP b/src/opm/input/eclipse/share/keywords/900_OPM/M/MICP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/M/MICP rename to src/opm/input/eclipse/share/keywords/900_OPM/M/MICP diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/M/MICPPARA b/src/opm/input/eclipse/share/keywords/900_OPM/M/MICPPARA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/M/MICPPARA rename to src/opm/input/eclipse/share/keywords/900_OPM/M/MICPPARA diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/M/MINNPCOL b/src/opm/input/eclipse/share/keywords/900_OPM/M/MINNPCOL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/M/MINNPCOL rename to src/opm/input/eclipse/share/keywords/900_OPM/M/MINNPCOL diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/M/MINPVFIL b/src/opm/input/eclipse/share/keywords/900_OPM/M/MINPVFIL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/M/MINPVFIL rename to src/opm/input/eclipse/share/keywords/900_OPM/M/MINPVFIL diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/O/OCOMPIDX b/src/opm/input/eclipse/share/keywords/900_OPM/O/OCOMPIDX similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/O/OCOMPIDX rename to src/opm/input/eclipse/share/keywords/900_OPM/O/OCOMPIDX diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/O/OILDENT b/src/opm/input/eclipse/share/keywords/900_OPM/O/OILDENT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/O/OILDENT rename to src/opm/input/eclipse/share/keywords/900_OPM/O/OILDENT diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/P/PERMFACT b/src/opm/input/eclipse/share/keywords/900_OPM/P/PERMFACT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/P/PERMFACT rename to src/opm/input/eclipse/share/keywords/900_OPM/P/PERMFACT diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/P/PINTDIMS b/src/opm/input/eclipse/share/keywords/900_OPM/P/PINTDIMS similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/P/PINTDIMS rename to src/opm/input/eclipse/share/keywords/900_OPM/P/PINTDIMS diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/P/PLYMWINJ b/src/opm/input/eclipse/share/keywords/900_OPM/P/PLYMWINJ similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/P/PLYMWINJ rename to src/opm/input/eclipse/share/keywords/900_OPM/P/PLYMWINJ diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/P/PLYVMH b/src/opm/input/eclipse/share/keywords/900_OPM/P/PLYVMH similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/P/PLYVMH rename to src/opm/input/eclipse/share/keywords/900_OPM/P/PLYVMH diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/P/POLYMW b/src/opm/input/eclipse/share/keywords/900_OPM/P/POLYMW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/P/POLYMW rename to src/opm/input/eclipse/share/keywords/900_OPM/P/POLYMW diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/P/PRECSALT b/src/opm/input/eclipse/share/keywords/900_OPM/P/PRECSALT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/P/PRECSALT rename to src/opm/input/eclipse/share/keywords/900_OPM/P/PRECSALT diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/P/PVTGW b/src/opm/input/eclipse/share/keywords/900_OPM/P/PVTGW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/P/PVTGW rename to src/opm/input/eclipse/share/keywords/900_OPM/P/PVTGW diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/P/PVTGWO b/src/opm/input/eclipse/share/keywords/900_OPM/P/PVTGWO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/P/PVTGWO rename to src/opm/input/eclipse/share/keywords/900_OPM/P/PVTGWO diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/P/PVTSOL b/src/opm/input/eclipse/share/keywords/900_OPM/P/PVTSOL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/P/PVTSOL rename to src/opm/input/eclipse/share/keywords/900_OPM/P/PVTSOL diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/P/PYACTION b/src/opm/input/eclipse/share/keywords/900_OPM/P/PYACTION similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/P/PYACTION rename to src/opm/input/eclipse/share/keywords/900_OPM/P/PYACTION diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/P/PYINPUT b/src/opm/input/eclipse/share/keywords/900_OPM/P/PYINPUT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/P/PYINPUT rename to src/opm/input/eclipse/share/keywords/900_OPM/P/PYINPUT diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/R/RHO b/src/opm/input/eclipse/share/keywords/900_OPM/R/RHO similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/R/RHO rename to src/opm/input/eclipse/share/keywords/900_OPM/R/RHO diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/R/RWGSALT b/src/opm/input/eclipse/share/keywords/900_OPM/R/RWGSALT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/R/RWGSALT rename to src/opm/input/eclipse/share/keywords/900_OPM/R/RWGSALT diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/S/SALTPVD b/src/opm/input/eclipse/share/keywords/900_OPM/S/SALTPVD similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/S/SALTPVD rename to src/opm/input/eclipse/share/keywords/900_OPM/S/SALTPVD diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/S/SALTSOL b/src/opm/input/eclipse/share/keywords/900_OPM/S/SALTSOL similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/S/SALTSOL rename to src/opm/input/eclipse/share/keywords/900_OPM/S/SALTSOL diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/S/SBIOF b/src/opm/input/eclipse/share/keywords/900_OPM/S/SBIOF similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/S/SBIOF rename to src/opm/input/eclipse/share/keywords/900_OPM/S/SBIOF diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/S/SCALC b/src/opm/input/eclipse/share/keywords/900_OPM/S/SCALC similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/S/SCALC rename to src/opm/input/eclipse/share/keywords/900_OPM/S/SCALC diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/S/SKPRPOLY b/src/opm/input/eclipse/share/keywords/900_OPM/S/SKPRPOLY similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/S/SKPRPOLY rename to src/opm/input/eclipse/share/keywords/900_OPM/S/SKPRPOLY diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/S/SKPRWAT b/src/opm/input/eclipse/share/keywords/900_OPM/S/SKPRWAT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/S/SKPRWAT rename to src/opm/input/eclipse/share/keywords/900_OPM/S/SKPRWAT diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/S/SMICR b/src/opm/input/eclipse/share/keywords/900_OPM/S/SMICR similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/S/SMICR rename to src/opm/input/eclipse/share/keywords/900_OPM/S/SMICR diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/S/SOXYG b/src/opm/input/eclipse/share/keywords/900_OPM/S/SOXYG similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/S/SOXYG rename to src/opm/input/eclipse/share/keywords/900_OPM/S/SOXYG diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/S/SPIDER b/src/opm/input/eclipse/share/keywords/900_OPM/S/SPIDER similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/S/SPIDER rename to src/opm/input/eclipse/share/keywords/900_OPM/S/SPIDER diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/S/SPOLYMW b/src/opm/input/eclipse/share/keywords/900_OPM/S/SPOLYMW similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/S/SPOLYMW rename to src/opm/input/eclipse/share/keywords/900_OPM/S/SPOLYMW diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/S/SUREA b/src/opm/input/eclipse/share/keywords/900_OPM/S/SUREA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/S/SUREA rename to src/opm/input/eclipse/share/keywords/900_OPM/S/SUREA diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/T/TLPMIXPA b/src/opm/input/eclipse/share/keywords/900_OPM/T/TLPMIXPA similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/T/TLPMIXPA rename to src/opm/input/eclipse/share/keywords/900_OPM/T/TLPMIXPA diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/V/VAPWAT b/src/opm/input/eclipse/share/keywords/900_OPM/V/VAPWAT similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/V/VAPWAT rename to src/opm/input/eclipse/share/keywords/900_OPM/V/VAPWAT diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/W/WMICP b/src/opm/input/eclipse/share/keywords/900_OPM/W/WMICP similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/W/WMICP rename to src/opm/input/eclipse/share/keywords/900_OPM/W/WMICP diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/W/WPMITAB b/src/opm/input/eclipse/share/keywords/900_OPM/W/WPMITAB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/W/WPMITAB rename to src/opm/input/eclipse/share/keywords/900_OPM/W/WPMITAB diff --git a/src/opm/parser/eclipse/share/keywords/900_OPM/W/WSKPTAB b/src/opm/input/eclipse/share/keywords/900_OPM/W/WSKPTAB similarity index 100% rename from src/opm/parser/eclipse/share/keywords/900_OPM/W/WSKPTAB rename to src/opm/input/eclipse/share/keywords/900_OPM/W/WSKPTAB diff --git a/src/opm/parser/eclipse/share/keywords/keyword_list.cmake b/src/opm/input/eclipse/share/keywords/keyword_list.cmake similarity index 100% rename from src/opm/parser/eclipse/share/keywords/keyword_list.cmake rename to src/opm/input/eclipse/share/keywords/keyword_list.cmake diff --git a/src/opm/io/eclipse/ExtSmryOutput.cpp b/src/opm/io/eclipse/ExtSmryOutput.cpp index 11bd951ed..b7c16a15b 100644 --- a/src/opm/io/eclipse/ExtSmryOutput.cpp +++ b/src/opm/io/eclipse/ExtSmryOutput.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include diff --git a/src/opm/io/eclipse/rst/aquifer.cpp b/src/opm/io/eclipse/rst/aquifer.cpp index 0d4fc71f6..fa999f63a 100644 --- a/src/opm/io/eclipse/rst/aquifer.cpp +++ b/src/opm/io/eclipse/rst/aquifer.cpp @@ -24,10 +24,10 @@ #include #include -#include -#include +#include +#include -#include +#include #include #include diff --git a/src/opm/io/eclipse/rst/connection.cpp b/src/opm/io/eclipse/rst/connection.cpp index 8fb42a5c1..92db47826 100644 --- a/src/opm/io/eclipse/rst/connection.cpp +++ b/src/opm/io/eclipse/rst/connection.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include namespace VI = ::Opm::RestartIO::Helpers::VectorItems; diff --git a/src/opm/io/eclipse/rst/group.cpp b/src/opm/io/eclipse/rst/group.cpp index 1dee7246e..9b269f049 100644 --- a/src/opm/io/eclipse/rst/group.cpp +++ b/src/opm/io/eclipse/rst/group.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace VI = ::Opm::RestartIO::Helpers::VectorItems; diff --git a/src/opm/io/eclipse/rst/header.cpp b/src/opm/io/eclipse/rst/header.cpp index 705c00310..e46803e1a 100644 --- a/src/opm/io/eclipse/rst/header.cpp +++ b/src/opm/io/eclipse/rst/header.cpp @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include namespace VI = ::Opm::RestartIO::Helpers::VectorItems; using M = ::Opm::UnitSystem::measure; diff --git a/src/opm/io/eclipse/rst/network.cpp b/src/opm/io/eclipse/rst/network.cpp index 1af1b0e59..34faf807b 100644 --- a/src/opm/io/eclipse/rst/network.cpp +++ b/src/opm/io/eclipse/rst/network.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/src/opm/io/eclipse/rst/segment.cpp b/src/opm/io/eclipse/rst/segment.cpp index 2a5aad35c..f6ee6c5cf 100644 --- a/src/opm/io/eclipse/rst/segment.cpp +++ b/src/opm/io/eclipse/rst/segment.cpp @@ -19,11 +19,11 @@ #include #include -#include -#include -#include +#include +#include +#include -#include "src/opm/parser/eclipse/EclipseState/Schedule/MSW/icd_convert.hpp" +#include "src/opm/input/eclipse/EclipseState/Schedule/MSW/icd_convert.hpp" namespace VI = ::Opm::RestartIO::Helpers::VectorItems; diff --git a/src/opm/io/eclipse/rst/state.cpp b/src/opm/io/eclipse/rst/state.cpp index d3591dc25..865ff2ddd 100644 --- a/src/opm/io/eclipse/rst/state.cpp +++ b/src/opm/io/eclipse/rst/state.cpp @@ -32,11 +32,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include #include #include diff --git a/src/opm/io/eclipse/rst/well.cpp b/src/opm/io/eclipse/rst/well.cpp index f0bace2bd..5aa3c0048 100644 --- a/src/opm/io/eclipse/rst/well.cpp +++ b/src/opm/io/eclipse/rst/well.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff --git a/src/opm/output/eclipse/ActiveIndexByColumns.cpp b/src/opm/output/eclipse/ActiveIndexByColumns.cpp index 61be46d36..6f3e7fe7d 100644 --- a/src/opm/output/eclipse/ActiveIndexByColumns.cpp +++ b/src/opm/output/eclipse/ActiveIndexByColumns.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include #include diff --git a/src/opm/output/eclipse/AggregateActionxData.cpp b/src/opm/output/eclipse/AggregateActionxData.cpp index dc9e9c004..4d66198e0 100644 --- a/src/opm/output/eclipse/AggregateActionxData.cpp +++ b/src/opm/output/eclipse/AggregateActionxData.cpp @@ -22,25 +22,25 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/opm/output/eclipse/AggregateAquiferData.cpp b/src/opm/output/eclipse/AggregateAquiferData.cpp index adc0f8efb..76952d95a 100644 --- a/src/opm/output/eclipse/AggregateAquiferData.cpp +++ b/src/opm/output/eclipse/AggregateAquiferData.cpp @@ -25,18 +25,18 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include +#include -#include +#include -#include +#include #include diff --git a/src/opm/output/eclipse/AggregateConnectionData.cpp b/src/opm/output/eclipse/AggregateConnectionData.cpp index fbb59b76b..6c8916711 100644 --- a/src/opm/output/eclipse/AggregateConnectionData.cpp +++ b/src/opm/output/eclipse/AggregateConnectionData.cpp @@ -24,11 +24,11 @@ #include -#include -#include -#include +#include +#include +#include -#include +#include #include #include diff --git a/src/opm/output/eclipse/AggregateGroupData.cpp b/src/opm/output/eclipse/AggregateGroupData.cpp index a1c7b0aa9..164d5c339 100644 --- a/src/opm/output/eclipse/AggregateGroupData.cpp +++ b/src/opm/output/eclipse/AggregateGroupData.cpp @@ -24,12 +24,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/opm/output/eclipse/AggregateMSWData.cpp b/src/opm/output/eclipse/AggregateMSWData.cpp index 04cdf2959..50f633d8e 100644 --- a/src/opm/output/eclipse/AggregateMSWData.cpp +++ b/src/opm/output/eclipse/AggregateMSWData.cpp @@ -21,17 +21,17 @@ #include #include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/opm/output/eclipse/AggregateNetworkData.cpp b/src/opm/output/eclipse/AggregateNetworkData.cpp index a22faf78c..830f891e5 100644 --- a/src/opm/output/eclipse/AggregateNetworkData.cpp +++ b/src/opm/output/eclipse/AggregateNetworkData.cpp @@ -24,19 +24,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #include diff --git a/src/opm/output/eclipse/AggregateUDQData.cpp b/src/opm/output/eclipse/AggregateUDQData.cpp index 56bf6d0c5..4b5b0923a 100644 --- a/src/opm/output/eclipse/AggregateUDQData.cpp +++ b/src/opm/output/eclipse/AggregateUDQData.cpp @@ -24,20 +24,20 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/opm/output/eclipse/AggregateWListData.cpp b/src/opm/output/eclipse/AggregateWListData.cpp index 80d996567..5bc2013c9 100644 --- a/src/opm/output/eclipse/AggregateWListData.cpp +++ b/src/opm/output/eclipse/AggregateWListData.cpp @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/opm/output/eclipse/AggregateWellData.cpp b/src/opm/output/eclipse/AggregateWellData.cpp index cc55cf5eb..559468f08 100644 --- a/src/opm/output/eclipse/AggregateWellData.cpp +++ b/src/opm/output/eclipse/AggregateWellData.cpp @@ -25,25 +25,25 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #include diff --git a/src/opm/output/eclipse/CreateActionRSTDims.cpp b/src/opm/output/eclipse/CreateActionRSTDims.cpp index 5c7be006c..991434462 100644 --- a/src/opm/output/eclipse/CreateActionRSTDims.cpp +++ b/src/opm/output/eclipse/CreateActionRSTDims.cpp @@ -25,16 +25,16 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include -#include -#include +#include +#include #include #include diff --git a/src/opm/output/eclipse/CreateDoubHead.cpp b/src/opm/output/eclipse/CreateDoubHead.cpp index 62f89e66a..62ced489e 100644 --- a/src/opm/output/eclipse/CreateDoubHead.cpp +++ b/src/opm/output/eclipse/CreateDoubHead.cpp @@ -22,12 +22,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/opm/output/eclipse/CreateInteHead.cpp b/src/opm/output/eclipse/CreateInteHead.cpp index 8989e371b..626faf0f0 100644 --- a/src/opm/output/eclipse/CreateInteHead.cpp +++ b/src/opm/output/eclipse/CreateInteHead.cpp @@ -23,19 +23,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/opm/output/eclipse/CreateLogiHead.cpp b/src/opm/output/eclipse/CreateLogiHead.cpp index 4054046af..da0aa298c 100644 --- a/src/opm/output/eclipse/CreateLogiHead.cpp +++ b/src/opm/output/eclipse/CreateLogiHead.cpp @@ -21,8 +21,8 @@ #include -#include -#include +#include +#include #include diff --git a/src/opm/output/eclipse/CreateUdqDims.cpp b/src/opm/output/eclipse/CreateUdqDims.cpp index 65764f003..0a9c5428a 100644 --- a/src/opm/output/eclipse/CreateUdqDims.cpp +++ b/src/opm/output/eclipse/CreateUdqDims.cpp @@ -19,8 +19,8 @@ */ #include -#include -#include +#include +#include #include #include diff --git a/src/opm/output/eclipse/DoubHEAD.cpp b/src/opm/output/eclipse/DoubHEAD.cpp index a40c36781..9c9052f38 100644 --- a/src/opm/output/eclipse/DoubHEAD.cpp +++ b/src/opm/output/eclipse/DoubHEAD.cpp @@ -18,9 +18,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include // Opm::RestartIO::makeUTCTime() diff --git a/src/opm/output/eclipse/EclipseGridInspector.cpp b/src/opm/output/eclipse/EclipseGridInspector.cpp index ab8d90840..b667cd0a5 100644 --- a/src/opm/output/eclipse/EclipseGridInspector.cpp +++ b/src/opm/output/eclipse/EclipseGridInspector.cpp @@ -39,11 +39,11 @@ #endif #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/opm/output/eclipse/EclipseIO.cpp b/src/opm/output/eclipse/EclipseIO.cpp index 797e82018..380d01767 100644 --- a/src/opm/output/eclipse/EclipseIO.cpp +++ b/src/opm/output/eclipse/EclipseIO.cpp @@ -26,19 +26,19 @@ #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include diff --git a/src/opm/output/eclipse/InteHEAD.cpp b/src/opm/output/eclipse/InteHEAD.cpp index 4d31decb1..e71aaed21 100644 --- a/src/opm/output/eclipse/InteHEAD.cpp +++ b/src/opm/output/eclipse/InteHEAD.cpp @@ -22,12 +22,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/opm/output/eclipse/LoadRestart.cpp b/src/opm/output/eclipse/LoadRestart.cpp index bcd70bb67..0a30892b1 100644 --- a/src/opm/output/eclipse/LoadRestart.cpp +++ b/src/opm/output/eclipse/LoadRestart.cpp @@ -43,17 +43,17 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/opm/output/eclipse/RegionCache.cpp b/src/opm/output/eclipse/RegionCache.cpp index 3cdfe2eff..7892d9841 100644 --- a/src/opm/output/eclipse/RegionCache.cpp +++ b/src/opm/output/eclipse/RegionCache.cpp @@ -17,12 +17,12 @@ along with OPM. If not, see . */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/opm/output/eclipse/RestartIO.cpp b/src/opm/output/eclipse/RestartIO.cpp index ed89d85a7..f99679cb3 100644 --- a/src/opm/output/eclipse/RestartIO.cpp +++ b/src/opm/output/eclipse/RestartIO.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include @@ -42,14 +42,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/opm/output/eclipse/Summary.cpp b/src/opm/output/eclipse/Summary.cpp index 71c10da1e..cf829a649 100644 --- a/src/opm/output/eclipse/Summary.cpp +++ b/src/opm/output/eclipse/Summary.cpp @@ -28,28 +28,28 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include diff --git a/src/opm/output/eclipse/Tables.cpp b/src/opm/output/eclipse/Tables.cpp index b83c6c497..908190cae 100644 --- a/src/opm/output/eclipse/Tables.cpp +++ b/src/opm/output/eclipse/Tables.cpp @@ -21,22 +21,22 @@ #include -#include -#include -#include // PVTW, PVCDO -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include // PVTW, PVCDO +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/opm/output/eclipse/UDQDims.cpp b/src/opm/output/eclipse/UDQDims.cpp index da707e9de..0fe2cf131 100644 --- a/src/opm/output/eclipse/UDQDims.cpp +++ b/src/opm/output/eclipse/UDQDims.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace VI = ::Opm::RestartIO::Helpers::VectorItems; diff --git a/src/opm/output/eclipse/WriteInit.cpp b/src/opm/output/eclipse/WriteInit.cpp index 9cf2e7ea8..ef926f6fb 100644 --- a/src/opm/output/eclipse/WriteInit.cpp +++ b/src/opm/output/eclipse/WriteInit.cpp @@ -31,15 +31,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include +#include #include #include diff --git a/src/opm/output/eclipse/WriteRFT.cpp b/src/opm/output/eclipse/WriteRFT.cpp index 20a983897..330cfe1e0 100644 --- a/src/opm/output/eclipse/WriteRFT.cpp +++ b/src/opm/output/eclipse/WriteRFT.cpp @@ -31,11 +31,11 @@ #include -#include -#include -#include +#include +#include +#include -#include +#include #include #include diff --git a/src/opm/output/eclipse/report/WELSPECS.cpp b/src/opm/output/eclipse/report/WELSPECS.cpp index c0700c9d5..379fe2f73 100644 --- a/src/opm/output/eclipse/report/WELSPECS.cpp +++ b/src/opm/output/eclipse/report/WELSPECS.cpp @@ -24,10 +24,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace { diff --git a/tests/msim/test_msim.cpp b/tests/msim/test_msim.cpp index 4311056c4..74f65644a 100644 --- a/tests/msim/test_msim.cpp +++ b/tests/msim/test_msim.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include @@ -38,11 +38,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/tests/msim/test_msim_ACTIONX.cpp b/tests/msim/test_msim_ACTIONX.cpp index cfe328c8e..f9f085cd8 100644 --- a/tests/msim/test_msim_ACTIONX.cpp +++ b/tests/msim/test_msim_ACTIONX.cpp @@ -27,19 +27,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/tests/msim/test_msim_EXIT.cpp b/tests/msim/test_msim_EXIT.cpp index ec281b04f..e440d7eba 100644 --- a/tests/msim/test_msim_EXIT.cpp +++ b/tests/msim/test_msim_EXIT.cpp @@ -24,14 +24,14 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/tests/parser/ACTIONX.cpp b/tests/parser/ACTIONX.cpp index 94b404f4a..78896c482 100644 --- a/tests/parser/ACTIONX.cpp +++ b/tests/parser/ACTIONX.cpp @@ -28,27 +28,27 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/ADDREGTests.cpp b/tests/parser/ADDREGTests.cpp index b708e15b1..c6eede524 100644 --- a/tests/parser/ADDREGTests.cpp +++ b/tests/parser/ADDREGTests.cpp @@ -24,16 +24,16 @@ #define BOOST_TEST_MODULE EqualRegTests #include -#include +#include -#include +#include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include static Opm::Deck createDeckInvalidArray() { const char* deckData = diff --git a/tests/parser/AquiferTests.cpp b/tests/parser/AquiferTests.cpp index 96d3b4530..130017fe9 100644 --- a/tests/parser/AquiferTests.cpp +++ b/tests/parser/AquiferTests.cpp @@ -19,17 +19,17 @@ along with OPM. If not, see . #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include +#include -#include -#include +#include +#include #include #include diff --git a/tests/parser/BoxTests.cpp b/tests/parser/BoxTests.cpp index 95ac92055..3be1d6664 100644 --- a/tests/parser/BoxTests.cpp +++ b/tests/parser/BoxTests.cpp @@ -25,8 +25,8 @@ #include -#include -#include +#include +#include BOOST_AUTO_TEST_CASE(CreateBox) { Opm::EclipseGrid grid(4,3,2); diff --git a/tests/parser/COMPSEGUnits.cpp b/tests/parser/COMPSEGUnits.cpp index d2673a3ba..ff3736a55 100644 --- a/tests/parser/COMPSEGUnits.cpp +++ b/tests/parser/COMPSEGUnits.cpp @@ -21,12 +21,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/ColumnSchemaTests.cpp b/tests/parser/ColumnSchemaTests.cpp index f3d758420..4246a4c81 100644 --- a/tests/parser/ColumnSchemaTests.cpp +++ b/tests/parser/ColumnSchemaTests.cpp @@ -22,7 +22,7 @@ #include -#include +#include using namespace Opm; diff --git a/tests/parser/ConnectionTests.cpp b/tests/parser/ConnectionTests.cpp index 67e2c51ae..fd99e9d1f 100644 --- a/tests/parser/ConnectionTests.cpp +++ b/tests/parser/ConnectionTests.cpp @@ -25,22 +25,22 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include +#include #include -#include +#include namespace { double cp_rm3_per_db() diff --git a/tests/parser/CopyRegTests.cpp b/tests/parser/CopyRegTests.cpp index 6cc74b249..c01407f5b 100644 --- a/tests/parser/CopyRegTests.cpp +++ b/tests/parser/CopyRegTests.cpp @@ -25,12 +25,12 @@ #include -#include +#include -#include -#include +#include +#include -#include +#include static Opm::Deck createDeckInvalidArray1() { diff --git a/tests/parser/DeckTests.cpp b/tests/parser/DeckTests.cpp index 5858ce620..b50ac118e 100644 --- a/tests/parser/DeckTests.cpp +++ b/tests/parser/DeckTests.cpp @@ -25,21 +25,21 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include "src/opm/parser/eclipse/Parser/raw/RawRecord.hpp" +#include "src/opm/input/eclipse/Parser/raw/RawRecord.hpp" using namespace Opm; diff --git a/tests/parser/DeckValueTests.cpp b/tests/parser/DeckValueTests.cpp index 6abdbff24..2cfc618eb 100644 --- a/tests/parser/DeckValueTests.cpp +++ b/tests/parser/DeckValueTests.cpp @@ -25,14 +25,14 @@ #include -#include +#include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/EclipseGridTests.cpp b/tests/parser/EclipseGridTests.cpp index 5db0f4816..65a97f717 100644 --- a/tests/parser/EclipseGridTests.cpp +++ b/tests/parser/EclipseGridTests.cpp @@ -29,28 +29,28 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #define BOOST_TEST_MODULE EclipseGridTests #include -#include -#include -#include +#include +#include +#include -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include +#include #include #include "tests/WorkArea.cpp" diff --git a/tests/parser/EclipseStateTests.cpp b/tests/parser/EclipseStateTests.cpp index 1478a906f..0494350e4 100644 --- a/tests/parser/EclipseStateTests.cpp +++ b/tests/parser/EclipseStateTests.cpp @@ -24,21 +24,21 @@ along with OPM. If not, see . #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/EmbeddedPython.cpp b/tests/parser/EmbeddedPython.cpp index 50965617e..0659d006b 100644 --- a/tests/parser/EmbeddedPython.cpp +++ b/tests/parser/EmbeddedPython.cpp @@ -25,12 +25,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include using namespace Opm; diff --git a/tests/parser/EqualRegTests.cpp b/tests/parser/EqualRegTests.cpp index a8d01a159..e045882fe 100644 --- a/tests/parser/EqualRegTests.cpp +++ b/tests/parser/EqualRegTests.cpp @@ -25,15 +25,15 @@ #include -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include static Opm::Deck createDeckInvalidArray() { diff --git a/tests/parser/EventTests.cpp b/tests/parser/EventTests.cpp index 5e7d04e73..c03e673b8 100644 --- a/tests/parser/EventTests.cpp +++ b/tests/parser/EventTests.cpp @@ -23,7 +23,7 @@ #define BOOST_TEST_MODULE EventTests #include -#include +#include diff --git a/tests/parser/FaceDirTests.cpp b/tests/parser/FaceDirTests.cpp index 1a83fde7a..2cedffa52 100644 --- a/tests/parser/FaceDirTests.cpp +++ b/tests/parser/FaceDirTests.cpp @@ -24,7 +24,7 @@ #define BOOST_TEST_MODULE FaceDirTests #include -#include +#include namespace Opm { diff --git a/tests/parser/FaultTests.cpp b/tests/parser/FaultTests.cpp index f66c4a983..44ffedf9b 100644 --- a/tests/parser/FaultTests.cpp +++ b/tests/parser/FaultTests.cpp @@ -24,10 +24,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include diff --git a/tests/parser/FaultsTests.cpp b/tests/parser/FaultsTests.cpp index 9b0e5dba2..73a08e45a 100644 --- a/tests/parser/FaultsTests.cpp +++ b/tests/parser/FaultsTests.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include BOOST_AUTO_TEST_CASE(CreateFaultCollection) { diff --git a/tests/parser/FieldPropsTests.cpp b/tests/parser/FieldPropsTests.cpp index 7dad3c980..d01b2cb06 100644 --- a/tests/parser/FieldPropsTests.cpp +++ b/tests/parser/FieldPropsTests.cpp @@ -31,22 +31,22 @@ #include #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "src/opm/parser/eclipse/EclipseState/Grid/FieldProps.hpp" +#include "src/opm/input/eclipse/EclipseState/Grid/FieldProps.hpp" using namespace Opm; diff --git a/tests/parser/FoamTests.cpp b/tests/parser/FoamTests.cpp index 3b193bcfc..050cb48fb 100644 --- a/tests/parser/FoamTests.cpp +++ b/tests/parser/FoamTests.cpp @@ -22,10 +22,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/FunctionalTests.cpp b/tests/parser/FunctionalTests.cpp index ba2ca55fc..7b3b59889 100644 --- a/tests/parser/FunctionalTests.cpp +++ b/tests/parser/FunctionalTests.cpp @@ -24,7 +24,7 @@ #include -#include +#include using namespace Opm; diff --git a/tests/parser/GeomodifierTests.cpp b/tests/parser/GeomodifierTests.cpp index c1c1cbfc1..5d16272c3 100644 --- a/tests/parser/GeomodifierTests.cpp +++ b/tests/parser/GeomodifierTests.cpp @@ -23,22 +23,22 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/GroupTests.cpp b/tests/parser/GroupTests.cpp index c77f7f94a..cf31fa954 100644 --- a/tests/parser/GroupTests.cpp +++ b/tests/parser/GroupTests.cpp @@ -22,24 +22,24 @@ #define BOOST_TEST_MODULE GroupTests #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #include using namespace Opm; diff --git a/tests/parser/IOConfigTests.cpp b/tests/parser/IOConfigTests.cpp index 447815e10..6601669b3 100644 --- a/tests/parser/IOConfigTests.cpp +++ b/tests/parser/IOConfigTests.cpp @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "tests/WorkArea.cpp" namespace fs = std::filesystem; diff --git a/tests/parser/ImportTests.cpp b/tests/parser/ImportTests.cpp index 5876a57a8..4d71b309e 100644 --- a/tests/parser/ImportTests.cpp +++ b/tests/parser/ImportTests.cpp @@ -21,20 +21,20 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace Opm; namespace fs = std::filesystem; diff --git a/tests/parser/InitConfigTest.cpp b/tests/parser/InitConfigTest.cpp index 3b512e944..c46d6df42 100644 --- a/tests/parser/InitConfigTest.cpp +++ b/tests/parser/InitConfigTest.cpp @@ -22,11 +22,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/tests/parser/MICPTests.cpp b/tests/parser/MICPTests.cpp index 7ce271523..25c9a95f2 100644 --- a/tests/parser/MICPTests.cpp +++ b/tests/parser/MICPTests.cpp @@ -21,12 +21,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include BOOST_AUTO_TEST_CASE(TestMICP) { diff --git a/tests/parser/MULTREGTScannerTests.cpp b/tests/parser/MULTREGTScannerTests.cpp index e2f705bc3..4fa568fec 100644 --- a/tests/parser/MULTREGTScannerTests.cpp +++ b/tests/parser/MULTREGTScannerTests.cpp @@ -23,19 +23,19 @@ #define BOOST_TEST_MODULE MULTREGTScannerTests #include -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include diff --git a/tests/parser/MessageLimitTests.cpp b/tests/parser/MessageLimitTests.cpp index 17cbc36ad..703c8be83 100644 --- a/tests/parser/MessageLimitTests.cpp +++ b/tests/parser/MessageLimitTests.cpp @@ -24,14 +24,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/MultiRegTests.cpp b/tests/parser/MultiRegTests.cpp index 854802a4d..05db6cf8d 100644 --- a/tests/parser/MultiRegTests.cpp +++ b/tests/parser/MultiRegTests.cpp @@ -23,15 +23,15 @@ #define BOOST_TEST_MODULE MultiRegTests #include -#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include static Opm::Deck createDeckInvalidArray() { const char* deckData = diff --git a/tests/parser/MultisegmentWellTests.cpp b/tests/parser/MultisegmentWellTests.cpp index 51201e0bd..54c162cde 100644 --- a/tests/parser/MultisegmentWellTests.cpp +++ b/tests/parser/MultisegmentWellTests.cpp @@ -29,24 +29,24 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include "src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.hpp" -#include -#include +#include +#include +#include +#include +#include +#include "src/opm/input/eclipse/EclipseState/Schedule/MSW/Compsegs.hpp" +#include +#include -#include -#include -#include +#include +#include +#include BOOST_AUTO_TEST_CASE(AICDWellTest) { diff --git a/tests/parser/NetworkTests.cpp b/tests/parser/NetworkTests.cpp index d31e9e93e..54e5c4c40 100644 --- a/tests/parser/NetworkTests.cpp +++ b/tests/parser/NetworkTests.cpp @@ -23,15 +23,15 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/OrderedMapTests.cpp b/tests/parser/OrderedMapTests.cpp index e391132ff..a78ef79a4 100644 --- a/tests/parser/OrderedMapTests.cpp +++ b/tests/parser/OrderedMapTests.cpp @@ -23,8 +23,8 @@ #define BOOST_TEST_MODULE ScheduleTests #include -#include -#include +#include +#include BOOST_AUTO_TEST_CASE( check_empty) { diff --git a/tests/parser/PAvgTests.cpp b/tests/parser/PAvgTests.cpp index 569910296..8d5417e21 100644 --- a/tests/parser/PAvgTests.cpp +++ b/tests/parser/PAvgTests.cpp @@ -22,15 +22,15 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include using namespace Opm; diff --git a/tests/parser/PYACTION.cpp b/tests/parser/PYACTION.cpp index dc628eec7..819fc502c 100644 --- a/tests/parser/PYACTION.cpp +++ b/tests/parser/PYACTION.cpp @@ -22,11 +22,11 @@ #define BOOST_TEST_MODULE PY_ACTION_TESTER #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/ParseContextTests.cpp b/tests/parser/ParseContextTests.cpp index d4bbc157a..fbd10a9e5 100644 --- a/tests/parser/ParseContextTests.cpp +++ b/tests/parser/ParseContextTests.cpp @@ -24,26 +24,26 @@ #define BOOST_TEST_MODULE ParseContextTests #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/ParseContext_EXIT1.cpp b/tests/parser/ParseContext_EXIT1.cpp index 3148c6b13..20a1f7dea 100644 --- a/tests/parser/ParseContext_EXIT1.cpp +++ b/tests/parser/ParseContext_EXIT1.cpp @@ -4,10 +4,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include void exit1(Opm::InputError::Action action) { diff --git a/tests/parser/ParseDATAWithDefault.cpp b/tests/parser/ParseDATAWithDefault.cpp index bd62efd4c..114f6abc7 100644 --- a/tests/parser/ParseDATAWithDefault.cpp +++ b/tests/parser/ParseDATAWithDefault.cpp @@ -23,15 +23,15 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/ParserIncludeTests.cpp b/tests/parser/ParserIncludeTests.cpp index b170563e2..6a910ec30 100644 --- a/tests/parser/ParserIncludeTests.cpp +++ b/tests/parser/ParserIncludeTests.cpp @@ -24,11 +24,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/tests/parser/ParserTests.cpp b/tests/parser/ParserTests.cpp index f2ecb0d8a..4ab0ecf16 100644 --- a/tests/parser/ParserTests.cpp +++ b/tests/parser/ParserTests.cpp @@ -24,22 +24,22 @@ #include #include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "src/opm/parser/eclipse/Parser/raw/RawKeyword.hpp" -#include "src/opm/parser/eclipse/Parser/raw/RawRecord.hpp" +#include "src/opm/input/eclipse/Parser/raw/RawKeyword.hpp" +#include "src/opm/input/eclipse/Parser/raw/RawRecord.hpp" #include #include diff --git a/tests/parser/PvtxTableTests.cpp b/tests/parser/PvtxTableTests.cpp index 0a302f5f1..5d0673ff3 100644 --- a/tests/parser/PvtxTableTests.cpp +++ b/tests/parser/PvtxTableTests.cpp @@ -21,23 +21,23 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include // generic table classes -#include -#include -#include +#include +#include +#include // keyword specific table classes -//#include -#include -#include -#include -#include -#include +//#include +#include +#include +#include +#include +#include #include diff --git a/tests/parser/RFTConfigTests.cpp b/tests/parser/RFTConfigTests.cpp index 2f4b6e2b1..b7cfc0f29 100644 --- a/tests/parser/RFTConfigTests.cpp +++ b/tests/parser/RFTConfigTests.cpp @@ -21,15 +21,15 @@ #include -#include -#include +#include +#include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/tests/parser/RawKeywordTests.cpp b/tests/parser/RawKeywordTests.cpp index 9bcd6eb0f..d1cc87e8b 100644 --- a/tests/parser/RawKeywordTests.cpp +++ b/tests/parser/RawKeywordTests.cpp @@ -23,9 +23,9 @@ #include #include -#include "src/opm/parser/eclipse/Parser/raw/RawEnums.hpp" -#include "src/opm/parser/eclipse/Parser/raw/RawKeyword.hpp" -#include "src/opm/parser/eclipse/Parser/raw/RawRecord.hpp" +#include "src/opm/input/eclipse/Parser/raw/RawEnums.hpp" +#include "src/opm/input/eclipse/Parser/raw/RawKeyword.hpp" +#include "src/opm/input/eclipse/Parser/raw/RawRecord.hpp" using namespace Opm; diff --git a/tests/parser/ResinsightTest.cpp b/tests/parser/ResinsightTest.cpp index 75136dbc8..c1d59b531 100644 --- a/tests/parser/ResinsightTest.cpp +++ b/tests/parser/ResinsightTest.cpp @@ -20,16 +20,16 @@ #define BOOST_TEST_MODULE ResinsightIntegrationTests #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/RestartConfigTests.cpp b/tests/parser/RestartConfigTests.cpp index a36f63537..facfeea22 100644 --- a/tests/parser/RestartConfigTests.cpp +++ b/tests/parser/RestartConfigTests.cpp @@ -21,11 +21,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/parser/RockTableTests.cpp b/tests/parser/RockTableTests.cpp index c26593fb2..78aa51aca 100644 --- a/tests/parser/RockTableTests.cpp +++ b/tests/parser/RockTableTests.cpp @@ -21,24 +21,24 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include // generic table classes -#include -#include +#include +#include // keyword specific table classes -//#include -#include -#include -#include -#include -#include -#include -#include +//#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/parser/RunspecTests.cpp b/tests/parser/RunspecTests.cpp index 18daec57b..c52f71026 100644 --- a/tests/parser/RunspecTests.cpp +++ b/tests/parser/RunspecTests.cpp @@ -21,11 +21,11 @@ along with OPM. If not, see . #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/tests/parser/SaltTableTests.cpp b/tests/parser/SaltTableTests.cpp index e52ef121e..54a6eb6fd 100644 --- a/tests/parser/SaltTableTests.cpp +++ b/tests/parser/SaltTableTests.cpp @@ -21,21 +21,21 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // generic table classes -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include // keyword specific table classes diff --git a/tests/parser/ScheduleRestartTests.cpp b/tests/parser/ScheduleRestartTests.cpp index 5cc6afbfd..9810280aa 100644 --- a/tests/parser/ScheduleRestartTests.cpp +++ b/tests/parser/ScheduleRestartTests.cpp @@ -22,25 +22,25 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/tests/parser/ScheduleSerializeTest.cpp b/tests/parser/ScheduleSerializeTest.cpp index a91592a9d..6d204a3de 100644 --- a/tests/parser/ScheduleSerializeTest.cpp +++ b/tests/parser/ScheduleSerializeTest.cpp @@ -21,38 +21,38 @@ #include -#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/ScheduleTests.cpp b/tests/parser/ScheduleTests.cpp index ac7b06a04..096704e77 100644 --- a/tests/parser/ScheduleTests.cpp +++ b/tests/parser/ScheduleTests.cpp @@ -39,37 +39,37 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "tests/WorkArea.cpp" diff --git a/tests/parser/SectionTests.cpp b/tests/parser/SectionTests.cpp index 5d845f9d1..90857bb40 100644 --- a/tests/parser/SectionTests.cpp +++ b/tests/parser/SectionTests.cpp @@ -26,11 +26,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/SimpleTableTests.cpp b/tests/parser/SimpleTableTests.cpp index c29996616..cc0027469 100644 --- a/tests/parser/SimpleTableTests.cpp +++ b/tests/parser/SimpleTableTests.cpp @@ -22,11 +22,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/SimulationConfigTest.cpp b/tests/parser/SimulationConfigTest.cpp index 8cca7bbbe..3ed84b0c1 100644 --- a/tests/parser/SimulationConfigTest.cpp +++ b/tests/parser/SimulationConfigTest.cpp @@ -23,16 +23,16 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/StarTokenTests.cpp b/tests/parser/StarTokenTests.cpp index e17fee18d..68f352f60 100644 --- a/tests/parser/StarTokenTests.cpp +++ b/tests/parser/StarTokenTests.cpp @@ -21,7 +21,7 @@ #include #include -#include "src/opm/parser/eclipse/Parser/raw/StarToken.hpp" +#include "src/opm/input/eclipse/Parser/raw/StarToken.hpp" BOOST_AUTO_TEST_CASE(NoStarThrows) { diff --git a/tests/parser/SummaryConfigTests.cpp b/tests/parser/SummaryConfigTests.cpp index 70c70c883..a638cc44a 100644 --- a/tests/parser/SummaryConfigTests.cpp +++ b/tests/parser/SummaryConfigTests.cpp @@ -23,14 +23,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/tests/parser/TabdimsTests.cpp b/tests/parser/TabdimsTests.cpp index 1a0c02240..857c4dbc0 100644 --- a/tests/parser/TabdimsTests.cpp +++ b/tests/parser/TabdimsTests.cpp @@ -19,7 +19,7 @@ #define BOOST_TEST_MODULE TABDIMS_TESTS #include -#include +#include BOOST_AUTO_TEST_CASE(TEST_CREATE) { Opm::Tabdims tabdims; diff --git a/tests/parser/TableColumnTests.cpp b/tests/parser/TableColumnTests.cpp index 76e9696b7..84216ab29 100644 --- a/tests/parser/TableColumnTests.cpp +++ b/tests/parser/TableColumnTests.cpp @@ -22,9 +22,9 @@ #include -#include -#include -#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/TableContainerTests.cpp b/tests/parser/TableContainerTests.cpp index 21dec6d18..1bec3546d 100644 --- a/tests/parser/TableContainerTests.cpp +++ b/tests/parser/TableContainerTests.cpp @@ -21,12 +21,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/parser/TableManagerTests.cpp b/tests/parser/TableManagerTests.cpp index 58f5b35dd..52d792bcd 100644 --- a/tests/parser/TableManagerTests.cpp +++ b/tests/parser/TableManagerTests.cpp @@ -21,34 +21,34 @@ #include -#include -#include +#include +#include // generic table classes -#include -#include +#include +#include // keyword specific table classes -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include -#include +#include #include #include diff --git a/tests/parser/TableSchemaTests.cpp b/tests/parser/TableSchemaTests.cpp index 332361f63..85f12a0b8 100644 --- a/tests/parser/TableSchemaTests.cpp +++ b/tests/parser/TableSchemaTests.cpp @@ -22,9 +22,9 @@ #include -#include -#include -#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/ThresholdPressureTest.cpp b/tests/parser/ThresholdPressureTest.cpp index 94ce9aa9c..f9c2206a5 100644 --- a/tests/parser/ThresholdPressureTest.cpp +++ b/tests/parser/ThresholdPressureTest.cpp @@ -25,14 +25,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/TracerTests.cpp b/tests/parser/TracerTests.cpp index 53757a183..e2a3d01cc 100644 --- a/tests/parser/TracerTests.cpp +++ b/tests/parser/TracerTests.cpp @@ -22,10 +22,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/TransMultTests.cpp b/tests/parser/TransMultTests.cpp index 4150169c3..082e2dd72 100644 --- a/tests/parser/TransMultTests.cpp +++ b/tests/parser/TransMultTests.cpp @@ -23,14 +23,14 @@ #define BOOST_TEST_MODULE EclipseGridTests #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include BOOST_AUTO_TEST_CASE(Empty) { Opm::EclipseGrid grid(10,10,10); diff --git a/tests/parser/TuningTests.cpp b/tests/parser/TuningTests.cpp index 492f8e0e7..6febbec21 100644 --- a/tests/parser/TuningTests.cpp +++ b/tests/parser/TuningTests.cpp @@ -22,15 +22,15 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/UDQTests.cpp b/tests/parser/UDQTests.cpp index 4c05586fc..5e540436e 100644 --- a/tests/parser/UDQTests.cpp +++ b/tests/parser/UDQTests.cpp @@ -21,29 +21,29 @@ Copyright 2018 Statoil ASA. #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include using namespace Opm; diff --git a/tests/parser/UnitTests.cpp b/tests/parser/UnitTests.cpp index f3110657c..a3752dbe2 100644 --- a/tests/parser/UnitTests.cpp +++ b/tests/parser/UnitTests.cpp @@ -19,9 +19,9 @@ #define BOOST_TEST_MODULE UnitTests -#include -#include -#include +#include +#include +#include #include diff --git a/tests/parser/WLIST.cpp b/tests/parser/WLIST.cpp index 40bec358f..5d16a3977 100644 --- a/tests/parser/WLIST.cpp +++ b/tests/parser/WLIST.cpp @@ -24,15 +24,15 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include using namespace Opm; diff --git a/tests/parser/WTEST.cpp b/tests/parser/WTEST.cpp index 4753dc5a5..48bcf32e1 100644 --- a/tests/parser/WTEST.cpp +++ b/tests/parser/WTEST.cpp @@ -23,16 +23,16 @@ #define BOOST_TEST_MODULE WTEST #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "tests/MessageBuffer.cpp" diff --git a/tests/parser/WellSolventTests.cpp b/tests/parser/WellSolventTests.cpp index a4fae3601..8dc762681 100644 --- a/tests/parser/WellSolventTests.cpp +++ b/tests/parser/WellSolventTests.cpp @@ -21,17 +21,17 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/WellTests.cpp b/tests/parser/WellTests.cpp index 8bc8113f0..d6b0114d1 100644 --- a/tests/parser/WellTests.cpp +++ b/tests/parser/WellTests.cpp @@ -26,29 +26,29 @@ #define BOOST_TEST_MODULE WellTest #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include using namespace Opm; diff --git a/tests/parser/WellTracerTests.cpp b/tests/parser/WellTracerTests.cpp index 20671ee64..4ed161225 100644 --- a/tests/parser/WellTracerTests.cpp +++ b/tests/parser/WellTracerTests.cpp @@ -22,16 +22,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/WriteRestartFileEventsTests.cpp b/tests/parser/WriteRestartFileEventsTests.cpp index d59678767..21c6b8fd8 100644 --- a/tests/parser/WriteRestartFileEventsTests.cpp +++ b/tests/parser/WriteRestartFileEventsTests.cpp @@ -20,7 +20,7 @@ #define BOOST_TEST_MODULE Restart File Events #include -#include +#include #include diff --git a/tests/parser/integration/BoxTest.cpp b/tests/parser/integration/BoxTest.cpp index c52e6f502..eadc6bd9a 100644 --- a/tests/parser/integration/BoxTest.cpp +++ b/tests/parser/integration/BoxTest.cpp @@ -23,11 +23,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/integration/CheckDeckValidity.cpp b/tests/parser/integration/CheckDeckValidity.cpp index 0ee0bdf55..4db2f1aa8 100644 --- a/tests/parser/integration/CheckDeckValidity.cpp +++ b/tests/parser/integration/CheckDeckValidity.cpp @@ -21,12 +21,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include BOOST_AUTO_TEST_CASE( KeywordInCorrectSection ) { diff --git a/tests/parser/integration/EclipseGridCreateFromDeck.cpp b/tests/parser/integration/EclipseGridCreateFromDeck.cpp index d949c6b07..e361acfc4 100644 --- a/tests/parser/integration/EclipseGridCreateFromDeck.cpp +++ b/tests/parser/integration/EclipseGridCreateFromDeck.cpp @@ -23,11 +23,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/tests/parser/integration/IOConfigIntegrationTest.cpp b/tests/parser/integration/IOConfigIntegrationTest.cpp index eb344011c..7c5166803 100644 --- a/tests/parser/integration/IOConfigIntegrationTest.cpp +++ b/tests/parser/integration/IOConfigIntegrationTest.cpp @@ -28,12 +28,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/integration/IncludeTest.cpp b/tests/parser/integration/IncludeTest.cpp index 16eb4341c..954d0a837 100644 --- a/tests/parser/integration/IncludeTest.cpp +++ b/tests/parser/integration/IncludeTest.cpp @@ -26,12 +26,12 @@ #include #include -#include +#include -#include -#include +#include +#include -#include +#include using namespace Opm; using namespace std::filesystem; diff --git a/tests/parser/integration/IntegrationTests.cpp b/tests/parser/integration/IntegrationTests.cpp index aadb6266b..0b9fddd62 100644 --- a/tests/parser/integration/IntegrationTests.cpp +++ b/tests/parser/integration/IntegrationTests.cpp @@ -22,15 +22,15 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include -#include +#include #include diff --git a/tests/parser/integration/NNCTests.cpp b/tests/parser/integration/NNCTests.cpp index 81c5ee7dd..5db88ccaa 100644 --- a/tests/parser/integration/NNCTests.cpp +++ b/tests/parser/integration/NNCTests.cpp @@ -17,12 +17,12 @@ along with OPM. If not, see . */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #define BOOST_TEST_MODULE NNCTests diff --git a/tests/parser/integration/ParseKEYWORD.cpp b/tests/parser/integration/ParseKEYWORD.cpp index 4c228d4b0..359807ecc 100644 --- a/tests/parser/integration/ParseKEYWORD.cpp +++ b/tests/parser/integration/ParseKEYWORD.cpp @@ -21,25 +21,25 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include using namespace Opm; diff --git a/tests/parser/integration/Polymer.cpp b/tests/parser/integration/Polymer.cpp index fec69aada..8031ca7d8 100644 --- a/tests/parser/integration/Polymer.cpp +++ b/tests/parser/integration/Polymer.cpp @@ -20,13 +20,13 @@ #define BOOST_TEST_MODULE ParserIntegrationTests #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/integration/ScheduleCreateFromDeck.cpp b/tests/parser/integration/ScheduleCreateFromDeck.cpp index 712e54a0e..46969e007 100644 --- a/tests/parser/integration/ScheduleCreateFromDeck.cpp +++ b/tests/parser/integration/ScheduleCreateFromDeck.cpp @@ -23,21 +23,21 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include using namespace Opm; diff --git a/tests/parser/integration/TransMultIntegrationTests.cpp b/tests/parser/integration/TransMultIntegrationTests.cpp index a2118ee23..c68959d08 100644 --- a/tests/parser/integration/TransMultIntegrationTests.cpp +++ b/tests/parser/integration/TransMultIntegrationTests.cpp @@ -19,12 +19,12 @@ #define BOOST_TEST_MODULE TransMultTests #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include using namespace Opm; diff --git a/tests/parser/integration/parse_write.cpp b/tests/parser/integration/parse_write.cpp index 0a52cb77d..1cea73f5a 100644 --- a/tests/parser/integration/parse_write.cpp +++ b/tests/parser/integration/parse_write.cpp @@ -20,12 +20,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include inline void loadDeck( const char * deck_file) { Opm::Parser parser; diff --git a/tests/parser/test_ReportConfig.cpp b/tests/parser/test_ReportConfig.cpp index 5fcc6eac9..e64c0e1b7 100644 --- a/tests/parser/test_ReportConfig.cpp +++ b/tests/parser/test_ReportConfig.cpp @@ -24,12 +24,12 @@ #define BOOST_TEST_MODULE ReportConfigTest #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include diff --git a/tests/rst_test.cpp b/tests/rst_test.cpp index 7cee0c77d..a52c5989e 100644 --- a/tests/rst_test.cpp +++ b/tests/rst_test.cpp @@ -26,16 +26,16 @@ #include #include -#include -#include +#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/tests/test_ActiveIndexByColumns.cpp b/tests/test_ActiveIndexByColumns.cpp index f344952a1..8674a84a2 100644 --- a/tests/test_ActiveIndexByColumns.cpp +++ b/tests/test_ActiveIndexByColumns.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include #include diff --git a/tests/test_AggregateActionxData.cpp b/tests/test_AggregateActionxData.cpp index 474dd6a45..4eb2cd0aa 100644 --- a/tests/test_AggregateActionxData.cpp +++ b/tests/test_AggregateActionxData.cpp @@ -6,15 +6,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include #include @@ -23,17 +23,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include #include diff --git a/tests/test_AggregateAquiferData.cpp b/tests/test_AggregateAquiferData.cpp index bc02bf9d9..49aa96301 100644 --- a/tests/test_AggregateAquiferData.cpp +++ b/tests/test_AggregateAquiferData.cpp @@ -29,21 +29,21 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include -#include +#include #include diff --git a/tests/test_AggregateConnectionData.cpp b/tests/test_AggregateConnectionData.cpp index a2838fbaa..e11e7b002 100644 --- a/tests/test_AggregateConnectionData.cpp +++ b/tests/test_AggregateConnectionData.cpp @@ -34,12 +34,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/tests/test_AggregateGroupData.cpp b/tests/test_AggregateGroupData.cpp index f5fded4ea..68a404117 100644 --- a/tests/test_AggregateGroupData.cpp +++ b/tests/test_AggregateGroupData.cpp @@ -28,15 +28,15 @@ #include #include #include -#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/test_AggregateMSWData.cpp b/tests/test_AggregateMSWData.cpp index f98226814..e634d1485 100644 --- a/tests/test_AggregateMSWData.cpp +++ b/tests/test_AggregateMSWData.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -33,11 +33,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/test_AggregateNetworkData.cpp b/tests/test_AggregateNetworkData.cpp index 355f88c02..51e8e2467 100644 --- a/tests/test_AggregateNetworkData.cpp +++ b/tests/test_AggregateNetworkData.cpp @@ -29,15 +29,15 @@ #include #include #include -#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/test_AggregateUDQData.cpp b/tests/test_AggregateUDQData.cpp index 304c18e36..ac70d243b 100644 --- a/tests/test_AggregateUDQData.cpp +++ b/tests/test_AggregateUDQData.cpp @@ -5,11 +5,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -17,24 +17,24 @@ #include #include #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include diff --git a/tests/test_AggregateWListData.cpp b/tests/test_AggregateWListData.cpp index 35a0bc4ff..bd5348ac8 100644 --- a/tests/test_AggregateWListData.cpp +++ b/tests/test_AggregateWListData.cpp @@ -26,20 +26,20 @@ #include #include -#include +#include #include #include #include -#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/test_AggregateWellData.cpp b/tests/test_AggregateWellData.cpp index f2dbe28a0..70d06ee25 100644 --- a/tests/test_AggregateWellData.cpp +++ b/tests/test_AggregateWellData.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -35,17 +35,17 @@ #include #include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/tests/test_ArrayDimChecker.cpp b/tests/test_ArrayDimChecker.cpp index 52fcab032..9dc760d90 100644 --- a/tests/test_ArrayDimChecker.cpp +++ b/tests/test_ArrayDimChecker.cpp @@ -21,17 +21,17 @@ #include #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/tests/test_DoubHEAD.cpp b/tests/test_DoubHEAD.cpp index 511243653..af4a9699d 100644 --- a/tests/test_DoubHEAD.cpp +++ b/tests/test_DoubHEAD.cpp @@ -20,8 +20,8 @@ #define BOOST_TEST_MODULE DoubHEAD_Vector #include -#include -#include +#include +#include #include #include @@ -30,11 +30,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/test_EclipseIO.cpp b/tests/test_EclipseIO.cpp index 0d8f13cb8..93dc60029 100644 --- a/tests/test_EclipseIO.cpp +++ b/tests/test_EclipseIO.cpp @@ -24,20 +24,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/test_GuideRate.cpp b/tests/test_GuideRate.cpp index 5fe784e24..e6b94ba4c 100644 --- a/tests/test_GuideRate.cpp +++ b/tests/test_GuideRate.cpp @@ -21,21 +21,21 @@ #include -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include #include #include diff --git a/tests/test_InteHEAD.cpp b/tests/test_InteHEAD.cpp index 90accf958..ecff6ca98 100644 --- a/tests/test_InteHEAD.cpp +++ b/tests/test_InteHEAD.cpp @@ -26,10 +26,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/tests/test_LGOData.cpp b/tests/test_LGOData.cpp index 9ddc6625e..61243b036 100644 --- a/tests/test_LGOData.cpp +++ b/tests/test_LGOData.cpp @@ -2,15 +2,15 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -20,10 +20,10 @@ #include #include #include -#include +#include -#include -#include +#include +#include #include #include diff --git a/tests/test_RFT.cpp b/tests/test_RFT.cpp index 852614dab..cd006321a 100644 --- a/tests/test_RFT.cpp +++ b/tests/test_RFT.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -33,21 +33,21 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include -#include -#include +#include +#include #include #include diff --git a/tests/test_Restart.cpp b/tests/test_Restart.cpp index b3f21d4d3..868e28662 100644 --- a/tests/test_Restart.cpp +++ b/tests/test_Restart.cpp @@ -29,22 +29,22 @@ #include #include #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/test_Solution.cpp b/tests/test_Solution.cpp index 29845451a..53f7122fb 100644 --- a/tests/test_Solution.cpp +++ b/tests/test_Solution.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include using namespace Opm; diff --git a/tests/test_Summary.cpp b/tests/test_Summary.cpp index 969538541..314676357 100644 --- a/tests/test_Summary.cpp +++ b/tests/test_Summary.cpp @@ -41,18 +41,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include diff --git a/tests/test_Summary_Group.cpp b/tests/test_Summary_Group.cpp index ad4cc1ca6..e808a8ed0 100644 --- a/tests/test_Summary_Group.cpp +++ b/tests/test_Summary_Group.cpp @@ -39,18 +39,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include diff --git a/tests/test_Tables.cpp b/tests/test_Tables.cpp index cb162bc96..bb28672bb 100644 --- a/tests/test_Tables.cpp +++ b/tests/test_Tables.cpp @@ -31,12 +31,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/tests/test_regionCache.cpp b/tests/test_regionCache.cpp index a3d328fce..566d7c977 100644 --- a/tests/test_regionCache.cpp +++ b/tests/test_regionCache.cpp @@ -25,13 +25,13 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include diff --git a/tests/test_restartwellinfo.cpp b/tests/test_restartwellinfo.cpp index 8d7005de9..376f0bb62 100644 --- a/tests/test_restartwellinfo.cpp +++ b/tests/test_restartwellinfo.cpp @@ -24,23 +24,23 @@ #include #include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/tests/test_rst.cpp b/tests/test_rst.cpp index 8fda39484..48695e4a3 100644 --- a/tests/test_rst.cpp +++ b/tests/test_rst.cpp @@ -37,14 +37,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include