From 04d42c2f4e455f343c3cde73822c6059912df9c2 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Fri, 8 Mar 2019 07:12:07 +0100 Subject: [PATCH] Move well and well related files to Well/ subfolder --- CMakeLists_files.cmake | 48 +++++++++---------- opm/output/eclipse/RestartIO.hpp | 2 +- opm/output/eclipse/libECLRestart.hpp | 2 +- .../MSW/updatingConnectionsWithSegments.hpp | 4 +- .../EclipseState/Schedule/Schedule.hpp | 6 +-- .../Schedule/{ => Well}/Connection.hpp | 0 .../Schedule/{ => Well}/WList.hpp | 0 .../Schedule/{ => Well}/WListManager.hpp | 0 .../EclipseState/Schedule/{ => Well}/Well.hpp | 12 ++--- .../Schedule/{ => Well}/WellConnections.hpp | 2 +- .../{ => Well}/WellEconProductionLimits.hpp | 0 .../{ => Well}/WellInjectionProperties.hpp | 0 .../{ => Well}/WellPolymerProperties.hpp | 0 .../{ => Well}/WellProductionProperties.hpp | 0 .../Schedule/{ => Well}/WellTestConfig.hpp | 0 .../Schedule/{ => Well}/WellTestState.hpp | 2 +- .../{ => Well}/WellTracerProperties.hpp | 0 .../eclipse/AggregateConnectionData.cpp | 2 +- src/opm/output/eclipse/AggregateGroupData.cpp | 2 +- src/opm/output/eclipse/AggregateMSWData.cpp | 7 ++- src/opm/output/eclipse/AggregateWellData.cpp | 3 +- src/opm/output/eclipse/EclipseIO.cpp | 4 +- src/opm/output/eclipse/LoadRestart.cpp | 2 +- src/opm/output/eclipse/RegionCache.cpp | 6 +-- src/opm/output/eclipse/RestartIO.cpp | 2 +- src/opm/output/eclipse/Summary.cpp | 12 ++--- .../EclipseState/IOConfig/IOConfig.cpp | 2 +- .../EclipseState/IOConfig/RestartConfig.cpp | 8 +++- .../EclipseState/Schedule/ArrayDimChecker.cpp | 19 ++++---- .../eclipse/EclipseState/Schedule/Group.cpp | 2 +- .../EclipseState/Schedule/MSW/Compsegs.cpp | 6 ++- .../EclipseState/Schedule/MSW/Compsegs.hpp | 6 +-- .../MSW/updatingConnectionsWithSegments.cpp | 1 + .../EclipseState/Schedule/Schedule.cpp | 14 +++--- .../Schedule/{ => Well}/Connection.cpp | 4 +- .../Schedule/{ => Well}/WList.cpp | 2 +- .../Schedule/{ => Well}/WListManager.cpp | 4 +- .../EclipseState/Schedule/{ => Well}/Well.cpp | 6 +-- .../Schedule/{ => Well}/WellConnections.cpp | 4 +- .../{ => Well}/WellEconProductionLimits.cpp | 3 +- .../{ => Well}/WellInjectionProperties.cpp | 8 ++-- .../{ => Well}/WellPolymerProperties.cpp | 2 +- .../{ => Well}/WellProductionProperties.cpp | 4 +- .../Schedule/{ => Well}/WellTestConfig.cpp | 2 +- .../Schedule/{ => Well}/WellTestState.cpp | 4 +- .../{ => Well}/WellTracerProperties.cpp | 2 +- .../SummaryConfig/SummaryConfig.cpp | 19 ++++---- tests/parser/ConnectionTests.cpp | 4 +- tests/parser/DynamicStateTests.cpp | 2 +- tests/parser/DynamicVectorTests.cpp | 2 +- tests/parser/GroupTests.cpp | 2 +- tests/parser/MultisegmentWellTests.cpp | 4 +- tests/parser/ScheduleTests.cpp | 4 +- tests/parser/WLIST.cpp | 4 +- tests/parser/WTEST.cpp | 8 ++-- tests/parser/WellSolventTests.cpp | 10 ++-- tests/parser/WellTests.cpp | 8 ++-- tests/parser/WellTracerTests.cpp | 10 ++-- .../integration/ScheduleCreateFromDeck.cpp | 4 +- tests/test_RFT.cpp | 2 +- tests/test_Restart.cpp | 2 +- tests/test_writenumwells.cpp | 4 +- 62 files changed, 158 insertions(+), 152 deletions(-) rename opm/parser/eclipse/EclipseState/Schedule/{ => Well}/Connection.hpp (100%) rename opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WList.hpp (100%) rename opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WListManager.hpp (100%) rename opm/parser/eclipse/EclipseState/Schedule/{ => Well}/Well.hpp (95%) rename opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellConnections.hpp (98%) rename opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellEconProductionLimits.hpp (100%) rename opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellInjectionProperties.hpp (100%) rename opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellPolymerProperties.hpp (100%) rename opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellProductionProperties.hpp (100%) rename opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellTestConfig.hpp (100%) rename opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellTestState.hpp (98%) rename opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellTracerProperties.hpp (100%) rename src/opm/parser/eclipse/EclipseState/Schedule/{ => Well}/Connection.cpp (97%) rename src/opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WList.cpp (95%) rename src/opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WListManager.cpp (91%) rename src/opm/parser/eclipse/EclipseState/Schedule/{ => Well}/Well.cpp (99%) rename src/opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellConnections.cpp (99%) rename src/opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellEconProductionLimits.cpp (98%) rename src/opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellInjectionProperties.cpp (97%) rename src/opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellPolymerProperties.cpp (95%) rename src/opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellProductionProperties.cpp (99%) rename src/opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellTestConfig.cpp (98%) rename src/opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellTestState.cpp (97%) rename src/opm/parser/eclipse/EclipseState/Schedule/{ => Well}/WellTracerProperties.cpp (95%) diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index 7fdc8da80..aba08b6d3 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -84,8 +84,6 @@ if(ENABLE_ECL_INPUT) src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionValue.cpp src/opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.cpp src/opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Connection.cpp - src/opm/parser/eclipse/EclipseState/Schedule/WellConnections.cpp src/opm/parser/eclipse/EclipseState/Schedule/Events.cpp src/opm/parser/eclipse/EclipseState/Schedule/Group.cpp src/opm/parser/eclipse/EclipseState/Schedule/GroupTree.cpp @@ -100,16 +98,18 @@ if(ENABLE_ECL_INPUT) src/opm/parser/eclipse/EclipseState/Schedule/SummaryState.cpp src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp src/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp - src/opm/parser/eclipse/EclipseState/Schedule/Well.cpp - src/opm/parser/eclipse/EclipseState/Schedule/WList.cpp - src/opm/parser/eclipse/EclipseState/Schedule/WListManager.cpp - src/opm/parser/eclipse/EclipseState/Schedule/WellEconProductionLimits.cpp - src/opm/parser/eclipse/EclipseState/Schedule/WellInjectionProperties.cpp - src/opm/parser/eclipse/EclipseState/Schedule/WellPolymerProperties.cpp - src/opm/parser/eclipse/EclipseState/Schedule/WellTracerProperties.cpp - src/opm/parser/eclipse/EclipseState/Schedule/WellProductionProperties.cpp - src/opm/parser/eclipse/EclipseState/Schedule/WellTestConfig.cpp - src/opm/parser/eclipse/EclipseState/Schedule/WellTestState.cpp + src/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.cpp + src/opm/parser/eclipse/EclipseState/Schedule/Well/Well.cpp + src/opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.cpp + src/opm/parser/eclipse/EclipseState/Schedule/Well/WList.cpp + src/opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.cpp + src/opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp + src/opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp + src/opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp + src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp + src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp + src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp + src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.cpp src/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp src/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp @@ -485,16 +485,21 @@ if(ENABLE_ECL_INPUT) opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp - opm/parser/eclipse/EclipseState/Schedule/Well.hpp - opm/parser/eclipse/EclipseState/Schedule/WellInjectionProperties.hpp - opm/parser/eclipse/EclipseState/Schedule/WList.hpp - opm/parser/eclipse/EclipseState/Schedule/WListManager.hpp + opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp + opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp + opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.hpp + opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp + opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp + opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.hpp + opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.hpp + opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp + opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.hpp + opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp + opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp + opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp opm/parser/eclipse/EclipseState/Schedule/DynamicVector.hpp opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp - opm/parser/eclipse/EclipseState/Schedule/WellEconProductionLimits.hpp - opm/parser/eclipse/EclipseState/Schedule/WellPolymerProperties.hpp - opm/parser/eclipse/EclipseState/Schedule/WellTracerProperties.hpp opm/parser/eclipse/EclipseState/Schedule/Tuning.hpp opm/parser/eclipse/EclipseState/Schedule/Group.hpp opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp @@ -502,15 +507,10 @@ if(ENABLE_ECL_INPUT) opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.hpp opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp opm/parser/eclipse/EclipseState/Schedule/GroupTree.hpp - opm/parser/eclipse/EclipseState/Schedule/Connection.hpp opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.hpp opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp opm/parser/eclipse/EclipseState/Schedule/MSW/updatingConnectionsWithSegments.hpp - opm/parser/eclipse/EclipseState/Schedule/WellProductionProperties.hpp - opm/parser/eclipse/EclipseState/Schedule/WellTestConfig.hpp - opm/parser/eclipse/EclipseState/Schedule/WellTestState.hpp - opm/parser/eclipse/EclipseState/Schedule/WellConnections.hpp opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.hpp diff --git a/opm/output/eclipse/RestartIO.hpp b/opm/output/eclipse/RestartIO.hpp index 741731d4a..86e54c2fb 100644 --- a/opm/output/eclipse/RestartIO.hpp +++ b/opm/output/eclipse/RestartIO.hpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/opm/output/eclipse/libECLRestart.hpp b/opm/output/eclipse/libECLRestart.hpp index 2ad0d9d85..cf653f64a 100755 --- a/opm/output/eclipse/libECLRestart.hpp +++ b/opm/output/eclipse/libECLRestart.hpp @@ -49,7 +49,7 @@ //jal - comment on the following include to avoid duplication #include #include -#include +#include #include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/MSW/updatingConnectionsWithSegments.hpp b/opm/parser/eclipse/EclipseState/Schedule/MSW/updatingConnectionsWithSegments.hpp index 2913d7915..ff8e60431 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/MSW/updatingConnectionsWithSegments.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/MSW/updatingConnectionsWithSegments.hpp @@ -22,9 +22,9 @@ #include -#include -#include #include +#include +#include namespace Opm { WellConnections * newConnectionsWithSegments(const DeckKeyword& compsegs, const WellConnections& input_connections, diff --git a/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp b/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp index 94ec425d6..9cd770229 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp @@ -24,6 +24,7 @@ #include +#include #include #include #include @@ -32,14 +33,13 @@ #include #include #include -#include #include #include #include -#include #include #include -#include +#include +#include #include namespace Opm diff --git a/opm/parser/eclipse/EclipseState/Schedule/Connection.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/Connection.hpp rename to opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/WList.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/WList.hpp rename to opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/WListManager.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/WListManager.hpp rename to opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp similarity index 95% rename from opm/parser/eclipse/EclipseState/Schedule/Well.hpp rename to opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp index 29ff437c1..037181df5 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp @@ -27,13 +27,13 @@ #include #include -#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/opm/parser/eclipse/EclipseState/Schedule/WellConnections.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/Schedule/WellConnections.hpp rename to opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp index a9c5fe3ba..8fab014a9 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/WellConnections.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp @@ -21,7 +21,7 @@ #ifndef CONNECTIONSET_HPP_ #define CONNECTIONSET_HPP_ -#include +#include namespace Opm { class EclipseGrid; diff --git a/opm/parser/eclipse/EclipseState/Schedule/WellEconProductionLimits.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/WellEconProductionLimits.hpp rename to opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/WellInjectionProperties.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/WellInjectionProperties.hpp rename to opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/WellPolymerProperties.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/WellPolymerProperties.hpp rename to opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/WellProductionProperties.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/WellProductionProperties.hpp rename to opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/WellTestConfig.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/WellTestConfig.hpp rename to opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp diff --git a/opm/parser/eclipse/EclipseState/Schedule/WellTestState.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp similarity index 98% rename from opm/parser/eclipse/EclipseState/Schedule/WellTestState.hpp rename to opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp index 0917fe2fa..3c6ce753d 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/WellTestState.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include namespace Opm { diff --git a/opm/parser/eclipse/EclipseState/Schedule/WellTracerProperties.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp similarity index 100% rename from opm/parser/eclipse/EclipseState/Schedule/WellTracerProperties.hpp rename to opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp diff --git a/src/opm/output/eclipse/AggregateConnectionData.cpp b/src/opm/output/eclipse/AggregateConnectionData.cpp index e336b0ff4..b8d3480c1 100755 --- a/src/opm/output/eclipse/AggregateConnectionData.cpp +++ b/src/opm/output/eclipse/AggregateConnectionData.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include diff --git a/src/opm/output/eclipse/AggregateGroupData.cpp b/src/opm/output/eclipse/AggregateGroupData.cpp index 992de2ccc..33c53bdda 100644 --- a/src/opm/output/eclipse/AggregateGroupData.cpp +++ b/src/opm/output/eclipse/AggregateGroupData.cpp @@ -25,8 +25,8 @@ #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 6d3363331..ae56da77d 100644 --- a/src/opm/output/eclipse/AggregateMSWData.cpp +++ b/src/opm/output/eclipse/AggregateMSWData.cpp @@ -25,10 +25,9 @@ #include #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 9168f40f4..0dd719355 100644 --- a/src/opm/output/eclipse/AggregateWellData.cpp +++ b/src/opm/output/eclipse/AggregateWellData.cpp @@ -29,8 +29,7 @@ #include #include #include -#include - +#include #include #include diff --git a/src/opm/output/eclipse/EclipseIO.cpp b/src/opm/output/eclipse/EclipseIO.cpp index f89ee5f7b..30d886849 100644 --- a/src/opm/output/eclipse/EclipseIO.cpp +++ b/src/opm/output/eclipse/EclipseIO.cpp @@ -31,10 +31,10 @@ #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 07e5d35ae..820386c95 100644 --- a/src/opm/output/eclipse/LoadRestart.cpp +++ b/src/opm/output/eclipse/LoadRestart.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include #include @@ -54,6 +53,7 @@ #include #include +#include namespace VI = ::Opm::RestartIO::Helpers::VectorItems; class RestartFileView diff --git a/src/opm/output/eclipse/RegionCache.cpp b/src/opm/output/eclipse/RegionCache.cpp index 214a7b322..1ad897679 100644 --- a/src/opm/output/eclipse/RegionCache.cpp +++ b/src/opm/output/eclipse/RegionCache.cpp @@ -18,9 +18,9 @@ */ #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/opm/output/eclipse/RestartIO.cpp b/src/opm/output/eclipse/RestartIO.cpp index eb877883f..5454cba7e 100644 --- a/src/opm/output/eclipse/RestartIO.cpp +++ b/src/opm/output/eclipse/RestartIO.cpp @@ -37,7 +37,6 @@ #include #include #include -#include #include #include @@ -52,6 +51,7 @@ #include #include +#include namespace Opm { namespace RestartIO { namespace { diff --git a/src/opm/output/eclipse/Summary.cpp b/src/opm/output/eclipse/Summary.cpp index a335be839..36f81e1aa 100644 --- a/src/opm/output/eclipse/Summary.cpp +++ b/src/opm/output/eclipse/Summary.cpp @@ -26,6 +26,10 @@ #include #include +#include +#include +#include + #include #include @@ -36,8 +40,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -45,10 +49,6 @@ #include #include -#include -#include -#include - namespace { struct SegmentResultDescriptor { diff --git a/src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp b/src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp index 65e564d6a..1d2bd79e9 100644 --- a/src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp +++ b/src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include diff --git a/src/opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.cpp b/src/opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.cpp index 7dd3c0da7..19b432bcb 100644 --- a/src/opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.cpp +++ b/src/opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.cpp @@ -24,17 +24,21 @@ #include #include + +#include + #include #include #include #include + #include #include + #include #include #include -#include -#include +#include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp index d47214616..556a24c31 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp @@ -16,24 +16,23 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ +#include +#include +#include +#include -#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include +#include -#include -#include - -#include -#include -#include -#include namespace { namespace WellDims { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Group.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Group.cpp index 4efa9784c..ea0e41530 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Group.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Group.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #define INVALID_GROUP_RATE -999e100 #define INVALID_EFFICIENCY_FACTOR 0.0 diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp index dc2707353..2fce549bd 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp @@ -20,13 +20,15 @@ #include #include +#include + #include #include #include -#include + +#include #include #include -#include #include "Compsegs.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.hpp b/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.hpp index 0e05e58b3..abbef1f47 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.hpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.hpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include namespace Opm { @@ -51,8 +51,8 @@ namespace Opm { // we do not handle thermal length for the moment // double m_thermal_length; int segment_number; - std::size_t m_seqIndex; - + std::size_t m_seqIndex; + Compsegs(int i_in, int j_in, int k_in, int branch_number_in, double distance_start_in, double distance_end_in, WellCompletion::DirectionEnum dir_in, double center_depth_in, int segment_number_in, std::size_t seqIndex_in); diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/updatingConnectionsWithSegments.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/MSW/updatingConnectionsWithSegments.cpp index 5ad94cfe1..1953982ee 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/updatingConnectionsWithSegments.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/MSW/updatingConnectionsWithSegments.cpp @@ -19,6 +19,7 @@ #include #include + #include "Compsegs.hpp" diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp index 1eead5f35..c2391c00f 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp @@ -38,7 +38,6 @@ #include #include -#include #include #include #include @@ -53,12 +52,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/parser/eclipse/EclipseState/Schedule/Connection.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/Connection.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.cpp index bc02882a8..4105b6345 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Connection.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.cpp @@ -27,9 +27,9 @@ #include #include #include -#include #include -#include +#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/WList.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WList.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Schedule/WList.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Well/WList.cpp index d5fe99feb..85884368e 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/WList.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WList.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/WListManager.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.cpp similarity index 91% rename from src/opm/parser/eclipse/EclipseState/Schedule/WListManager.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.cpp index c28898d2f..d4fb76153 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/WListManager.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.cpp @@ -17,8 +17,8 @@ along with OPM. If not, see . */ -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/Well.cpp similarity index 99% rename from src/opm/parser/eclipse/EclipseState/Schedule/Well.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Well/Well.cpp index 2c1e692b7..b9063bc3a 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/Well.cpp @@ -22,13 +22,13 @@ #include #include -#include -#include #include #include #include #include -#include +#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/WellConnections.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.cpp similarity index 99% rename from src/opm/parser/eclipse/EclipseState/Schedule/WellConnections.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.cpp index 6e7127487..9af76c3b8 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/WellConnections.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.cpp @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/WellEconProductionLimits.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/WellEconProductionLimits.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp index 29c85be96..c98332ca1 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/WellEconProductionLimits.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp @@ -22,7 +22,8 @@ #include #include -#include + +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/WellInjectionProperties.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/WellInjectionProperties.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp index a04104f43..47ba1c2d8 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/WellInjectionProperties.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp @@ -16,14 +16,14 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#include -#include -#include - #include #include #include +#include +#include +#include + namespace Opm { WellInjectionProperties::WellInjectionProperties() diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/WellPolymerProperties.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Schedule/WellPolymerProperties.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp index e3e9f67a0..9e4ad3f3a 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/WellPolymerProperties.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/WellProductionProperties.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp similarity index 99% rename from src/opm/parser/eclipse/EclipseState/Schedule/WellProductionProperties.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp index 6d607dc88..04b438e4d 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/WellProductionProperties.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp @@ -23,9 +23,9 @@ #include #include -#include -#include #include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/WellTestConfig.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp similarity index 98% rename from src/opm/parser/eclipse/EclipseState/Schedule/WellTestConfig.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp index 651769b54..246d9da4f 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/WellTestConfig.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/WellTestState.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.cpp similarity index 97% rename from src/opm/parser/eclipse/EclipseState/Schedule/WellTestState.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.cpp index e461bbdfc..09c1897b2 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/WellTestState.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.cpp @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/WellTracerProperties.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp similarity index 95% rename from src/opm/parser/eclipse/EclipseState/Schedule/WellTracerProperties.cpp rename to src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp index a4fb5e92f..8e936481d 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/WellTracerProperties.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp b/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp index ec4f7f619..bdd4f40b3 100644 --- a/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp +++ b/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp @@ -16,31 +16,32 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ +#include +#include +#include +#include #include + #include #include #include #include #include -#include + #include +#include #include #include -#include -#include #include #include #include -#include +#include +#include +#include #include -#include - -#include -#include -#include namespace Opm { diff --git a/tests/parser/ConnectionTests.cpp b/tests/parser/ConnectionTests.cpp index 938590629..dfbfe3f87 100644 --- a/tests/parser/ConnectionTests.cpp +++ b/tests/parser/ConnectionTests.cpp @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/tests/parser/DynamicStateTests.cpp b/tests/parser/DynamicStateTests.cpp index d0cd4d1f4..83d11783a 100644 --- a/tests/parser/DynamicStateTests.cpp +++ b/tests/parser/DynamicStateTests.cpp @@ -27,7 +27,7 @@ #include -#include +#include #include #include diff --git a/tests/parser/DynamicVectorTests.cpp b/tests/parser/DynamicVectorTests.cpp index f36c908b9..922e9a39b 100644 --- a/tests/parser/DynamicVectorTests.cpp +++ b/tests/parser/DynamicVectorTests.cpp @@ -24,7 +24,7 @@ #include -#include +#include #include #include #include diff --git a/tests/parser/GroupTests.cpp b/tests/parser/GroupTests.cpp index 5eaa2766a..1ee1dbbb8 100644 --- a/tests/parser/GroupTests.cpp +++ b/tests/parser/GroupTests.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/parser/MultisegmentWellTests.cpp b/tests/parser/MultisegmentWellTests.cpp index 461f64086..9531bd62e 100644 --- a/tests/parser/MultisegmentWellTests.cpp +++ b/tests/parser/MultisegmentWellTests.cpp @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/tests/parser/ScheduleTests.cpp b/tests/parser/ScheduleTests.cpp index 72e72208b..cdc7d6910 100644 --- a/tests/parser/ScheduleTests.cpp +++ b/tests/parser/ScheduleTests.cpp @@ -33,9 +33,9 @@ #include #include #include -#include #include -#include +#include +#include #include #include diff --git a/tests/parser/WLIST.cpp b/tests/parser/WLIST.cpp index 80e784bcb..592abb11f 100644 --- a/tests/parser/WLIST.cpp +++ b/tests/parser/WLIST.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/tests/parser/WTEST.cpp b/tests/parser/WTEST.cpp index 0fcd3cd4f..80ce62398 100644 --- a/tests/parser/WTEST.cpp +++ b/tests/parser/WTEST.cpp @@ -24,14 +24,14 @@ #define BOOST_TEST_MODULE WTEST #include -#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 89eed1f60..b5213316d 100644 --- a/tests/parser/WellSolventTests.cpp +++ b/tests/parser/WellSolventTests.cpp @@ -1,18 +1,18 @@ /* Copyright 2015 IRIS - + This file is part of the Open Porous Media project (OPM). - + OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + OPM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with OPM. If not, see . */ @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/tests/parser/WellTests.cpp b/tests/parser/WellTests.cpp index d090b5517..37a413aef 100644 --- a/tests/parser/WellTests.cpp +++ b/tests/parser/WellTests.cpp @@ -32,13 +32,13 @@ #include #include -#include -#include #include #include -#include +#include +#include +#include +#include #include -#include #include #include diff --git a/tests/parser/WellTracerTests.cpp b/tests/parser/WellTracerTests.cpp index 98236d5c2..a2d11688f 100644 --- a/tests/parser/WellTracerTests.cpp +++ b/tests/parser/WellTracerTests.cpp @@ -1,18 +1,18 @@ /* Copyright 2018 NORCE - + This file is part of the Open Porous Media project (OPM). - + OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + OPM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with OPM. If not, see . */ @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/tests/parser/integration/ScheduleCreateFromDeck.cpp b/tests/parser/integration/ScheduleCreateFromDeck.cpp index b2258f97d..36ff5abb0 100644 --- a/tests/parser/integration/ScheduleCreateFromDeck.cpp +++ b/tests/parser/integration/ScheduleCreateFromDeck.cpp @@ -31,9 +31,9 @@ #include #include #include -#include #include -#include +#include +#include #include #include diff --git a/tests/test_RFT.cpp b/tests/test_RFT.cpp index 4070c9ab2..cef35ec31 100644 --- a/tests/test_RFT.cpp +++ b/tests/test_RFT.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/test_Restart.cpp b/tests/test_Restart.cpp index 8c3edaedb..c80fe06b2 100644 --- a/tests/test_Restart.cpp +++ b/tests/test_Restart.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/test_writenumwells.cpp b/tests/test_writenumwells.cpp index ab445b9fd..72f6aae30 100644 --- a/tests/test_writenumwells.cpp +++ b/tests/test_writenumwells.cpp @@ -25,11 +25,11 @@ #include #include -#include #include #include #include -#include +#include +#include #include #include