OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5056 from akva2/janitoring

Browse Source 
GasLiftXXX: clean up includes
This commit is contained in:
Bård Skaflestad 2023-12-11 16:57:21 +01:00 committed by GitHub
commit 922cd86d59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/simulators/wells/BlackoilWellModel.hpp
View File

@ -51,7 +51,6 @@
#include <opm/simulators/wells/GasLiftGroupInfo.hpp> #include <opm/simulators/wells/GasLiftGroupInfo.hpp>
#include <opm/simulators/wells/GasLiftSingleWell.hpp> #include <opm/simulators/wells/GasLiftSingleWell.hpp>
#include <opm/simulators/wells/GasLiftSingleWellGeneric.hpp> #include <opm/simulators/wells/GasLiftSingleWellGeneric.hpp>
#include <opm/simulators/wells/GasLiftStage2.hpp>
#include <opm/simulators/wells/GasLiftWellState.hpp> #include <opm/simulators/wells/GasLiftWellState.hpp>
#include <opm/simulators/wells/MultisegmentWell.hpp> #include <opm/simulators/wells/MultisegmentWell.hpp>
#include <opm/simulators/wells/ParallelWBPCalculation.hpp> #include <opm/simulators/wells/ParallelWBPCalculation.hpp>

4
opm/simulators/wells/GasLiftCommon.cpp
View File

@ -20,6 +20,10 @@
#include <config.h> #include <config.h>
#include <opm/simulators/wells/GasLiftCommon.hpp> #include <opm/simulators/wells/GasLiftCommon.hpp>
#include <opm/simulators/utils/DeferredLogger.hpp>
#include <opm/simulators/wells/WellState.hpp>
#include <fmt/format.h> #include <fmt/format.h>
namespace Opm { namespace Opm {

9
opm/simulators/wells/GasLiftCommon.hpp
View File

@ -20,14 +20,17 @@
#ifndef OPM_GASLIFT_COMMON_HEADER_INCLUDED #ifndef OPM_GASLIFT_COMMON_HEADER_INCLUDED
#define OPM_GASLIFT_COMMON_HEADER_INCLUDED #define OPM_GASLIFT_COMMON_HEADER_INCLUDED
#include <opm/simulators/utils/DeferredLogger.hpp> #include <opm/simulators/utils/ParallelCommunication.hpp>
#include <opm/simulators/wells/WellState.hpp>
#include <opm/simulators/wells/GroupState.hpp>
#include <string> #include <string>
namespace Opm namespace Opm
{ {
class DeferredLogger;
class GroupState;
class WellState;
class GasLiftCommon class GasLiftCommon
{ {
public: public:

7
opm/simulators/wells/GasLiftGroupInfo.cpp
View File

@ -21,8 +21,15 @@
#include <opm/simulators/wells/GasLiftGroupInfo.hpp> #include <opm/simulators/wells/GasLiftGroupInfo.hpp>
#include <opm/input/eclipse/Schedule/GasLiftOpt.hpp> #include <opm/input/eclipse/Schedule/GasLiftOpt.hpp>
#include <opm/input/eclipse/Schedule/Schedule.hpp>
#include <opm/input/eclipse/Schedule/Well/Well.hpp> #include <opm/input/eclipse/Schedule/Well/Well.hpp>
#include <opm/simulators/wells/WellState.hpp>
#include <fmt/format.h>
#include <stdexcept>
namespace Opm { namespace Opm {
GasLiftGroupInfo:: GasLiftGroupInfo::

19
opm/simulators/wells/GasLiftGroupInfo.hpp
View File

@ -20,31 +20,26 @@
#ifndef OPM_GASLIFT_GROUP_INFO_HEADER_INCLUDED #ifndef OPM_GASLIFT_GROUP_INFO_HEADER_INCLUDED
#define OPM_GASLIFT_GROUP_INFO_HEADER_INCLUDED #define OPM_GASLIFT_GROUP_INFO_HEADER_INCLUDED
#include <dune/common/version.hh>
#include <dune/common/parallel/mpihelper.hh>
#include <opm/core/props/BlackoilPhases.hpp> #include <opm/core/props/BlackoilPhases.hpp>
#include <opm/models/utils/propertysystem.hh>
#include <opm/models/utils/parametersystem.hh>
#include <opm/input/eclipse/Schedule/Schedule.hpp>
#include <opm/input/eclipse/Schedule/Group/Group.hpp>
#include <opm/simulators/wells/GasLiftCommon.hpp> #include <opm/simulators/wells/GasLiftCommon.hpp>
#include <opm/simulators/wells/WellState.hpp>
#include <opm/simulators/wells/GroupState.hpp>
#include <opm/simulators/utils/DeferredLogger.hpp>
#include <algorithm>
#include <map> #include <map>
#include <optional>
#include <string> #include <string>
#include <tuple>
#include <vector> #include <vector>
#include <fmt/format.h>
namespace Opm namespace Opm
{ {
class DeferredLogger;
class GasLiftOpt; class GasLiftOpt;
class Group;
class GroupState;
class Schedule;
class SummaryState; class SummaryState;
class Well; class Well;
class WellState;
class GasLiftGroupInfo : public GasLiftCommon class GasLiftGroupInfo : public GasLiftCommon
{ {

8
opm/simulators/wells/GasLiftSingleWellGeneric.hpp
View File

@ -20,21 +20,17 @@
#ifndef OPM_GASLIFT_SINGLE_WELL_GENERIC_HEADER_INCLUDED #ifndef OPM_GASLIFT_SINGLE_WELL_GENERIC_HEADER_INCLUDED
#define OPM_GASLIFT_SINGLE_WELL_GENERIC_HEADER_INCLUDED #define OPM_GASLIFT_SINGLE_WELL_GENERIC_HEADER_INCLUDED
#include <dune/common/version.hh>
#include <dune/common/parallel/mpihelper.hh>
#include <opm/core/props/BlackoilPhases.hpp> #include <opm/core/props/BlackoilPhases.hpp>
#include <opm/input/eclipse/Schedule/Well/WellProductionControls.hpp> #include <opm/input/eclipse/Schedule/Well/WellProductionControls.hpp>
#include <opm/simulators/wells/GasLiftGroupInfo.hpp> #include <opm/simulators/wells/GasLiftGroupInfo.hpp>
#include <opm/simulators/wells/GasLiftCommon.hpp> #include <opm/simulators/wells/GasLiftCommon.hpp>
#include <opm/simulators/wells/GroupState.hpp>
#include <functional>
#include <optional> #include <optional>
#include <set>
#include <stdexcept>
#include <string> #include <string>
#include <tuple> #include <tuple>
#include <vector>
#include <utility> #include <utility>
namespace Opm namespace Opm

2
opm/simulators/wells/GasLiftStage2.cpp
View File

@ -26,13 +26,13 @@
#include <opm/simulators/utils/DeferredLogger.hpp> #include <opm/simulators/utils/DeferredLogger.hpp>
#include <opm/simulators/wells/GasLiftSingleWellGeneric.hpp> #include <opm/simulators/wells/GasLiftSingleWellGeneric.hpp>
#include <opm/simulators/wells/GasLiftWellState.hpp> #include <opm/simulators/wells/GasLiftWellState.hpp>
#include <opm/simulators/wells/GroupState.hpp>
#include <opm/simulators/wells/WellInterfaceGeneric.hpp> #include <opm/simulators/wells/WellInterfaceGeneric.hpp>
#include <opm/simulators/wells/WellState.hpp> #include <opm/simulators/wells/WellState.hpp>
#include <opm/simulators/wells/GasLiftGroupInfo.hpp> #include <opm/simulators/wells/GasLiftGroupInfo.hpp>
#include <fmt/format.h> #include <fmt/format.h>
#include <cmath>
#include <cstddef> #include <cstddef>
#include <optional> #include <optional>
#include <string> #include <string>

6
opm/simulators/wells/GasLiftStage2.hpp
View File

@ -22,12 +22,7 @@
#include <opm/core/props/BlackoilPhases.hpp> #include <opm/core/props/BlackoilPhases.hpp>
#include <opm/simulators/wells/GasLiftSingleWellGeneric.hpp> #include <opm/simulators/wells/GasLiftSingleWellGeneric.hpp>
#include <opm/simulators/wells/GroupState.hpp>
#include <dune/common/version.hh>
#include <dune/common/parallel/mpihelper.hh>
#include <iterator>
#include <map> #include <map>
#include <memory> #include <memory>
#include <optional> #include <optional>
@ -42,6 +37,7 @@ class DeferredLogger;
class GasLiftOpt; class GasLiftOpt;
class GasLiftWellState; class GasLiftWellState;
class Group; class Group;
class GroupState;
class Schedule; class Schedule;
class WellInterfaceGeneric; class WellInterfaceGeneric;
class WellState; class WellState;