diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index cb94a7af9..bc99d2b8d 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -58,7 +58,7 @@ if(ENABLE_ECL_INPUT) 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/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 @@ -98,78 +98,78 @@ if(ENABLE_ECL_INPUT) 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/Schedule/Action/ActionAST.cpp + src/opm/input/eclipse/Schedule/Action/ActionContext.cpp + src/opm/input/eclipse/Schedule/Action/ActionResult.cpp + src/opm/input/eclipse/Schedule/Action/Actdims.cpp + src/opm/input/eclipse/Schedule/Action/Actions.cpp + src/opm/input/eclipse/Schedule/Action/ActionX.cpp + src/opm/input/eclipse/Schedule/Action/ActionParser.cpp + src/opm/input/eclipse/Schedule/Action/ActionValue.cpp + src/opm/input/eclipse/Schedule/Action/ASTNode.cpp + src/opm/input/eclipse/Schedule/Action/Condition.cpp + src/opm/input/eclipse/Schedule/Action/Enums.cpp + src/opm/input/eclipse/Schedule/Action/State.cpp + src/opm/input/eclipse/Schedule/Action/WGNames.cpp + src/opm/input/eclipse/Schedule/ArrayDimChecker.cpp + src/opm/input/eclipse/Schedule/CompletedCells.cpp + src/opm/input/eclipse/Schedule/eval_uda.cpp + src/opm/input/eclipse/Schedule/Events.cpp + src/opm/input/eclipse/Schedule/GasLiftOpt.cpp + src/opm/input/eclipse/Schedule/Group/GPMaint.cpp + src/opm/input/eclipse/Schedule/Group/Group.cpp + src/opm/input/eclipse/Schedule/Group/GuideRate.cpp + src/opm/input/eclipse/Schedule/Group/GuideRateConfig.cpp + src/opm/input/eclipse/Schedule/Group/GuideRateModel.cpp + src/opm/input/eclipse/Schedule/Group/GConSale.cpp + src/opm/input/eclipse/Schedule/Group/GConSump.cpp + src/opm/input/eclipse/Schedule/Group/GTNode.cpp + src/opm/input/eclipse/Schedule/KeywordHandlers.cpp + src/opm/input/eclipse/Schedule/MessageLimits.cpp + src/opm/input/eclipse/Schedule/MSW/icd.cpp + src/opm/input/eclipse/Schedule/MSW/Compsegs.cpp + src/opm/input/eclipse/Schedule/MSW/Segment.cpp + src/opm/input/eclipse/Schedule/MSW/WellSegments.cpp + src/opm/input/eclipse/Schedule/MSW/AICD.cpp + src/opm/input/eclipse/Schedule/MSW/SICD.cpp + src/opm/input/eclipse/Schedule/MSW/Valve.cpp + src/opm/input/eclipse/Schedule/Network/Balance.cpp + src/opm/input/eclipse/Schedule/Network/Branch.cpp + src/opm/input/eclipse/Schedule/Network/ExtNetwork.cpp + src/opm/input/eclipse/Schedule/Network/Node.cpp + src/opm/input/eclipse/Schedule/OilVaporizationProperties.cpp + src/opm/input/eclipse/Schedule/RFTConfig.cpp + src/opm/input/eclipse/Schedule/RPTConfig.cpp + src/opm/input/eclipse/Schedule/RSTConfig.cpp + src/opm/input/eclipse/Schedule/Schedule.cpp + src/opm/input/eclipse/Schedule/ScheduleDeck.cpp + src/opm/input/eclipse/Schedule/ScheduleGrid.cpp + src/opm/input/eclipse/Schedule/ScheduleState.cpp + src/opm/input/eclipse/Schedule/ScheduleTypes.cpp + src/opm/input/eclipse/Schedule/SummaryState.cpp + src/opm/input/eclipse/Schedule/Tuning.cpp + src/opm/input/eclipse/Schedule/WriteRestartFileEvents.cpp + src/opm/input/eclipse/Schedule/Well/Connection.cpp + src/opm/input/eclipse/Schedule/Well/injection.cpp + src/opm/input/eclipse/Schedule/Well/PAvg.cpp + src/opm/input/eclipse/Schedule/Well/PAvgCalculator.cpp + src/opm/input/eclipse/Schedule/Well/PAvgCalculatorCollection.cpp + src/opm/input/eclipse/Schedule/Well/Well.cpp + src/opm/input/eclipse/Schedule/Well/WellConnections.cpp + src/opm/input/eclipse/Schedule/Well/NameOrder.cpp + src/opm/input/eclipse/Schedule/Well/WellMatcher.cpp + src/opm/input/eclipse/Schedule/Well/WList.cpp + src/opm/input/eclipse/Schedule/Well/WListManager.cpp + src/opm/input/eclipse/Schedule/Well/WellEconProductionLimits.cpp + src/opm/input/eclipse/Schedule/Well/WellFoamProperties.cpp + src/opm/input/eclipse/Schedule/Well/WellInjectionProperties.cpp + src/opm/input/eclipse/Schedule/Well/WellMICPProperties.cpp + src/opm/input/eclipse/Schedule/Well/WellPolymerProperties.cpp + src/opm/input/eclipse/Schedule/Well/WellBrineProperties.cpp + src/opm/input/eclipse/Schedule/Well/WellTracerProperties.cpp + src/opm/input/eclipse/Schedule/Well/WellProductionProperties.cpp + src/opm/input/eclipse/Schedule/Well/WellTestConfig.cpp + src/opm/input/eclipse/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 @@ -199,23 +199,23 @@ if(ENABLE_ECL_INPUT) 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/Schedule/UDQ/UDQASTNode.cpp + src/opm/input/eclipse/Schedule/UDQ/UDQParams.cpp + src/opm/input/eclipse/Schedule/UDQ/UDQParser.cpp + src/opm/input/eclipse/Schedule/UDQ/UDQSet.cpp + src/opm/input/eclipse/Schedule/UDQ/UDQActive.cpp + src/opm/input/eclipse/Schedule/UDQ/UDQAssign.cpp + src/opm/input/eclipse/Schedule/UDQ/UDQDefine.cpp + src/opm/input/eclipse/Schedule/UDQ/UDQEnums.cpp + src/opm/input/eclipse/Schedule/UDQ/UDQToken.cpp + src/opm/input/eclipse/Schedule/UDQ/UDQConfig.cpp + src/opm/input/eclipse/Schedule/UDQ/UDQContext.cpp + src/opm/input/eclipse/Schedule/UDQ/UDQFunction.cpp + src/opm/input/eclipse/Schedule/UDQ/UDQFunctionTable.cpp + src/opm/input/eclipse/Schedule/UDQ/UDQInput.cpp + src/opm/input/eclipse/Schedule/UDQ/UDQState.cpp + src/opm/input/eclipse/Schedule/VFPInjTable.cpp + src/opm/input/eclipse/Schedule/VFPProdTable.cpp src/opm/input/eclipse/Parser/ErrorGuard.cpp src/opm/input/eclipse/Parser/ParseContext.cpp src/opm/input/eclipse/Parser/Parser.cpp @@ -262,7 +262,7 @@ 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/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) + set_source_files_properties(src/opm/input/eclipse/Schedule/Action/PyAction.cpp PROPERTIES COMPILE_FLAGS -Wno-shadow) list( APPEND MAIN_SOURCE_FILES src/opm/input/eclipse/Python/PythonInterp.cpp src/opm/input/eclipse/Python/PyRunModule.cpp @@ -788,101 +788,101 @@ if(ENABLE_ECL_INPUT) 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/Schedule/Action/ActionAST.hpp + opm/input/eclipse/Schedule/Action/ActionContext.hpp + opm/input/eclipse/Schedule/Action/ActionResult.hpp + opm/input/eclipse/Schedule/Action/ActionValue.hpp + opm/input/eclipse/Schedule/Action/Actdims.hpp + opm/input/eclipse/Schedule/Action/Actions.hpp + opm/input/eclipse/Schedule/Action/ActionX.hpp + opm/input/eclipse/Schedule/Action/Condition.hpp + opm/input/eclipse/Schedule/Action/Enums.hpp + opm/input/eclipse/Schedule/Action/ASTNode.hpp + opm/input/eclipse/Schedule/Action/PyAction.hpp + opm/input/eclipse/Schedule/Action/SimulatorUpdate.hpp + opm/input/eclipse/Schedule/Action/State.hpp + opm/input/eclipse/Schedule/Action/WGNames.hpp + opm/input/eclipse/Schedule/ArrayDimChecker.hpp + opm/input/eclipse/Schedule/GasLiftOpt.hpp + opm/input/eclipse/Schedule/Network/Balance.hpp + opm/input/eclipse/Schedule/Network/Branch.hpp + opm/input/eclipse/Schedule/Network/ExtNetwork.hpp + opm/input/eclipse/Schedule/Network/Node.hpp + opm/input/eclipse/Schedule/VFPInjTable.hpp + opm/input/eclipse/Schedule/VFPProdTable.hpp + opm/input/eclipse/Schedule/Well/Connection.hpp + opm/input/eclipse/Schedule/Well/ProductionControls.hpp + opm/input/eclipse/Schedule/Well/InjectionControls.hpp + opm/input/eclipse/Schedule/Well/PAvg.hpp + opm/input/eclipse/Schedule/Well/PAvgCalculator.hpp + opm/input/eclipse/Schedule/Well/PAvgCalculatorCollection.hpp + opm/input/eclipse/Schedule/Well/Well.hpp + opm/input/eclipse/Schedule/Well/WList.hpp + opm/input/eclipse/Schedule/Well/NameOrder.hpp + opm/input/eclipse/Schedule/Well/WellMatcher.hpp + opm/input/eclipse/Schedule/Well/WListManager.hpp + opm/input/eclipse/Schedule/Well/WellEconProductionLimits.hpp + opm/input/eclipse/Schedule/Well/WellFoamProperties.hpp + opm/input/eclipse/Schedule/Well/WellBrineProperties.hpp + opm/input/eclipse/Schedule/Well/WellInjectionProperties.hpp + opm/input/eclipse/Schedule/Well/WellMICPProperties.hpp + opm/input/eclipse/Schedule/Well/WellPolymerProperties.hpp + opm/input/eclipse/Schedule/Well/WellProductionProperties.hpp + opm/input/eclipse/Schedule/Well/WellTracerProperties.hpp + opm/input/eclipse/Schedule/Well/WellTestConfig.hpp + opm/input/eclipse/Schedule/Well/WellTestState.hpp + opm/input/eclipse/Schedule/Well/WellConnections.hpp + opm/input/eclipse/Schedule/SummaryState.hpp + opm/input/eclipse/Schedule/RFTConfig.hpp + opm/input/eclipse/Schedule/RPTConfig.hpp + opm/input/eclipse/Schedule/RSTConfig.hpp + opm/input/eclipse/Schedule/Schedule.hpp + opm/input/eclipse/Schedule/ScheduleDeck.hpp + opm/input/eclipse/Schedule/ScheduleGrid.hpp + opm/input/eclipse/Schedule/ScheduleState.hpp + opm/input/eclipse/Schedule/ScheduleTypes.hpp + opm/input/eclipse/Schedule/Tuning.hpp + opm/input/eclipse/Schedule/WriteRestartFileEvents.hpp + opm/input/eclipse/Schedule/Group/GPMaint.hpp + opm/input/eclipse/Schedule/Group/GTNode.hpp + opm/input/eclipse/Schedule/Group/Group.hpp + opm/input/eclipse/Schedule/Group/GuideRate.hpp + opm/input/eclipse/Schedule/Group/GConSale.hpp + opm/input/eclipse/Schedule/Group/GConSump.hpp + opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp + opm/input/eclipse/Schedule/Group/GuideRateModel.hpp + opm/input/eclipse/Schedule/MessageLimits.hpp + opm/input/eclipse/Schedule/CompletedCells.hpp + opm/input/eclipse/Schedule/Events.hpp + opm/input/eclipse/Schedule/OilVaporizationProperties.hpp + opm/input/eclipse/Schedule/MSW/icd.hpp + opm/input/eclipse/Schedule/MSW/Segment.hpp + opm/input/eclipse/Schedule/MSW/Segment.hpp + opm/input/eclipse/Schedule/MSW/WellSegments.hpp + opm/input/eclipse/Schedule/MSW/AICD.hpp + opm/input/eclipse/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/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/Schedule/UDQ/UDQAssign.hpp + opm/input/eclipse/Schedule/UDQ/UDQASTNode.hpp + opm/input/eclipse/Schedule/UDQ/UDQDefine.hpp + opm/input/eclipse/Schedule/UDQ/UDQContext.hpp + opm/input/eclipse/Schedule/UDQ/UDQState.hpp + opm/input/eclipse/Schedule/UDQ/UDQConfig.hpp + opm/input/eclipse/Schedule/UDQ/UDQEnums.hpp + opm/input/eclipse/Schedule/UDQ/UDQParams.hpp + opm/input/eclipse/Schedule/UDQ/UDQInput.hpp + opm/input/eclipse/Schedule/UDQ/UDQActive.hpp + opm/input/eclipse/Schedule/UDQ/UDQSet.hpp + opm/input/eclipse/Schedule/UDQ/UDQToken.hpp + opm/input/eclipse/Schedule/UDQ/UDQFunction.hpp + opm/input/eclipse/Schedule/UDQ/UDQFunctionTable.hpp opm/input/eclipse/Deck/DeckItem.hpp opm/input/eclipse/Deck/Deck.hpp opm/input/eclipse/Deck/DeckView.hpp diff --git a/examples/msim.cpp b/examples/msim.cpp index b5a9b943d..65e7aa2d8 100644 --- a/examples/msim.cpp +++ b/examples/msim.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/examples/opmhash.cpp b/examples/opmhash.cpp index 904753d83..c8eb3a3cf 100644 --- a/examples/opmhash.cpp +++ b/examples/opmhash.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include struct keyword { diff --git a/examples/opmi.cpp b/examples/opmi.cpp index 60b07529f..e5b1d3173 100644 --- a/examples/opmi.cpp +++ b/examples/opmi.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/examples/wellgraph.cpp b/examples/wellgraph.cpp index 4b1f39b93..4798bc416 100644 --- a/examples/wellgraph.cpp +++ b/examples/wellgraph.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/msim/include/opm/msim/msim.hpp b/msim/include/opm/msim/msim.hpp index 136c45549..a04e25368 100644 --- a/msim/include/opm/msim/msim.hpp +++ b/msim/include/opm/msim/msim.hpp @@ -11,8 +11,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/msim/src/msim.cpp b/msim/src/msim.cpp index fbecfc094..01731e282 100644 --- a/msim/src/msim.cpp +++ b/msim/src/msim.cpp @@ -29,11 +29,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/opm/input/eclipse/EclipseState/Runspec.hpp b/opm/input/eclipse/EclipseState/Runspec.hpp index 0bc61f69f..0467cf976 100644 --- a/opm/input/eclipse/EclipseState/Runspec.hpp +++ b/opm/input/eclipse/EclipseState/Runspec.hpp @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include namespace Opm { class Deck; diff --git a/opm/input/eclipse/EclipseState/Schedule/Action/ASTNode.hpp b/opm/input/eclipse/Schedule/Action/ASTNode.hpp similarity index 94% rename from opm/input/eclipse/EclipseState/Schedule/Action/ASTNode.hpp rename to opm/input/eclipse/Schedule/Action/ASTNode.hpp index ce86b98e9..2e78dbb61 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Action/ASTNode.hpp +++ b/opm/input/eclipse/Schedule/Action/ASTNode.hpp @@ -3,7 +3,7 @@ #include -#include +#include #include "ActionValue.hpp" diff --git a/opm/input/eclipse/EclipseState/Schedule/Action/Actdims.hpp b/opm/input/eclipse/Schedule/Action/Actdims.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Action/Actdims.hpp rename to opm/input/eclipse/Schedule/Action/Actdims.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Action/ActionAST.hpp b/opm/input/eclipse/Schedule/Action/ActionAST.hpp similarity index 96% rename from opm/input/eclipse/EclipseState/Schedule/Action/ActionAST.hpp rename to opm/input/eclipse/Schedule/Action/ActionAST.hpp index 1d323aaaf..11fb908ba 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Action/ActionAST.hpp +++ b/opm/input/eclipse/Schedule/Action/ActionAST.hpp @@ -26,7 +26,7 @@ #include #include -#include +#include namespace Opm { namespace Action { diff --git a/opm/input/eclipse/EclipseState/Schedule/Action/ActionContext.hpp b/opm/input/eclipse/Schedule/Action/ActionContext.hpp similarity index 92% rename from opm/input/eclipse/EclipseState/Schedule/Action/ActionContext.hpp rename to opm/input/eclipse/Schedule/Action/ActionContext.hpp index 1daa75161..a897b1e8b 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Action/ActionContext.hpp +++ b/opm/input/eclipse/Schedule/Action/ActionContext.hpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include namespace Opm { namespace Action { diff --git a/opm/input/eclipse/EclipseState/Schedule/Action/ActionResult.hpp b/opm/input/eclipse/Schedule/Action/ActionResult.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Action/ActionResult.hpp rename to opm/input/eclipse/Schedule/Action/ActionResult.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Action/ActionValue.hpp b/opm/input/eclipse/Schedule/Action/ActionValue.hpp similarity index 93% rename from opm/input/eclipse/EclipseState/Schedule/Action/ActionValue.hpp rename to opm/input/eclipse/Schedule/Action/ActionValue.hpp index 96b90c060..c22fb163b 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Action/ActionValue.hpp +++ b/opm/input/eclipse/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/input/eclipse/EclipseState/Schedule/Action/ActionX.hpp b/opm/input/eclipse/Schedule/Action/ActionX.hpp similarity index 94% rename from opm/input/eclipse/EclipseState/Schedule/Action/ActionX.hpp rename to opm/input/eclipse/Schedule/Action/ActionX.hpp index eed40338a..50fc34899 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Action/ActionX.hpp +++ b/opm/input/eclipse/Schedule/Action/ActionX.hpp @@ -28,9 +28,9 @@ #include #include -#include -#include -#include +#include +#include +#include diff --git a/opm/input/eclipse/EclipseState/Schedule/Action/Actions.hpp b/opm/input/eclipse/Schedule/Action/Actions.hpp similarity index 93% rename from opm/input/eclipse/EclipseState/Schedule/Action/Actions.hpp rename to opm/input/eclipse/Schedule/Action/Actions.hpp index 368905b03..70bce07dc 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Action/Actions.hpp +++ b/opm/input/eclipse/Schedule/Action/Actions.hpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include namespace Opm { namespace Action { diff --git a/opm/input/eclipse/EclipseState/Schedule/Action/Condition.hpp b/opm/input/eclipse/Schedule/Action/Condition.hpp similarity index 97% rename from opm/input/eclipse/EclipseState/Schedule/Action/Condition.hpp rename to opm/input/eclipse/Schedule/Action/Condition.hpp index 0a17157c0..9cb46587c 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Action/Condition.hpp +++ b/opm/input/eclipse/Schedule/Action/Condition.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/Action/Enums.hpp b/opm/input/eclipse/Schedule/Action/Enums.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Action/Enums.hpp rename to opm/input/eclipse/Schedule/Action/Enums.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Action/PyAction.hpp b/opm/input/eclipse/Schedule/Action/PyAction.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Action/PyAction.hpp rename to opm/input/eclipse/Schedule/Action/PyAction.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Action/SimulatorUpdate.hpp b/opm/input/eclipse/Schedule/Action/SimulatorUpdate.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Action/SimulatorUpdate.hpp rename to opm/input/eclipse/Schedule/Action/SimulatorUpdate.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Action/State.hpp b/opm/input/eclipse/Schedule/Action/State.hpp similarity index 97% rename from opm/input/eclipse/EclipseState/Schedule/Action/State.hpp rename to opm/input/eclipse/Schedule/Action/State.hpp index 0797e0097..9fb247f0c 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Action/State.hpp +++ b/opm/input/eclipse/Schedule/Action/State.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/Action/WGNames.hpp b/opm/input/eclipse/Schedule/Action/WGNames.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Action/WGNames.hpp rename to opm/input/eclipse/Schedule/Action/WGNames.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/ArrayDimChecker.hpp b/opm/input/eclipse/Schedule/ArrayDimChecker.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/ArrayDimChecker.hpp rename to opm/input/eclipse/Schedule/ArrayDimChecker.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/CompletedCells.hpp b/opm/input/eclipse/Schedule/CompletedCells.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/CompletedCells.hpp rename to opm/input/eclipse/Schedule/CompletedCells.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Events.hpp b/opm/input/eclipse/Schedule/Events.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Events.hpp rename to opm/input/eclipse/Schedule/Events.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/GasLiftOpt.hpp b/opm/input/eclipse/Schedule/GasLiftOpt.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/GasLiftOpt.hpp rename to opm/input/eclipse/Schedule/GasLiftOpt.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Group/GConSale.hpp b/opm/input/eclipse/Schedule/Group/GConSale.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Group/GConSale.hpp rename to opm/input/eclipse/Schedule/Group/GConSale.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Group/GConSump.hpp b/opm/input/eclipse/Schedule/Group/GConSump.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Group/GConSump.hpp rename to opm/input/eclipse/Schedule/Group/GConSump.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Group/GPMaint.hpp b/opm/input/eclipse/Schedule/Group/GPMaint.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Group/GPMaint.hpp rename to opm/input/eclipse/Schedule/Group/GPMaint.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Group/GTNode.hpp b/opm/input/eclipse/Schedule/Group/GTNode.hpp similarity index 92% rename from opm/input/eclipse/EclipseState/Schedule/Group/GTNode.hpp rename to opm/input/eclipse/Schedule/Group/GTNode.hpp index 4388bf9bb..447653049 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Group/GTNode.hpp +++ b/opm/input/eclipse/Schedule/Group/GTNode.hpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/Group/Group.hpp b/opm/input/eclipse/Schedule/Group/Group.hpp similarity index 99% rename from opm/input/eclipse/EclipseState/Schedule/Group/Group.hpp rename to opm/input/eclipse/Schedule/Group/Group.hpp index 8debd25e6..7f883b262 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Group/Group.hpp +++ b/opm/input/eclipse/Schedule/Group/Group.hpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/Group/GuideRate.hpp b/opm/input/eclipse/Schedule/Group/GuideRate.hpp similarity index 96% rename from opm/input/eclipse/EclipseState/Schedule/Group/GuideRate.hpp rename to opm/input/eclipse/Schedule/Group/GuideRate.hpp index 40a06ab0e..0e08ecb3c 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Group/GuideRate.hpp +++ b/opm/input/eclipse/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/input/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp b/opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp similarity index 94% rename from opm/input/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp rename to opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp index e40d998cd..edd37e626 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp +++ b/opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp b/opm/input/eclipse/Schedule/Group/GuideRateModel.hpp similarity index 96% rename from opm/input/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp rename to opm/input/eclipse/Schedule/Group/GuideRateModel.hpp index 2b323e3cd..ea9112c2b 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp +++ b/opm/input/eclipse/Schedule/Group/GuideRateModel.hpp @@ -21,8 +21,8 @@ #define GUIDE_RATE_MODEL_HPP #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/MSW/AICD.hpp b/opm/input/eclipse/Schedule/MSW/AICD.hpp similarity index 97% rename from opm/input/eclipse/EclipseState/Schedule/MSW/AICD.hpp rename to opm/input/eclipse/Schedule/MSW/AICD.hpp index cf69bfc01..9ecf49ce7 100644 --- a/opm/input/eclipse/EclipseState/Schedule/MSW/AICD.hpp +++ b/opm/input/eclipse/Schedule/MSW/AICD.hpp @@ -25,7 +25,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/MSW/SICD.hpp b/opm/input/eclipse/Schedule/MSW/SICD.hpp similarity index 98% rename from opm/input/eclipse/EclipseState/Schedule/MSW/SICD.hpp rename to opm/input/eclipse/Schedule/MSW/SICD.hpp index 6ccd6812a..e26b7f395 100644 --- a/opm/input/eclipse/EclipseState/Schedule/MSW/SICD.hpp +++ b/opm/input/eclipse/Schedule/MSW/SICD.hpp @@ -27,7 +27,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/MSW/Segment.hpp b/opm/input/eclipse/Schedule/MSW/Segment.hpp similarity index 97% rename from opm/input/eclipse/EclipseState/Schedule/MSW/Segment.hpp rename to opm/input/eclipse/Schedule/MSW/Segment.hpp index de738e9e2..257f817d8 100644 --- a/opm/input/eclipse/EclipseState/Schedule/MSW/Segment.hpp +++ b/opm/input/eclipse/Schedule/MSW/Segment.hpp @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/MSW/Valve.hpp b/opm/input/eclipse/Schedule/MSW/Valve.hpp similarity index 98% rename from opm/input/eclipse/EclipseState/Schedule/MSW/Valve.hpp rename to opm/input/eclipse/Schedule/MSW/Valve.hpp index 601fe3537..8e59dd405 100644 --- a/opm/input/eclipse/EclipseState/Schedule/MSW/Valve.hpp +++ b/opm/input/eclipse/Schedule/MSW/Valve.hpp @@ -25,7 +25,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp b/opm/input/eclipse/Schedule/MSW/WellSegments.hpp similarity index 98% rename from opm/input/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp rename to opm/input/eclipse/Schedule/MSW/WellSegments.hpp index 061811bf5..05bcf1b0e 100644 --- a/opm/input/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp +++ b/opm/input/eclipse/Schedule/MSW/WellSegments.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include namespace Opm { class SICD; diff --git a/opm/input/eclipse/EclipseState/Schedule/MSW/icd.hpp b/opm/input/eclipse/Schedule/MSW/icd.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/MSW/icd.hpp rename to opm/input/eclipse/Schedule/MSW/icd.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/MessageLimits.hpp b/opm/input/eclipse/Schedule/MessageLimits.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/MessageLimits.hpp rename to opm/input/eclipse/Schedule/MessageLimits.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Network/Balance.hpp b/opm/input/eclipse/Schedule/Network/Balance.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Network/Balance.hpp rename to opm/input/eclipse/Schedule/Network/Balance.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Network/Branch.hpp b/opm/input/eclipse/Schedule/Network/Branch.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Network/Branch.hpp rename to opm/input/eclipse/Schedule/Network/Branch.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp b/opm/input/eclipse/Schedule/Network/ExtNetwork.hpp similarity index 93% rename from opm/input/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp rename to opm/input/eclipse/Schedule/Network/ExtNetwork.hpp index 8adcdadb9..fd65837bb 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp +++ b/opm/input/eclipse/Schedule/Network/ExtNetwork.hpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include namespace Opm { namespace Network { diff --git a/opm/input/eclipse/EclipseState/Schedule/Network/Node.hpp b/opm/input/eclipse/Schedule/Network/Node.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Network/Node.hpp rename to opm/input/eclipse/Schedule/Network/Node.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp b/opm/input/eclipse/Schedule/OilVaporizationProperties.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp rename to opm/input/eclipse/Schedule/OilVaporizationProperties.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/RFTConfig.hpp b/opm/input/eclipse/Schedule/RFTConfig.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/RFTConfig.hpp rename to opm/input/eclipse/Schedule/RFTConfig.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/RPTConfig.hpp b/opm/input/eclipse/Schedule/RPTConfig.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/RPTConfig.hpp rename to opm/input/eclipse/Schedule/RPTConfig.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/RSTConfig.hpp b/opm/input/eclipse/Schedule/RSTConfig.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/RSTConfig.hpp rename to opm/input/eclipse/Schedule/RSTConfig.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Schedule.hpp b/opm/input/eclipse/Schedule/Schedule.hpp similarity index 95% rename from opm/input/eclipse/EclipseState/Schedule/Schedule.hpp rename to opm/input/eclipse/Schedule/Schedule.hpp index 71b7a682b..7de1c8249 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Schedule.hpp +++ b/opm/input/eclipse/Schedule/Schedule.hpp @@ -33,26 +33,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 #include #include diff --git a/opm/input/eclipse/EclipseState/Schedule/ScheduleDeck.hpp b/opm/input/eclipse/Schedule/ScheduleDeck.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/ScheduleDeck.hpp rename to opm/input/eclipse/Schedule/ScheduleDeck.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/ScheduleGrid.hpp b/opm/input/eclipse/Schedule/ScheduleGrid.hpp similarity index 94% rename from opm/input/eclipse/EclipseState/Schedule/ScheduleGrid.hpp rename to opm/input/eclipse/Schedule/ScheduleGrid.hpp index 66b2511f0..cc0450792 100644 --- a/opm/input/eclipse/EclipseState/Schedule/ScheduleGrid.hpp +++ b/opm/input/eclipse/Schedule/ScheduleGrid.hpp @@ -19,7 +19,7 @@ #ifndef SCHEDULE_GRID #define SCHEDULE_GRID -#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/ScheduleState.hpp b/opm/input/eclipse/Schedule/ScheduleState.hpp similarity index 92% rename from opm/input/eclipse/EclipseState/Schedule/ScheduleState.hpp rename to opm/input/eclipse/Schedule/ScheduleState.hpp index 0999a5518..82309e092 100644 --- a/opm/input/eclipse/EclipseState/Schedule/ScheduleState.hpp +++ b/opm/input/eclipse/Schedule/ScheduleState.hpp @@ -29,29 +29,29 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#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/input/eclipse/EclipseState/Schedule/ScheduleTypes.hpp b/opm/input/eclipse/Schedule/ScheduleTypes.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/ScheduleTypes.hpp rename to opm/input/eclipse/Schedule/ScheduleTypes.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/SummaryState.hpp b/opm/input/eclipse/Schedule/SummaryState.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/SummaryState.hpp rename to opm/input/eclipse/Schedule/SummaryState.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Tuning.hpp b/opm/input/eclipse/Schedule/Tuning.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Tuning.hpp rename to opm/input/eclipse/Schedule/Tuning.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp b/opm/input/eclipse/Schedule/UDQ/UDQASTNode.hpp similarity index 93% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQASTNode.hpp index 8ffb8bd3a..dfc60d62b 100644 --- a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp +++ b/opm/input/eclipse/Schedule/UDQ/UDQASTNode.hpp @@ -27,9 +27,9 @@ #include #include -#include -#include -#include +#include +#include +#include diff --git a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp b/opm/input/eclipse/Schedule/UDQ/UDQActive.hpp similarity index 98% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQActive.hpp index da8217f93..8a2e32099 100644 --- a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp +++ b/opm/input/eclipse/Schedule/UDQ/UDQActive.hpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp b/opm/input/eclipse/Schedule/UDQ/UDQAssign.hpp similarity index 96% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQAssign.hpp index 140ef6d74..0eec082a8 100644 --- a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp +++ b/opm/input/eclipse/Schedule/UDQ/UDQAssign.hpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp b/opm/input/eclipse/Schedule/UDQ/UDQConfig.hpp similarity index 92% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQConfig.hpp index 406f631f4..e71795eb8 100644 --- a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp +++ b/opm/input/eclipse/Schedule/UDQ/UDQConfig.hpp @@ -25,12 +25,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQContext.hpp b/opm/input/eclipse/Schedule/UDQ/UDQContext.hpp similarity index 93% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQContext.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQContext.hpp index d8bf8f4aa..89949f438 100644 --- a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQContext.hpp +++ b/opm/input/eclipse/Schedule/UDQ/UDQContext.hpp @@ -27,8 +27,8 @@ #include -#include -#include +#include +#include namespace Opm { class SummaryState; diff --git a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp b/opm/input/eclipse/Schedule/UDQ/UDQDefine.hpp similarity index 90% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQDefine.hpp index 6ddc2b14e..cff3fa810 100644 --- a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp +++ b/opm/input/eclipse/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/input/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp b/opm/input/eclipse/Schedule/UDQ/UDQEnums.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQEnums.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQExpression.hpp b/opm/input/eclipse/Schedule/UDQ/UDQExpression.hpp similarity index 95% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQExpression.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQExpression.hpp index ac6814600..0d185d36c 100644 --- a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQExpression.hpp +++ b/opm/input/eclipse/Schedule/UDQ/UDQExpression.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp b/opm/input/eclipse/Schedule/UDQ/UDQFunction.hpp similarity index 96% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQFunction.hpp index 5ffeaaacd..999e8ed4b 100644 --- a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp +++ b/opm/input/eclipse/Schedule/UDQ/UDQFunction.hpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp b/opm/input/eclipse/Schedule/UDQ/UDQFunctionTable.hpp similarity index 91% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQFunctionTable.hpp index a7d654c86..b6b093354 100644 --- a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp +++ b/opm/input/eclipse/Schedule/UDQ/UDQFunctionTable.hpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp b/opm/input/eclipse/Schedule/UDQ/UDQInput.hpp similarity index 92% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQInput.hpp index 7317842ad..84afb51cd 100644 --- a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp +++ b/opm/input/eclipse/Schedule/UDQ/UDQInput.hpp @@ -23,9 +23,9 @@ #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParams.hpp b/opm/input/eclipse/Schedule/UDQ/UDQParams.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParams.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQParams.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQSet.hpp b/opm/input/eclipse/Schedule/UDQ/UDQSet.hpp similarity index 98% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQSet.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQSet.hpp index 82239924a..928896f67 100644 --- a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQSet.hpp +++ b/opm/input/eclipse/Schedule/UDQ/UDQSet.hpp @@ -26,7 +26,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp b/opm/input/eclipse/Schedule/UDQ/UDQState.hpp similarity index 98% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQState.hpp index 3c9b0c287..3281cc4e7 100644 --- a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp +++ b/opm/input/eclipse/Schedule/UDQ/UDQState.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQToken.hpp b/opm/input/eclipse/Schedule/UDQ/UDQToken.hpp similarity index 95% rename from opm/input/eclipse/EclipseState/Schedule/UDQ/UDQToken.hpp rename to opm/input/eclipse/Schedule/UDQ/UDQToken.hpp index 96ad1c6e3..53f4ec6a3 100644 --- a/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQToken.hpp +++ b/opm/input/eclipse/Schedule/UDQ/UDQToken.hpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/VFPInjTable.hpp b/opm/input/eclipse/Schedule/VFPInjTable.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/VFPInjTable.hpp rename to opm/input/eclipse/Schedule/VFPInjTable.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/VFPProdTable.hpp b/opm/input/eclipse/Schedule/VFPProdTable.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/VFPProdTable.hpp rename to opm/input/eclipse/Schedule/VFPProdTable.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/Connection.hpp b/opm/input/eclipse/Schedule/Well/Connection.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/Connection.hpp rename to opm/input/eclipse/Schedule/Well/Connection.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/InjectionControls.hpp b/opm/input/eclipse/Schedule/Well/InjectionControls.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/InjectionControls.hpp rename to opm/input/eclipse/Schedule/Well/InjectionControls.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/NameOrder.hpp b/opm/input/eclipse/Schedule/Well/NameOrder.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/NameOrder.hpp rename to opm/input/eclipse/Schedule/Well/NameOrder.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/PAvg.hpp b/opm/input/eclipse/Schedule/Well/PAvg.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/PAvg.hpp rename to opm/input/eclipse/Schedule/Well/PAvg.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculator.hpp b/opm/input/eclipse/Schedule/Well/PAvgCalculator.hpp similarity index 96% rename from opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculator.hpp rename to opm/input/eclipse/Schedule/Well/PAvgCalculator.hpp index 99a663d26..f29ddaecb 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculator.hpp +++ b/opm/input/eclipse/Schedule/Well/PAvgCalculator.hpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp b/opm/input/eclipse/Schedule/Well/PAvgCalculatorCollection.hpp similarity index 90% rename from opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp rename to opm/input/eclipse/Schedule/Well/PAvgCalculatorCollection.hpp index 52436ad82..a50c0ad17 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp +++ b/opm/input/eclipse/Schedule/Well/PAvgCalculatorCollection.hpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/ProductionControls.hpp b/opm/input/eclipse/Schedule/Well/ProductionControls.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/ProductionControls.hpp rename to opm/input/eclipse/Schedule/Well/ProductionControls.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/WList.hpp b/opm/input/eclipse/Schedule/Well/WList.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/WList.hpp rename to opm/input/eclipse/Schedule/Well/WList.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/WListManager.hpp b/opm/input/eclipse/Schedule/Well/WListManager.hpp similarity index 97% rename from opm/input/eclipse/EclipseState/Schedule/Well/WListManager.hpp rename to opm/input/eclipse/Schedule/Well/WListManager.hpp index 0ce43b3c9..816334c35 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Well/WListManager.hpp +++ b/opm/input/eclipse/Schedule/Well/WListManager.hpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/Well.hpp b/opm/input/eclipse/Schedule/Well/Well.hpp similarity index 96% rename from opm/input/eclipse/EclipseState/Schedule/Well/Well.hpp rename to opm/input/eclipse/Schedule/Well/Well.hpp index 3d823ce8a..4bb0318bf 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Well/Well.hpp +++ b/opm/input/eclipse/Schedule/Well/Well.hpp @@ -34,20 +34,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/opm/input/eclipse/EclipseState/Schedule/Well/WellBrineProperties.hpp b/opm/input/eclipse/Schedule/Well/WellBrineProperties.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/WellBrineProperties.hpp rename to opm/input/eclipse/Schedule/Well/WellBrineProperties.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/WellConnections.hpp b/opm/input/eclipse/Schedule/Well/WellConnections.hpp similarity index 99% rename from opm/input/eclipse/EclipseState/Schedule/Well/WellConnections.hpp rename to opm/input/eclipse/Schedule/Well/WellConnections.hpp index 393c9ed46..61a0364fb 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Well/WellConnections.hpp +++ b/opm/input/eclipse/Schedule/Well/WellConnections.hpp @@ -21,7 +21,7 @@ #ifndef CONNECTIONSET_HPP_ #define CONNECTIONSET_HPP_ -#include +#include #include #include diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.hpp b/opm/input/eclipse/Schedule/Well/WellEconProductionLimits.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.hpp rename to opm/input/eclipse/Schedule/Well/WellEconProductionLimits.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/WellFoamProperties.hpp b/opm/input/eclipse/Schedule/Well/WellFoamProperties.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/WellFoamProperties.hpp rename to opm/input/eclipse/Schedule/Well/WellFoamProperties.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.hpp b/opm/input/eclipse/Schedule/Well/WellInjectionProperties.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.hpp rename to opm/input/eclipse/Schedule/Well/WellInjectionProperties.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/WellMICPProperties.hpp b/opm/input/eclipse/Schedule/Well/WellMICPProperties.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/WellMICPProperties.hpp rename to opm/input/eclipse/Schedule/Well/WellMICPProperties.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/WellMatcher.hpp b/opm/input/eclipse/Schedule/Well/WellMatcher.hpp similarity index 91% rename from opm/input/eclipse/EclipseState/Schedule/Well/WellMatcher.hpp rename to opm/input/eclipse/Schedule/Well/WellMatcher.hpp index 6142ddce2..9ff6730c0 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Well/WellMatcher.hpp +++ b/opm/input/eclipse/Schedule/Well/WellMatcher.hpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.hpp b/opm/input/eclipse/Schedule/Well/WellPolymerProperties.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.hpp rename to opm/input/eclipse/Schedule/Well/WellPolymerProperties.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/WellProductionProperties.hpp b/opm/input/eclipse/Schedule/Well/WellProductionProperties.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/WellProductionProperties.hpp rename to opm/input/eclipse/Schedule/Well/WellProductionProperties.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp b/opm/input/eclipse/Schedule/Well/WellTestConfig.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp rename to opm/input/eclipse/Schedule/Well/WellTestConfig.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/WellTestState.hpp b/opm/input/eclipse/Schedule/Well/WellTestState.hpp similarity index 98% rename from opm/input/eclipse/EclipseState/Schedule/Well/WellTestState.hpp rename to opm/input/eclipse/Schedule/Well/WellTestState.hpp index 4e5930766..7b6e5b579 100644 --- a/opm/input/eclipse/EclipseState/Schedule/Well/WellTestState.hpp +++ b/opm/input/eclipse/Schedule/Well/WellTestState.hpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/opm/input/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp b/opm/input/eclipse/Schedule/Well/WellTracerProperties.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp rename to opm/input/eclipse/Schedule/Well/WellTracerProperties.hpp diff --git a/opm/input/eclipse/EclipseState/Schedule/WriteRestartFileEvents.hpp b/opm/input/eclipse/Schedule/WriteRestartFileEvents.hpp similarity index 100% rename from opm/input/eclipse/EclipseState/Schedule/WriteRestartFileEvents.hpp rename to opm/input/eclipse/Schedule/WriteRestartFileEvents.hpp diff --git a/opm/input/eclipse/Units/UnitSystem.hpp b/opm/input/eclipse/Units/UnitSystem.hpp index 80a22c997..8981f53c0 100644 --- a/opm/input/eclipse/Units/UnitSystem.hpp +++ b/opm/input/eclipse/Units/UnitSystem.hpp @@ -26,7 +26,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/io/eclipse/rst/action.hpp b/opm/io/eclipse/rst/action.hpp index 93039a241..f18e61ba0 100644 --- a/opm/io/eclipse/rst/action.hpp +++ b/opm/io/eclipse/rst/action.hpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include namespace Opm { diff --git a/opm/io/eclipse/rst/connection.hpp b/opm/io/eclipse/rst/connection.hpp index d049d5707..0b5191475 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/segment.hpp b/opm/io/eclipse/rst/segment.hpp index 7f531a7b4..6ccd43b40 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 a3478a572..47b96c9a6 100644 --- a/opm/io/eclipse/rst/state.hpp +++ b/opm/io/eclipse/rst/state.hpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include diff --git a/opm/io/eclipse/rst/udq.hpp b/opm/io/eclipse/rst/udq.hpp index f57685de9..3097b1b9d 100644 --- a/opm/io/eclipse/rst/udq.hpp +++ b/opm/io/eclipse/rst/udq.hpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include namespace Opm { diff --git a/opm/io/eclipse/rst/well.hpp b/opm/io/eclipse/rst/well.hpp index 0a5a6c21b..91d1e54d9 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/data/Groups.hpp b/opm/output/data/Groups.hpp index 9e065a09b..e15267033 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/Wells.hpp b/opm/output/data/Wells.hpp index 66b57af9d..5fec89110 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 50377b5ba..ee93e33bb 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 0e2b20627..c7db011a2 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 1e4334f06..d078aefb6 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 dd58d17e6..56df2ed16 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/Summary.hpp b/opm/output/eclipse/Summary.hpp index a06b80674..8f098b5b0 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/python/cxx/connection.cpp b/python/cxx/connection.cpp index ed1a4ed23..7c3c537cc 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/eclipse_config.cpp b/python/cxx/eclipse_config.cpp index c9f2287d4..e36026383 100644 --- a/python/cxx/eclipse_config.cpp +++ b/python/cxx/eclipse_config.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "export.hpp" diff --git a/python/cxx/group.cpp b/python/cxx/group.cpp index 106655ed5..3c24c260e 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/schedule.cpp b/python/cxx/schedule.cpp index 4950fd15a..17bd4bc2b 100644 --- a/python/cxx/schedule.cpp +++ b/python/cxx/schedule.cpp @@ -7,7 +7,7 @@ #include -#include +#include #include #include diff --git a/python/cxx/summary_state.cpp b/python/cxx/summary_state.cpp index e4f6522e6..e5e95f6cc 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/well.cpp b/python/cxx/well.cpp index 3b739d2c4..7e9b94ce8 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/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp b/src/opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp index f49749b2d..9ec07da91 100644 --- a/src/opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp +++ b/src/opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp @@ -45,12 +45,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/opm/input/eclipse/Python/PyRunModule.cpp b/src/opm/input/eclipse/Python/PyRunModule.cpp index 35131d26f..d0d02ed63 100644 --- a/src/opm/input/eclipse/Python/PyRunModule.cpp +++ b/src/opm/input/eclipse/Python/PyRunModule.cpp @@ -22,8 +22,8 @@ error BUG: The PyRunModule.hpp header should *not* be included in a configuratio #include -#include -#include +#include +#include #include "src/opm/input/eclipse/Python/PyRunModule.hpp" diff --git a/src/opm/input/eclipse/Python/Python.cpp b/src/opm/input/eclipse/Python/Python.cpp index 47c025a10..7511419d6 100644 --- a/src/opm/input/eclipse/Python/Python.cpp +++ b/src/opm/input/eclipse/Python/Python.cpp @@ -17,8 +17,8 @@ along with OPM. If not, see . */ -#include -#include +#include +#include #include #include "PythonInterp.hpp" diff --git a/src/opm/input/eclipse/Python/PythonInterp.hpp b/src/opm/input/eclipse/Python/PythonInterp.hpp index 96741d29f..f66082776 100644 --- a/src/opm/input/eclipse/Python/PythonInterp.hpp +++ b/src/opm/input/eclipse/Python/PythonInterp.hpp @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Action/ASTNode.cpp b/src/opm/input/eclipse/Schedule/Action/ASTNode.cpp similarity index 95% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/ASTNode.cpp rename to src/opm/input/eclipse/Schedule/Action/ASTNode.cpp index 68ee9583b..4f4c5907b 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Action/ASTNode.cpp +++ b/src/opm/input/eclipse/Schedule/Action/ASTNode.cpp @@ -20,10 +20,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Action/Actdims.cpp b/src/opm/input/eclipse/Schedule/Action/Actdims.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/Actdims.cpp rename to src/opm/input/eclipse/Schedule/Action/Actdims.cpp index 6217e8902..1e1971de4 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Action/Actdims.cpp +++ b/src/opm/input/eclipse/Schedule/Action/Actdims.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionAST.cpp b/src/opm/input/eclipse/Schedule/Action/ActionAST.cpp similarity index 85% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/ActionAST.cpp rename to src/opm/input/eclipse/Schedule/Action/ActionAST.cpp index 1dfbfd322..d1dce45e5 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionAST.cpp +++ b/src/opm/input/eclipse/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/input/eclipse/EclipseState/Schedule/Action/ActionContext.cpp b/src/opm/input/eclipse/Schedule/Action/ActionContext.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/ActionContext.cpp rename to src/opm/input/eclipse/Schedule/Action/ActionContext.cpp index 667190987..22bda79b4 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionContext.cpp +++ b/src/opm/input/eclipse/Schedule/Action/ActionContext.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionParser.cpp b/src/opm/input/eclipse/Schedule/Action/ActionParser.cpp similarity index 100% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/ActionParser.cpp rename to src/opm/input/eclipse/Schedule/Action/ActionParser.cpp diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionParser.hpp b/src/opm/input/eclipse/Schedule/Action/ActionParser.hpp similarity index 92% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/ActionParser.hpp rename to src/opm/input/eclipse/Schedule/Action/ActionParser.hpp index 595f9d9eb..5398c1a80 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionParser.hpp +++ b/src/opm/input/eclipse/Schedule/Action/ActionParser.hpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionResult.cpp b/src/opm/input/eclipse/Schedule/Action/ActionResult.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/ActionResult.cpp rename to src/opm/input/eclipse/Schedule/Action/ActionResult.cpp index 137f0ea3f..de9cfbb0c 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionResult.cpp +++ b/src/opm/input/eclipse/Schedule/Action/ActionResult.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include namespace Opm { namespace Action { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionValue.cpp b/src/opm/input/eclipse/Schedule/Action/ActionValue.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/ActionValue.cpp rename to src/opm/input/eclipse/Schedule/Action/ActionValue.cpp index 4e637c4ec..ff103126d 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionValue.cpp +++ b/src/opm/input/eclipse/Schedule/Action/ActionValue.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionX.cpp b/src/opm/input/eclipse/Schedule/Action/ActionX.cpp similarity index 95% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/ActionX.cpp rename to src/opm/input/eclipse/Schedule/Action/ActionX.cpp index c2902c894..0968893c8 100755 --- a/src/opm/input/eclipse/EclipseState/Schedule/Action/ActionX.cpp +++ b/src/opm/input/eclipse/Schedule/Action/ActionX.cpp @@ -25,11 +25,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Action/Actions.cpp b/src/opm/input/eclipse/Schedule/Action/Actions.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/Actions.cpp rename to src/opm/input/eclipse/Schedule/Action/Actions.cpp index 96d2d8e0e..3bad329d3 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Action/Actions.cpp +++ b/src/opm/input/eclipse/Schedule/Action/Actions.cpp @@ -18,8 +18,8 @@ */ #include -#include -#include +#include +#include namespace Opm { namespace Action { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Action/Condition.cpp b/src/opm/input/eclipse/Schedule/Action/Condition.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/Condition.cpp rename to src/opm/input/eclipse/Schedule/Action/Condition.cpp index 52fec67d9..506e2f464 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Action/Condition.cpp +++ b/src/opm/input/eclipse/Schedule/Action/Condition.cpp @@ -24,9 +24,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include "ActionParser.hpp" diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Action/Enums.cpp b/src/opm/input/eclipse/Schedule/Action/Enums.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/Enums.cpp rename to src/opm/input/eclipse/Schedule/Action/Enums.cpp index 27ac3d070..10f2cc909 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Action/Enums.cpp +++ b/src/opm/input/eclipse/Schedule/Action/Enums.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace Opm { namespace Action { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Action/PyAction.cpp b/src/opm/input/eclipse/Schedule/Action/PyAction.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/PyAction.cpp rename to src/opm/input/eclipse/Schedule/Action/PyAction.cpp index 5fc72bf4e..bb525d447 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Action/PyAction.cpp +++ b/src/opm/input/eclipse/Schedule/Action/PyAction.cpp @@ -29,9 +29,9 @@ namespace py = pybind11; #include #include -#include +#include #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Action/State.cpp b/src/opm/input/eclipse/Schedule/Action/State.cpp similarity index 93% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/State.cpp rename to src/opm/input/eclipse/Schedule/Action/State.cpp index 4a533dae7..a9b17adce 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Action/State.cpp +++ b/src/opm/input/eclipse/Schedule/Action/State.cpp @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Action/WGNames.cpp b/src/opm/input/eclipse/Schedule/Action/WGNames.cpp similarity index 95% rename from src/opm/input/eclipse/EclipseState/Schedule/Action/WGNames.cpp rename to src/opm/input/eclipse/Schedule/Action/WGNames.cpp index 520171cf2..bc5d3ca1f 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Action/WGNames.cpp +++ b/src/opm/input/eclipse/Schedule/Action/WGNames.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp b/src/opm/input/eclipse/Schedule/ArrayDimChecker.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp rename to src/opm/input/eclipse/Schedule/ArrayDimChecker.cpp index 876c7738e..fb36422a4 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp +++ b/src/opm/input/eclipse/Schedule/ArrayDimChecker.cpp @@ -29,10 +29,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/CompletedCells.cpp b/src/opm/input/eclipse/Schedule/CompletedCells.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/CompletedCells.cpp rename to src/opm/input/eclipse/Schedule/CompletedCells.cpp index 77b525057..efca0f851 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/CompletedCells.cpp +++ b/src/opm/input/eclipse/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) diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Events.cpp b/src/opm/input/eclipse/Schedule/Events.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Events.cpp rename to src/opm/input/eclipse/Schedule/Events.cpp index 2d4968519..65b7fe580 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Events.cpp +++ b/src/opm/input/eclipse/Schedule/Events.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/GasLiftOpt.cpp b/src/opm/input/eclipse/Schedule/GasLiftOpt.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/GasLiftOpt.cpp rename to src/opm/input/eclipse/Schedule/GasLiftOpt.cpp index 51ba44f4a..bd305dc79 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/GasLiftOpt.cpp +++ b/src/opm/input/eclipse/Schedule/GasLiftOpt.cpp @@ -19,7 +19,7 @@ #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Group/GConSale.cpp b/src/opm/input/eclipse/Schedule/Group/GConSale.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/Group/GConSale.cpp rename to src/opm/input/eclipse/Schedule/Group/GConSale.cpp index 59b9d083e..af9ae6597 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Group/GConSale.cpp +++ b/src/opm/input/eclipse/Schedule/Group/GConSale.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include #include "../eval_uda.hpp" diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Group/GConSump.cpp b/src/opm/input/eclipse/Schedule/Group/GConSump.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/Group/GConSump.cpp rename to src/opm/input/eclipse/Schedule/Group/GConSump.cpp index d7a4594ef..3eb9bbba4 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Group/GConSump.cpp +++ b/src/opm/input/eclipse/Schedule/Group/GConSump.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include "../eval_uda.hpp" diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Group/GPMaint.cpp b/src/opm/input/eclipse/Schedule/Group/GPMaint.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Group/GPMaint.cpp rename to src/opm/input/eclipse/Schedule/Group/GPMaint.cpp index 4f9486f33..2b17254c9 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Group/GPMaint.cpp +++ b/src/opm/input/eclipse/Schedule/Group/GPMaint.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Group/GTNode.cpp b/src/opm/input/eclipse/Schedule/Group/GTNode.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/Group/GTNode.cpp rename to src/opm/input/eclipse/Schedule/Group/GTNode.cpp index 5b1070773..6fe3993dc 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Group/GTNode.cpp +++ b/src/opm/input/eclipse/Schedule/Group/GTNode.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Group/Group.cpp b/src/opm/input/eclipse/Schedule/Group/Group.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/Group/Group.cpp rename to src/opm/input/eclipse/Schedule/Group/Group.cpp index 6eb1d20af..e65fad78b 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Group/Group.cpp +++ b/src/opm/input/eclipse/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/input/eclipse/EclipseState/Schedule/Group/GuideRate.cpp b/src/opm/input/eclipse/Schedule/Group/GuideRate.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRate.cpp rename to src/opm/input/eclipse/Schedule/Group/GuideRate.cpp index b7cde19c3..e6a2db85d 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRate.cpp +++ b/src/opm/input/eclipse/Schedule/Group/GuideRate.cpp @@ -17,10 +17,10 @@ along with OPM. If not, see . */ -#include +#include #include -#include +#include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateConfig.cpp b/src/opm/input/eclipse/Schedule/Group/GuideRateConfig.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateConfig.cpp rename to src/opm/input/eclipse/Schedule/Group/GuideRateConfig.cpp index 19eb7d4b0..b3df33a8e 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateConfig.cpp +++ b/src/opm/input/eclipse/Schedule/Group/GuideRateConfig.cpp @@ -18,7 +18,7 @@ */ -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateModel.cpp b/src/opm/input/eclipse/Schedule/Group/GuideRateModel.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateModel.cpp rename to src/opm/input/eclipse/Schedule/Group/GuideRateModel.cpp index 50bb67602..ed8cd7d11 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Group/GuideRateModel.cpp +++ b/src/opm/input/eclipse/Schedule/Group/GuideRateModel.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/KeywordHandlers.cpp b/src/opm/input/eclipse/Schedule/KeywordHandlers.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/KeywordHandlers.cpp rename to src/opm/input/eclipse/Schedule/KeywordHandlers.cpp index 3ad61c77e..e7efbd61b 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/KeywordHandlers.cpp +++ b/src/opm/input/eclipse/Schedule/KeywordHandlers.cpp @@ -57,31 +57,31 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#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/input/eclipse/EclipseState/Schedule/MSW/AICD.cpp b/src/opm/input/eclipse/Schedule/MSW/AICD.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/MSW/AICD.cpp rename to src/opm/input/eclipse/Schedule/MSW/AICD.cpp index a505ee3c2..c3450cc59 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/MSW/AICD.cpp +++ b/src/opm/input/eclipse/Schedule/MSW/AICD.cpp @@ -18,12 +18,12 @@ */ -#include +#include #include #include #include -#include "src/opm/input/eclipse/EclipseState/Schedule/MSW/FromWSEG.hpp" +#include "src/opm/input/eclipse/Schedule/MSW/FromWSEG.hpp" namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp b/src/opm/input/eclipse/Schedule/MSW/Compsegs.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp rename to src/opm/input/eclipse/Schedule/MSW/Compsegs.cpp index 9af1776f4..b7902c17b 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp +++ b/src/opm/input/eclipse/Schedule/MSW/Compsegs.cpp @@ -32,10 +32,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "Compsegs.hpp" diff --git a/src/opm/input/eclipse/EclipseState/Schedule/MSW/Compsegs.hpp b/src/opm/input/eclipse/Schedule/MSW/Compsegs.hpp similarity index 100% rename from src/opm/input/eclipse/EclipseState/Schedule/MSW/Compsegs.hpp rename to src/opm/input/eclipse/Schedule/MSW/Compsegs.hpp diff --git a/src/opm/input/eclipse/EclipseState/Schedule/MSW/FromWSEG.hpp b/src/opm/input/eclipse/Schedule/MSW/FromWSEG.hpp similarity index 100% rename from src/opm/input/eclipse/EclipseState/Schedule/MSW/FromWSEG.hpp rename to src/opm/input/eclipse/Schedule/MSW/FromWSEG.hpp diff --git a/src/opm/input/eclipse/EclipseState/Schedule/MSW/SICD.cpp b/src/opm/input/eclipse/Schedule/MSW/SICD.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/MSW/SICD.cpp rename to src/opm/input/eclipse/Schedule/MSW/SICD.cpp index 37c010713..0c5563104 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/MSW/SICD.cpp +++ b/src/opm/input/eclipse/Schedule/MSW/SICD.cpp @@ -18,16 +18,16 @@ along with OPM. If not, see . */ -#include -#include +#include +#include #include #include #include #include -#include "src/opm/input/eclipse/EclipseState/Schedule/MSW/icd_convert.hpp" -#include "src/opm/input/eclipse/EclipseState/Schedule/MSW/FromWSEG.hpp" +#include "src/opm/input/eclipse/Schedule/MSW/icd_convert.hpp" +#include "src/opm/input/eclipse/Schedule/MSW/FromWSEG.hpp" diff --git a/src/opm/input/eclipse/EclipseState/Schedule/MSW/Segment.cpp b/src/opm/input/eclipse/Schedule/MSW/Segment.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/MSW/Segment.cpp rename to src/opm/input/eclipse/Schedule/MSW/Segment.cpp index 37044be47..d04f8fb1c 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/MSW/Segment.cpp +++ b/src/opm/input/eclipse/Schedule/MSW/Segment.cpp @@ -18,9 +18,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/MSW/Valve.cpp b/src/opm/input/eclipse/Schedule/MSW/Valve.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/MSW/Valve.cpp rename to src/opm/input/eclipse/Schedule/MSW/Valve.cpp index 8a93e4fcb..dfcfd35d9 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/MSW/Valve.cpp +++ b/src/opm/input/eclipse/Schedule/MSW/Valve.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/MSW/WellSegments.cpp b/src/opm/input/eclipse/Schedule/MSW/WellSegments.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/MSW/WellSegments.cpp rename to src/opm/input/eclipse/Schedule/MSW/WellSegments.cpp index 06cd6105a..64a323d5b 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/MSW/WellSegments.cpp +++ b/src/opm/input/eclipse/Schedule/MSW/WellSegments.cpp @@ -33,11 +33,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/MSW/icd.cpp b/src/opm/input/eclipse/Schedule/MSW/icd.cpp similarity index 95% rename from src/opm/input/eclipse/EclipseState/Schedule/MSW/icd.cpp rename to src/opm/input/eclipse/Schedule/MSW/icd.cpp index e97ea701b..5740eb21d 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/MSW/icd.cpp +++ b/src/opm/input/eclipse/Schedule/MSW/icd.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include #include "icd_convert.hpp" diff --git a/src/opm/input/eclipse/EclipseState/Schedule/MSW/icd_convert.hpp b/src/opm/input/eclipse/Schedule/MSW/icd_convert.hpp similarity index 100% rename from src/opm/input/eclipse/EclipseState/Schedule/MSW/icd_convert.hpp rename to src/opm/input/eclipse/Schedule/MSW/icd_convert.hpp diff --git a/src/opm/input/eclipse/EclipseState/Schedule/MessageLimits.cpp b/src/opm/input/eclipse/Schedule/MessageLimits.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/MessageLimits.cpp rename to src/opm/input/eclipse/Schedule/MessageLimits.cpp index 959c51e3e..4ee111885 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/MessageLimits.cpp +++ b/src/opm/input/eclipse/Schedule/MessageLimits.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Network/Balance.cpp b/src/opm/input/eclipse/Schedule/Network/Balance.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/Network/Balance.cpp rename to src/opm/input/eclipse/Schedule/Network/Balance.cpp index 95a273e56..384ad2a0c 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Network/Balance.cpp +++ b/src/opm/input/eclipse/Schedule/Network/Balance.cpp @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Network/Branch.cpp b/src/opm/input/eclipse/Schedule/Network/Branch.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/Network/Branch.cpp rename to src/opm/input/eclipse/Schedule/Network/Branch.cpp index e9132b216..67334110d 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Network/Branch.cpp +++ b/src/opm/input/eclipse/Schedule/Network/Branch.cpp @@ -18,7 +18,7 @@ */ -#include +#include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Network/ExtNetwork.cpp b/src/opm/input/eclipse/Schedule/Network/ExtNetwork.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Network/ExtNetwork.cpp rename to src/opm/input/eclipse/Schedule/Network/ExtNetwork.cpp index 7c14bb192..57fe0bacc 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Network/ExtNetwork.cpp +++ b/src/opm/input/eclipse/Schedule/Network/ExtNetwork.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace Opm { namespace Network { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Network/Node.cpp b/src/opm/input/eclipse/Schedule/Network/Node.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/Network/Node.cpp rename to src/opm/input/eclipse/Schedule/Network/Node.cpp index 3bea0b101..e871cdc04 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Network/Node.cpp +++ b/src/opm/input/eclipse/Schedule/Network/Node.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include namespace Opm { namespace Network { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp b/src/opm/input/eclipse/Schedule/OilVaporizationProperties.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp rename to src/opm/input/eclipse/Schedule/OilVaporizationProperties.cpp index 62ad6442a..3a8567eba 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp +++ b/src/opm/input/eclipse/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/input/eclipse/EclipseState/Schedule/RFTConfig.cpp b/src/opm/input/eclipse/Schedule/RFTConfig.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/RFTConfig.cpp rename to src/opm/input/eclipse/Schedule/RFTConfig.cpp index f3c44993d..73b675a0c 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/RFTConfig.cpp +++ b/src/opm/input/eclipse/Schedule/RFTConfig.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/RPTConfig.cpp b/src/opm/input/eclipse/Schedule/RPTConfig.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/RPTConfig.cpp rename to src/opm/input/eclipse/Schedule/RPTConfig.cpp index a719e88be..dd3d9396f 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/RPTConfig.cpp +++ b/src/opm/input/eclipse/Schedule/RPTConfig.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/RSTConfig.cpp b/src/opm/input/eclipse/Schedule/RSTConfig.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/RSTConfig.cpp rename to src/opm/input/eclipse/Schedule/RSTConfig.cpp index 30bfd4b03..f3a4cacda 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/RSTConfig.cpp +++ b/src/opm/input/eclipse/Schedule/RSTConfig.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Schedule.cpp b/src/opm/input/eclipse/Schedule/Schedule.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Schedule.cpp rename to src/opm/input/eclipse/Schedule/Schedule.cpp index 535c1ad45..aba403320 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Schedule.cpp +++ b/src/opm/input/eclipse/Schedule/Schedule.cpp @@ -58,32 +58,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 +#include #include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/ScheduleDeck.cpp b/src/opm/input/eclipse/Schedule/ScheduleDeck.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/ScheduleDeck.cpp rename to src/opm/input/eclipse/Schedule/ScheduleDeck.cpp index 42c32a04b..c2bd24d6a 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/ScheduleDeck.cpp +++ b/src/opm/input/eclipse/Schedule/ScheduleDeck.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/ScheduleGrid.cpp b/src/opm/input/eclipse/Schedule/ScheduleGrid.cpp similarity index 95% rename from src/opm/input/eclipse/EclipseState/Schedule/ScheduleGrid.cpp rename to src/opm/input/eclipse/Schedule/ScheduleGrid.cpp index 2527438df..196613e7f 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/ScheduleGrid.cpp +++ b/src/opm/input/eclipse/Schedule/ScheduleGrid.cpp @@ -18,8 +18,8 @@ */ #include -#include -#include +#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/ScheduleState.cpp b/src/opm/input/eclipse/Schedule/ScheduleState.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/ScheduleState.cpp rename to src/opm/input/eclipse/Schedule/ScheduleState.cpp index b1266f420..41376aeb7 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/ScheduleState.cpp +++ b/src/opm/input/eclipse/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/input/eclipse/EclipseState/Schedule/ScheduleTypes.cpp b/src/opm/input/eclipse/Schedule/ScheduleTypes.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/ScheduleTypes.cpp rename to src/opm/input/eclipse/Schedule/ScheduleTypes.cpp index 0869cf370..4ae7cdf4d 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/ScheduleTypes.cpp +++ b/src/opm/input/eclipse/Schedule/ScheduleTypes.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/SummaryState.cpp b/src/opm/input/eclipse/Schedule/SummaryState.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/SummaryState.cpp rename to src/opm/input/eclipse/Schedule/SummaryState.cpp index 3b26e3418..a3faf84cb 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/SummaryState.cpp +++ b/src/opm/input/eclipse/Schedule/SummaryState.cpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include namespace Opm{ namespace { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Tuning.cpp b/src/opm/input/eclipse/Schedule/Tuning.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Tuning.cpp rename to src/opm/input/eclipse/Schedule/Tuning.cpp index 0a2ab973c..f9d44c676 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Tuning.cpp +++ b/src/opm/input/eclipse/Schedule/Tuning.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQASTNode.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQASTNode.cpp index 0ef4c7e93..8636b8d8b 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp +++ b/src/opm/input/eclipse/Schedule/UDQ/UDQASTNode.cpp @@ -18,10 +18,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQActive.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQActive.cpp index aba4bfbad..bdbc6b325 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp +++ b/src/opm/input/eclipse/Schedule/UDQ/UDQActive.cpp @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQAssign.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQAssign.cpp similarity index 95% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQAssign.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQAssign.cpp index b38d86be4..d03a70034 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQAssign.cpp +++ b/src/opm/input/eclipse/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/input/eclipse/EclipseState/Schedule/UDQ/UDQConfig.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQConfig.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQConfig.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQConfig.cpp index 41860c51f..b74b6747a 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQConfig.cpp +++ b/src/opm/input/eclipse/Schedule/UDQ/UDQConfig.cpp @@ -23,11 +23,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQContext.cpp similarity index 95% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQContext.cpp index 4b26df59f..7fe682fbc 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp +++ b/src/opm/input/eclipse/Schedule/UDQ/UDQContext.cpp @@ -18,9 +18,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQDefine.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQDefine.cpp index 5828f1ce0..91e65abde 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp +++ b/src/opm/input/eclipse/Schedule/UDQ/UDQDefine.cpp @@ -25,13 +25,13 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include "../../../Parser/raw/RawConsts.hpp" +#include "../../Parser/raw/RawConsts.hpp" #include "UDQParser.hpp" namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQEnums.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQEnums.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQEnums.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQEnums.cpp index 3eb47b707..c6b86f2d2 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQEnums.cpp +++ b/src/opm/input/eclipse/Schedule/UDQ/UDQEnums.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunction.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQFunction.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunction.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQFunction.cpp index 6bfa67c90..e789a76e0 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunction.cpp +++ b/src/opm/input/eclipse/Schedule/UDQ/UDQFunction.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQFunctionTable.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQFunctionTable.cpp index 65e53eb89..f344573cf 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.cpp +++ b/src/opm/input/eclipse/Schedule/UDQ/UDQFunctionTable.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQInput.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQInput.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQInput.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQInput.cpp index 106226519..c5212e2d6 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQInput.cpp +++ b/src/opm/input/eclipse/Schedule/UDQ/UDQInput.cpp @@ -18,7 +18,7 @@ */ -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParams.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQParams.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParams.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQParams.cpp index af73be444..628e11e0c 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParams.cpp +++ b/src/opm/input/eclipse/Schedule/UDQ/UDQParams.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParser.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQParser.cpp similarity index 100% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParser.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQParser.cpp diff --git a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp b/src/opm/input/eclipse/Schedule/UDQ/UDQParser.hpp similarity index 89% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQParser.hpp index 90aa3061a..6aa498a71 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp +++ b/src/opm/input/eclipse/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/input/eclipse/EclipseState/Schedule/UDQ/UDQSet.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQSet.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQSet.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQSet.cpp index 2a124c516..442225ce4 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQSet.cpp +++ b/src/opm/input/eclipse/Schedule/UDQ/UDQSet.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQState.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQState.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQState.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQState.cpp index ae4bf4497..2eee7d1d1 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQState.cpp +++ b/src/opm/input/eclipse/Schedule/UDQ/UDQState.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQToken.cpp b/src/opm/input/eclipse/Schedule/UDQ/UDQToken.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQToken.cpp rename to src/opm/input/eclipse/Schedule/UDQ/UDQToken.cpp index 5c11ba578..618553a9f 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/UDQ/UDQToken.cpp +++ b/src/opm/input/eclipse/Schedule/UDQ/UDQToken.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/VFPInjTable.cpp b/src/opm/input/eclipse/Schedule/VFPInjTable.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/VFPInjTable.cpp rename to src/opm/input/eclipse/Schedule/VFPInjTable.cpp index e314650c5..2f568fe6a 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/VFPInjTable.cpp +++ b/src/opm/input/eclipse/Schedule/VFPInjTable.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include //Anonymous namespace namespace { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/VFPProdTable.cpp b/src/opm/input/eclipse/Schedule/VFPProdTable.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/VFPProdTable.cpp rename to src/opm/input/eclipse/Schedule/VFPProdTable.cpp index a73617c21..723dda5a2 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/VFPProdTable.cpp +++ b/src/opm/input/eclipse/Schedule/VFPProdTable.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/Connection.cpp b/src/opm/input/eclipse/Schedule/Well/Connection.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/Connection.cpp rename to src/opm/input/eclipse/Schedule/Well/Connection.cpp index b5ad78fe4..31de865a2 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/Connection.cpp +++ b/src/opm/input/eclipse/Schedule/Well/Connection.cpp @@ -31,9 +31,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/NameOrder.cpp b/src/opm/input/eclipse/Schedule/Well/NameOrder.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/NameOrder.cpp rename to src/opm/input/eclipse/Schedule/Well/NameOrder.cpp index 44adf3155..8ef8b7eda 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/NameOrder.cpp +++ b/src/opm/input/eclipse/Schedule/Well/NameOrder.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/PAvg.cpp b/src/opm/input/eclipse/Schedule/Well/PAvg.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/PAvg.cpp rename to src/opm/input/eclipse/Schedule/Well/PAvg.cpp index 4d2b99f0b..622b84c32 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/PAvg.cpp +++ b/src/opm/input/eclipse/Schedule/Well/PAvg.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculator.cpp b/src/opm/input/eclipse/Schedule/Well/PAvgCalculator.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculator.cpp rename to src/opm/input/eclipse/Schedule/Well/PAvgCalculator.cpp index b4de8eba5..73fdb06e6 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculator.cpp +++ b/src/opm/input/eclipse/Schedule/Well/PAvgCalculator.cpp @@ -21,9 +21,9 @@ #include -#include -#include -#include +#include +#include +#include #include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.cpp b/src/opm/input/eclipse/Schedule/Well/PAvgCalculatorCollection.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.cpp rename to src/opm/input/eclipse/Schedule/Well/PAvgCalculatorCollection.cpp index 4a1f616bb..1fd83e41c 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.cpp +++ b/src/opm/input/eclipse/Schedule/Well/PAvgCalculatorCollection.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/WList.cpp b/src/opm/input/eclipse/Schedule/Well/WList.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/WList.cpp rename to src/opm/input/eclipse/Schedule/Well/WList.cpp index 23fcc03d4..a8d0f0dd7 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/WList.cpp +++ b/src/opm/input/eclipse/Schedule/Well/WList.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/WListManager.cpp b/src/opm/input/eclipse/Schedule/Well/WListManager.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/WListManager.cpp rename to src/opm/input/eclipse/Schedule/Well/WListManager.cpp index b9bb70072..dbb1d2018 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/WListManager.cpp +++ b/src/opm/input/eclipse/Schedule/Well/WListManager.cpp @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/Well.cpp b/src/opm/input/eclipse/Schedule/Well/Well.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/Well.cpp rename to src/opm/input/eclipse/Schedule/Well/Well.cpp index 47484213c..493a893eb 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/Well.cpp +++ b/src/opm/input/eclipse/Schedule/Well/Well.cpp @@ -25,12 +25,12 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include #include "../MSW/Compsegs.hpp" diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellBrineProperties.cpp b/src/opm/input/eclipse/Schedule/Well/WellBrineProperties.cpp similarity index 94% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/WellBrineProperties.cpp rename to src/opm/input/eclipse/Schedule/Well/WellBrineProperties.cpp index 2bf3b54f4..2088ee2b7 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellBrineProperties.cpp +++ b/src/opm/input/eclipse/Schedule/Well/WellBrineProperties.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellConnections.cpp b/src/opm/input/eclipse/Schedule/Well/WellConnections.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/WellConnections.cpp rename to src/opm/input/eclipse/Schedule/Well/WellConnections.cpp index 88556b65a..fdaca2886 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellConnections.cpp +++ b/src/opm/input/eclipse/Schedule/Well/WellConnections.cpp @@ -36,9 +36,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp b/src/opm/input/eclipse/Schedule/Well/WellEconProductionLimits.cpp similarity index 99% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp rename to src/opm/input/eclipse/Schedule/Well/WellEconProductionLimits.cpp index 7db0769eb..6a6dfab9a 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp +++ b/src/opm/input/eclipse/Schedule/Well/WellEconProductionLimits.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellFoamProperties.cpp b/src/opm/input/eclipse/Schedule/Well/WellFoamProperties.cpp similarity index 94% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/WellFoamProperties.cpp rename to src/opm/input/eclipse/Schedule/Well/WellFoamProperties.cpp index 981fddd31..ee5bed851 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellFoamProperties.cpp +++ b/src/opm/input/eclipse/Schedule/Well/WellFoamProperties.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp b/src/opm/input/eclipse/Schedule/Well/WellInjectionProperties.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp rename to src/opm/input/eclipse/Schedule/Well/WellInjectionProperties.cpp index 3f1427fc8..251d78d36 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp +++ b/src/opm/input/eclipse/Schedule/Well/WellInjectionProperties.cpp @@ -24,11 +24,11 @@ #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/input/eclipse/EclipseState/Schedule/Well/WellMICPProperties.cpp b/src/opm/input/eclipse/Schedule/Well/WellMICPProperties.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/WellMICPProperties.cpp rename to src/opm/input/eclipse/Schedule/Well/WellMICPProperties.cpp index 6296671e9..148559b85 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellMICPProperties.cpp +++ b/src/opm/input/eclipse/Schedule/Well/WellMICPProperties.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellMatcher.cpp b/src/opm/input/eclipse/Schedule/Well/WellMatcher.cpp similarity index 96% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/WellMatcher.cpp rename to src/opm/input/eclipse/Schedule/Well/WellMatcher.cpp index 047299eb7..e97bb8ddb 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellMatcher.cpp +++ b/src/opm/input/eclipse/Schedule/Well/WellMatcher.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp b/src/opm/input/eclipse/Schedule/Well/WellPolymerProperties.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp rename to src/opm/input/eclipse/Schedule/Well/WellPolymerProperties.cpp index f7ab61a40..aafcbf12c 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp +++ b/src/opm/input/eclipse/Schedule/Well/WellPolymerProperties.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp b/src/opm/input/eclipse/Schedule/Well/WellProductionProperties.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp rename to src/opm/input/eclipse/Schedule/Well/WellProductionProperties.cpp index ca30cdf27..669510923 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp +++ b/src/opm/input/eclipse/Schedule/Well/WellProductionProperties.cpp @@ -27,10 +27,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "../eval_uda.hpp" diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp b/src/opm/input/eclipse/Schedule/Well/WellTestConfig.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp rename to src/opm/input/eclipse/Schedule/Well/WellTestConfig.cpp index 3cc370765..8d7a604e1 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp +++ b/src/opm/input/eclipse/Schedule/Well/WellTestConfig.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellTestState.cpp b/src/opm/input/eclipse/Schedule/Well/WellTestState.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/WellTestState.cpp rename to src/opm/input/eclipse/Schedule/Well/WellTestState.cpp index 9f2f03583..a753da3dc 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellTestState.cpp +++ b/src/opm/input/eclipse/Schedule/Well/WellTestState.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include namespace Opm { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp b/src/opm/input/eclipse/Schedule/Well/WellTracerProperties.cpp similarity index 95% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp rename to src/opm/input/eclipse/Schedule/Well/WellTracerProperties.cpp index cafe5ad64..894ad72f0 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp +++ b/src/opm/input/eclipse/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/input/eclipse/EclipseState/Schedule/Well/injection.cpp b/src/opm/input/eclipse/Schedule/Well/injection.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/injection.cpp rename to src/opm/input/eclipse/Schedule/Well/injection.cpp index cbcef8451..0dfc30a88 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/injection.cpp +++ b/src/opm/input/eclipse/Schedule/Well/injection.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include "injection.hpp" diff --git a/src/opm/input/eclipse/EclipseState/Schedule/Well/injection.hpp b/src/opm/input/eclipse/Schedule/Well/injection.hpp similarity index 88% rename from src/opm/input/eclipse/EclipseState/Schedule/Well/injection.hpp rename to src/opm/input/eclipse/Schedule/Well/injection.hpp index d6e81d5df..fbbb50854 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/Well/injection.hpp +++ b/src/opm/input/eclipse/Schedule/Well/injection.hpp @@ -21,8 +21,8 @@ #define INJECTION_HPP #include -#include -#include +#include +#include namespace Opm { namespace injection { diff --git a/src/opm/input/eclipse/EclipseState/Schedule/WriteRestartFileEvents.cpp b/src/opm/input/eclipse/Schedule/WriteRestartFileEvents.cpp similarity index 98% rename from src/opm/input/eclipse/EclipseState/Schedule/WriteRestartFileEvents.cpp rename to src/opm/input/eclipse/Schedule/WriteRestartFileEvents.cpp index 9d6845f8e..f6b1c7c70 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/WriteRestartFileEvents.cpp +++ b/src/opm/input/eclipse/Schedule/WriteRestartFileEvents.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/input/eclipse/EclipseState/Schedule/eval_uda.cpp b/src/opm/input/eclipse/Schedule/eval_uda.cpp similarity index 97% rename from src/opm/input/eclipse/EclipseState/Schedule/eval_uda.cpp rename to src/opm/input/eclipse/Schedule/eval_uda.cpp index 49152cd2a..34f4174f2 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/eval_uda.cpp +++ b/src/opm/input/eclipse/Schedule/eval_uda.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include "Well/injection.hpp" #include "eval_uda.hpp" diff --git a/src/opm/input/eclipse/EclipseState/Schedule/eval_uda.hpp b/src/opm/input/eclipse/Schedule/eval_uda.hpp similarity index 91% rename from src/opm/input/eclipse/EclipseState/Schedule/eval_uda.hpp rename to src/opm/input/eclipse/Schedule/eval_uda.hpp index 0cc2d97e9..67001c98c 100644 --- a/src/opm/input/eclipse/EclipseState/Schedule/eval_uda.hpp +++ b/src/opm/input/eclipse/Schedule/eval_uda.hpp @@ -22,8 +22,8 @@ #include -#include -#include +#include +#include namespace Opm { class UDAvalue; diff --git a/src/opm/io/eclipse/rst/segment.cpp b/src/opm/io/eclipse/rst/segment.cpp index f6ee6c5cf..f374dec45 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 "src/opm/input/eclipse/EclipseState/Schedule/MSW/icd_convert.hpp" +#include "src/opm/input/eclipse/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 865ff2ddd..1b0bf4bdc 100644 --- a/src/opm/io/eclipse/rst/state.cpp +++ b/src/opm/io/eclipse/rst/state.cpp @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/opm/output/eclipse/AggregateActionxData.cpp b/src/opm/output/eclipse/AggregateActionxData.cpp index 4d66198e0..1a1a3ee71 100644 --- a/src/opm/output/eclipse/AggregateActionxData.cpp +++ b/src/opm/output/eclipse/AggregateActionxData.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 #include #include diff --git a/src/opm/output/eclipse/AggregateAquiferData.cpp b/src/opm/output/eclipse/AggregateAquiferData.cpp index 76952d95a..db461d410 100644 --- a/src/opm/output/eclipse/AggregateAquiferData.cpp +++ b/src/opm/output/eclipse/AggregateAquiferData.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include diff --git a/src/opm/output/eclipse/AggregateConnectionData.cpp b/src/opm/output/eclipse/AggregateConnectionData.cpp index 6c8916711..1b4e3a19c 100644 --- a/src/opm/output/eclipse/AggregateConnectionData.cpp +++ b/src/opm/output/eclipse/AggregateConnectionData.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/src/opm/output/eclipse/AggregateGroupData.cpp b/src/opm/output/eclipse/AggregateGroupData.cpp index 164d5c339..533566a3f 100644 --- a/src/opm/output/eclipse/AggregateGroupData.cpp +++ b/src/opm/output/eclipse/AggregateGroupData.cpp @@ -26,10 +26,10 @@ #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 50f633d8e..e46246fb9 100644 --- a/src/opm/output/eclipse/AggregateMSWData.cpp +++ b/src/opm/output/eclipse/AggregateMSWData.cpp @@ -24,13 +24,13 @@ #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 830f891e5..7ebc8f6f8 100644 --- a/src/opm/output/eclipse/AggregateNetworkData.cpp +++ b/src/opm/output/eclipse/AggregateNetworkData.cpp @@ -26,14 +26,14 @@ #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 4b5b0923a..2a729c813 100644 --- a/src/opm/output/eclipse/AggregateUDQData.cpp +++ b/src/opm/output/eclipse/AggregateUDQData.cpp @@ -26,18 +26,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/src/opm/output/eclipse/AggregateWListData.cpp b/src/opm/output/eclipse/AggregateWListData.cpp index 5bc2013c9..c6fb3287a 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 559468f08..722a5dc4d 100644 --- a/src/opm/output/eclipse/AggregateWellData.cpp +++ b/src/opm/output/eclipse/AggregateWellData.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 #include diff --git a/src/opm/output/eclipse/CreateActionRSTDims.cpp b/src/opm/output/eclipse/CreateActionRSTDims.cpp index 991434462..99c4f8dc0 100644 --- a/src/opm/output/eclipse/CreateActionRSTDims.cpp +++ b/src/opm/output/eclipse/CreateActionRSTDims.cpp @@ -25,13 +25,13 @@ #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 62ced489e..09e6bf1da 100644 --- a/src/opm/output/eclipse/CreateDoubHead.cpp +++ b/src/opm/output/eclipse/CreateDoubHead.cpp @@ -23,8 +23,8 @@ #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 626faf0f0..afbb05a81 100644 --- a/src/opm/output/eclipse/CreateInteHead.cpp +++ b/src/opm/output/eclipse/CreateInteHead.cpp @@ -27,13 +27,13 @@ #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/CreateUdqDims.cpp b/src/opm/output/eclipse/CreateUdqDims.cpp index 0a9c5428a..2f4b1e652 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 9c9052f38..824699c1b 100644 --- a/src/opm/output/eclipse/DoubHEAD.cpp +++ b/src/opm/output/eclipse/DoubHEAD.cpp @@ -18,8 +18,8 @@ */ #include -#include -#include +#include +#include #include #include // Opm::RestartIO::makeUTCTime() diff --git a/src/opm/output/eclipse/EclipseIO.cpp b/src/opm/output/eclipse/EclipseIO.cpp index 380d01767..81dff3c0b 100644 --- a/src/opm/output/eclipse/EclipseIO.cpp +++ b/src/opm/output/eclipse/EclipseIO.cpp @@ -32,9 +32,9 @@ #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 0a30892b1..8ca5f32b0 100644 --- a/src/opm/output/eclipse/LoadRestart.cpp +++ b/src/opm/output/eclipse/LoadRestart.cpp @@ -46,14 +46,14 @@ #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 7892d9841..f45ff4ecd 100644 --- a/src/opm/output/eclipse/RegionCache.cpp +++ b/src/opm/output/eclipse/RegionCache.cpp @@ -19,9 +19,9 @@ #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 f99679cb3..8346f5afc 100644 --- a/src/opm/output/eclipse/RestartIO.cpp +++ b/src/opm/output/eclipse/RestartIO.cpp @@ -42,13 +42,13 @@ #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 cf829a649..7ac03a4f6 100644 --- a/src/opm/output/eclipse/Summary.cpp +++ b/src/opm/output/eclipse/Summary.cpp @@ -34,18 +34,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 #include #include diff --git a/src/opm/output/eclipse/UDQDims.cpp b/src/opm/output/eclipse/UDQDims.cpp index 0fe2cf131..54be9d7cc 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 ef926f6fb..fd07c7bb2 100644 --- a/src/opm/output/eclipse/WriteInit.cpp +++ b/src/opm/output/eclipse/WriteInit.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include diff --git a/src/opm/output/eclipse/WriteRFT.cpp b/src/opm/output/eclipse/WriteRFT.cpp index 330cfe1e0..23675913d 100644 --- a/src/opm/output/eclipse/WriteRFT.cpp +++ b/src/opm/output/eclipse/WriteRFT.cpp @@ -32,8 +32,8 @@ #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 379fe2f73..c76237b11 100644 --- a/src/opm/output/eclipse/report/WELSPECS.cpp +++ b/src/opm/output/eclipse/report/WELSPECS.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include namespace { diff --git a/tests/msim/test_msim.cpp b/tests/msim/test_msim.cpp index 74f65644a..be45c8921 100644 --- a/tests/msim/test_msim.cpp +++ b/tests/msim/test_msim.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/msim/test_msim_ACTIONX.cpp b/tests/msim/test_msim_ACTIONX.cpp index f9f085cd8..3f67e7f22 100644 --- a/tests/msim/test_msim_ACTIONX.cpp +++ b/tests/msim/test_msim_ACTIONX.cpp @@ -29,13 +29,13 @@ #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 e440d7eba..6f2d62a3f 100644 --- a/tests/msim/test_msim_EXIT.cpp +++ b/tests/msim/test_msim_EXIT.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/tests/parser/ACTIONX.cpp b/tests/parser/ACTIONX.cpp index 78896c482..a1744876a 100644 --- a/tests/parser/ACTIONX.cpp +++ b/tests/parser/ACTIONX.cpp @@ -31,18 +31,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 +#include #include #include #include diff --git a/tests/parser/ConnectionTests.cpp b/tests/parser/ConnectionTests.cpp index fd99e9d1f..97a748e38 100644 --- a/tests/parser/ConnectionTests.cpp +++ b/tests/parser/ConnectionTests.cpp @@ -29,15 +29,15 @@ #include #include -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include -#include +#include #include #include diff --git a/tests/parser/EclipseStateTests.cpp b/tests/parser/EclipseStateTests.cpp index 0494350e4..1a32fd40c 100644 --- a/tests/parser/EclipseStateTests.cpp +++ b/tests/parser/EclipseStateTests.cpp @@ -25,7 +25,7 @@ along with OPM. If not, see . #include #include -#include +#include #include #include #include diff --git a/tests/parser/EmbeddedPython.cpp b/tests/parser/EmbeddedPython.cpp index 0659d006b..a9a7c3273 100644 --- a/tests/parser/EmbeddedPython.cpp +++ b/tests/parser/EmbeddedPython.cpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include using namespace Opm; diff --git a/tests/parser/EventTests.cpp b/tests/parser/EventTests.cpp index c03e673b8..857a5b9c2 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/FieldPropsTests.cpp b/tests/parser/FieldPropsTests.cpp index d01b2cb06..caec82fda 100644 --- a/tests/parser/FieldPropsTests.cpp +++ b/tests/parser/FieldPropsTests.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include "src/opm/input/eclipse/EclipseState/Grid/FieldProps.hpp" diff --git a/tests/parser/GeomodifierTests.cpp b/tests/parser/GeomodifierTests.cpp index 5d16272c3..087499c12 100644 --- a/tests/parser/GeomodifierTests.cpp +++ b/tests/parser/GeomodifierTests.cpp @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include using namespace Opm; diff --git a/tests/parser/GroupTests.cpp b/tests/parser/GroupTests.cpp index cf31fa954..ff0397f57 100644 --- a/tests/parser/GroupTests.cpp +++ b/tests/parser/GroupTests.cpp @@ -30,16 +30,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/MessageLimitTests.cpp b/tests/parser/MessageLimitTests.cpp index 703c8be83..4465eed86 100644 --- a/tests/parser/MessageLimitTests.cpp +++ b/tests/parser/MessageLimitTests.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/tests/parser/MultisegmentWellTests.cpp b/tests/parser/MultisegmentWellTests.cpp index 54c162cde..dacf7862d 100644 --- a/tests/parser/MultisegmentWellTests.cpp +++ b/tests/parser/MultisegmentWellTests.cpp @@ -34,14 +34,14 @@ #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 "src/opm/input/eclipse/Schedule/MSW/Compsegs.hpp" +#include +#include #include diff --git a/tests/parser/NetworkTests.cpp b/tests/parser/NetworkTests.cpp index 54e5c4c40..6230528cf 100644 --- a/tests/parser/NetworkTests.cpp +++ b/tests/parser/NetworkTests.cpp @@ -24,10 +24,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/tests/parser/PAvgTests.cpp b/tests/parser/PAvgTests.cpp index 8d5417e21..8c459e610 100644 --- a/tests/parser/PAvgTests.cpp +++ b/tests/parser/PAvgTests.cpp @@ -23,9 +23,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/tests/parser/PYACTION.cpp b/tests/parser/PYACTION.cpp index 819fc502c..f0b97a26f 100644 --- a/tests/parser/PYACTION.cpp +++ b/tests/parser/PYACTION.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include using namespace Opm; diff --git a/tests/parser/ParseContextTests.cpp b/tests/parser/ParseContextTests.cpp index fbd10a9e5..ab12c4ba2 100644 --- a/tests/parser/ParseContextTests.cpp +++ b/tests/parser/ParseContextTests.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include using namespace Opm; diff --git a/tests/parser/PvtxTableTests.cpp b/tests/parser/PvtxTableTests.cpp index 5d0673ff3..3269c5d84 100644 --- a/tests/parser/PvtxTableTests.cpp +++ b/tests/parser/PvtxTableTests.cpp @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/tests/parser/RFTConfigTests.cpp b/tests/parser/RFTConfigTests.cpp index b7cfc0f29..bf42ac793 100644 --- a/tests/parser/RFTConfigTests.cpp +++ b/tests/parser/RFTConfigTests.cpp @@ -21,11 +21,11 @@ #include -#include +#include #include #include -#include +#include #include #include diff --git a/tests/parser/RestartConfigTests.cpp b/tests/parser/RestartConfigTests.cpp index facfeea22..2f947b214 100644 --- a/tests/parser/RestartConfigTests.cpp +++ b/tests/parser/RestartConfigTests.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/parser/RockTableTests.cpp b/tests/parser/RockTableTests.cpp index 78aa51aca..20e7f9e1e 100644 --- a/tests/parser/RockTableTests.cpp +++ b/tests/parser/RockTableTests.cpp @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/tests/parser/ScheduleRestartTests.cpp b/tests/parser/ScheduleRestartTests.cpp index 9810280aa..655266a4e 100644 --- a/tests/parser/ScheduleRestartTests.cpp +++ b/tests/parser/ScheduleRestartTests.cpp @@ -26,21 +26,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 diff --git a/tests/parser/ScheduleSerializeTest.cpp b/tests/parser/ScheduleSerializeTest.cpp index 6d204a3de..e190025a2 100644 --- a/tests/parser/ScheduleSerializeTest.cpp +++ b/tests/parser/ScheduleSerializeTest.cpp @@ -21,7 +21,7 @@ #include -#include +#include #include #include @@ -29,15 +29,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -49,10 +49,10 @@ #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 096704e77..123f6b7a1 100644 --- a/tests/parser/ScheduleTests.cpp +++ b/tests/parser/ScheduleTests.cpp @@ -43,16 +43,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -64,12 +64,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "tests/WorkArea.cpp" diff --git a/tests/parser/SummaryConfigTests.cpp b/tests/parser/SummaryConfigTests.cpp index a638cc44a..7b91dea58 100644 --- a/tests/parser/SummaryConfigTests.cpp +++ b/tests/parser/SummaryConfigTests.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/parser/TableManagerTests.cpp b/tests/parser/TableManagerTests.cpp index 52d792bcd..b5123249e 100644 --- a/tests/parser/TableManagerTests.cpp +++ b/tests/parser/TableManagerTests.cpp @@ -44,8 +44,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/tests/parser/TuningTests.cpp b/tests/parser/TuningTests.cpp index 6febbec21..b8fa046e3 100644 --- a/tests/parser/TuningTests.cpp +++ b/tests/parser/TuningTests.cpp @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/tests/parser/UDQTests.cpp b/tests/parser/UDQTests.cpp index 5e540436e..390726330 100644 --- a/tests/parser/UDQTests.cpp +++ b/tests/parser/UDQTests.cpp @@ -29,21 +29,21 @@ 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 using namespace Opm; diff --git a/tests/parser/WLIST.cpp b/tests/parser/WLIST.cpp index 5d16a3977..e3e4944c7 100644 --- a/tests/parser/WLIST.cpp +++ b/tests/parser/WLIST.cpp @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/tests/parser/WTEST.cpp b/tests/parser/WTEST.cpp index 48bcf32e1..9d6cd8211 100644 --- a/tests/parser/WTEST.cpp +++ b/tests/parser/WTEST.cpp @@ -25,11 +25,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/tests/parser/WellSolventTests.cpp b/tests/parser/WellSolventTests.cpp index 8dc762681..30ad9148b 100644 --- a/tests/parser/WellSolventTests.cpp +++ b/tests/parser/WellSolventTests.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/parser/WellTests.cpp b/tests/parser/WellTests.cpp index d6b0114d1..22c4010a0 100644 --- a/tests/parser/WellTests.cpp +++ b/tests/parser/WellTests.cpp @@ -36,19 +36,19 @@ #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 4ed161225..f61ca43c3 100644 --- a/tests/parser/WellTracerTests.cpp +++ b/tests/parser/WellTracerTests.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/parser/WriteRestartFileEventsTests.cpp b/tests/parser/WriteRestartFileEventsTests.cpp index 21c6b8fd8..238e73f4a 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/IOConfigIntegrationTest.cpp b/tests/parser/integration/IOConfigIntegrationTest.cpp index 7c5166803..8fe019dcd 100644 --- a/tests/parser/integration/IOConfigIntegrationTest.cpp +++ b/tests/parser/integration/IOConfigIntegrationTest.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include using namespace Opm; diff --git a/tests/parser/integration/ParseKEYWORD.cpp b/tests/parser/integration/ParseKEYWORD.cpp index 359807ecc..ed38816a6 100644 --- a/tests/parser/integration/ParseKEYWORD.cpp +++ b/tests/parser/integration/ParseKEYWORD.cpp @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -38,8 +38,8 @@ #include #include -#include -#include +#include +#include using namespace Opm; diff --git a/tests/parser/integration/ScheduleCreateFromDeck.cpp b/tests/parser/integration/ScheduleCreateFromDeck.cpp index 46969e007..9b1c123b5 100644 --- a/tests/parser/integration/ScheduleCreateFromDeck.cpp +++ b/tests/parser/integration/ScheduleCreateFromDeck.cpp @@ -28,16 +28,16 @@ #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 c68959d08..5a69e84d8 100644 --- a/tests/parser/integration/TransMultIntegrationTests.cpp +++ b/tests/parser/integration/TransMultIntegrationTests.cpp @@ -23,7 +23,7 @@ #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 1cea73f5a..f4e21b7fd 100644 --- a/tests/parser/integration/parse_write.cpp +++ b/tests/parser/integration/parse_write.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/parser/test_ReportConfig.cpp b/tests/parser/test_ReportConfig.cpp index e64c0e1b7..e2282416c 100644 --- a/tests/parser/test_ReportConfig.cpp +++ b/tests/parser/test_ReportConfig.cpp @@ -24,8 +24,8 @@ #define BOOST_TEST_MODULE ReportConfigTest #include -#include -#include +#include +#include #include #include #include diff --git a/tests/rst_test.cpp b/tests/rst_test.cpp index a52c5989e..c311fe4c4 100644 --- a/tests/rst_test.cpp +++ b/tests/rst_test.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include diff --git a/tests/test_AggregateActionxData.cpp b/tests/test_AggregateActionxData.cpp index 4eb2cd0aa..5518ded51 100644 --- a/tests/test_AggregateActionxData.cpp +++ b/tests/test_AggregateActionxData.cpp @@ -7,14 +7,14 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include #include #include #include @@ -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/test_AggregateAquiferData.cpp b/tests/test_AggregateAquiferData.cpp index 49aa96301..116237f61 100644 --- a/tests/test_AggregateAquiferData.cpp +++ b/tests/test_AggregateAquiferData.cpp @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/tests/test_AggregateConnectionData.cpp b/tests/test_AggregateConnectionData.cpp index e11e7b002..069f42513 100644 --- a/tests/test_AggregateConnectionData.cpp +++ b/tests/test_AggregateConnectionData.cpp @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/tests/test_AggregateGroupData.cpp b/tests/test_AggregateGroupData.cpp index 68a404117..d0831169a 100644 --- a/tests/test_AggregateGroupData.cpp +++ b/tests/test_AggregateGroupData.cpp @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/tests/test_AggregateMSWData.cpp b/tests/test_AggregateMSWData.cpp index e634d1485..6c71e8a1c 100644 --- a/tests/test_AggregateMSWData.cpp +++ b/tests/test_AggregateMSWData.cpp @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/tests/test_AggregateNetworkData.cpp b/tests/test_AggregateNetworkData.cpp index 51e8e2467..8a906a741 100644 --- a/tests/test_AggregateNetworkData.cpp +++ b/tests/test_AggregateNetworkData.cpp @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/tests/test_AggregateUDQData.cpp b/tests/test_AggregateUDQData.cpp index ac70d243b..9468de412 100644 --- a/tests/test_AggregateUDQData.cpp +++ b/tests/test_AggregateUDQData.cpp @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -19,14 +19,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/test_AggregateWListData.cpp b/tests/test_AggregateWListData.cpp index bd5348ac8..6df45dbe2 100644 --- a/tests/test_AggregateWListData.cpp +++ b/tests/test_AggregateWListData.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/tests/test_AggregateWellData.cpp b/tests/test_AggregateWellData.cpp index 70d06ee25..f7b4d46d7 100644 --- a/tests/test_AggregateWellData.cpp +++ b/tests/test_AggregateWellData.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -42,10 +42,10 @@ #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 9dc760d90..5dc0c66a6 100644 --- a/tests/test_ArrayDimChecker.cpp +++ b/tests/test_ArrayDimChecker.cpp @@ -21,13 +21,13 @@ #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 af4a9699d..0d0c6a18d 100644 --- a/tests/test_DoubHEAD.cpp +++ b/tests/test_DoubHEAD.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/test_EclipseIO.cpp b/tests/test_EclipseIO.cpp index 93dc60029..a0914e391 100644 --- a/tests/test_EclipseIO.cpp +++ b/tests/test_EclipseIO.cpp @@ -29,15 +29,15 @@ #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 e6b94ba4c..03a01c8fc 100644 --- a/tests/test_GuideRate.cpp +++ b/tests/test_GuideRate.cpp @@ -21,7 +21,7 @@ #include -#include +#include #include #include @@ -31,9 +31,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/tests/test_InteHEAD.cpp b/tests/test_InteHEAD.cpp index ecff6ca98..fac2e8623 100644 --- a/tests/test_InteHEAD.cpp +++ b/tests/test_InteHEAD.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/tests/test_LGOData.cpp b/tests/test_LGOData.cpp index 61243b036..86acc55df 100644 --- a/tests/test_LGOData.cpp +++ b/tests/test_LGOData.cpp @@ -4,11 +4,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/test_RFT.cpp b/tests/test_RFT.cpp index cd006321a..aea85156a 100644 --- a/tests/test_RFT.cpp +++ b/tests/test_RFT.cpp @@ -36,12 +36,12 @@ #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 868e28662..8bb7a0b83 100644 --- a/tests/test_Restart.cpp +++ b/tests/test_Restart.cpp @@ -35,16 +35,16 @@ #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.cpp b/tests/test_Summary.cpp index 314676357..9538003fd 100644 --- a/tests/test_Summary.cpp +++ b/tests/test_Summary.cpp @@ -42,12 +42,12 @@ #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 e808a8ed0..55b8a4a41 100644 --- a/tests/test_Summary_Group.cpp +++ b/tests/test_Summary_Group.cpp @@ -40,12 +40,12 @@ #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 566d7c977..8e48d69ed 100644 --- a/tests/test_regionCache.cpp +++ b/tests/test_regionCache.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/test_restartwellinfo.cpp b/tests/test_restartwellinfo.cpp index 376f0bb62..9c9006e27 100644 --- a/tests/test_restartwellinfo.cpp +++ b/tests/test_restartwellinfo.cpp @@ -27,20 +27,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 diff --git a/tests/test_rst.cpp b/tests/test_rst.cpp index 48695e4a3..4b2a7d965 100644 --- a/tests/test_rst.cpp +++ b/tests/test_rst.cpp @@ -41,10 +41,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include