Merge pull request #4768 from akva2/ebos_header_cleanups

ebos/: header cleanups
2025-02-25 18:55:30 -06:00 · 2023-08-07 11:20:01 +02:00 · 2023-08-07 11:20:01 +02:00 · 61a3908f38
commit 61a3908f38
parent e20bb85aa7 f1b4a2cec6
23 changed files with 208 additions and 161 deletions
--- a/ebos/alucartesianindexmapper.hh
+++ b/ebos/alucartesianindexmapper.hh
@ -28,19 +28,17 @@
 #ifndef EWOMS_ALU_CARTESIAN_INDEX_MAPPER_HH
 #define EWOMS_ALU_CARTESIAN_INDEX_MAPPER_HH

-#include <dune/grid/common/datahandleif.hh>
-#include <dune/grid/utility/persistentcontainer.hh>
-#if HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #include <dune/alugrid/3d/gridview.hh>
-#endif // HAVE_DUNE_ALUGRID
 #include <opm/grid/common/CartesianIndexMapper.hpp>
+#include <dune/grid/common/datahandleif.hh>
+#include <dune/grid/utility/persistentcontainer.hh>

 #include <array>
-#include <memory>
-#include <exception>
-#include <vector>
 #include <cassert>
+#include <memory>
+#include <stdexcept>
+#include <vector>

 namespace Dune {

--- a/ebos/collecttoiorank.hh
+++ b/ebos/collecttoiorank.hh
@ -23,17 +23,17 @@
 #ifndef EWOMS_COLLECT_TO_IO_RANK_HH
 #define EWOMS_COLLECT_TO_IO_RANK_HH

-#include <opm/output/data/Aquifer.hpp>
-#include <opm/output/data/Cells.hpp>
-#include <opm/output/data/Groups.hpp>
-#include <opm/output/data/Solution.hpp>
-#include <opm/output/data/Wells.hpp>
+#include <ebos/eclinterregflows.hh>

 #include <opm/input/eclipse/Schedule/Well/WellTestState.hpp>

 #include <opm/grid/common/p2pcommunicator.hh>

-#include <ebos/eclinterregflows.hh>
+#include <opm/output/data/Aquifer.hpp>
+#include <opm/output/data/Cells.hpp>
+#include <opm/output/data/Groups.hpp>
+#include <opm/output/data/Solution.hpp>
+#include <opm/output/data/Wells.hpp>

 #include <array>
 #include <map>
--- a/ebos/ebos.hh
+++ b/ebos/ebos.hh
@ -28,14 +28,14 @@
 #ifndef EBOS_HH
 #define EBOS_HH

-#include "eclproblem.hh"
-
-#include <opm/simulators/wells/BlackoilWellModel.hpp>
-#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
-#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
+#include <ebos/eclproblem.hh>

 #include <opm/models/utils/start.hh>

+#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
+#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
+#include <opm/simulators/wells/BlackoilWellModel.hpp>
+
 namespace Opm {
 template <class TypeTag>
 class EbosProblem;
--- a/ebos/eclalugridvanguard.hh
+++ b/ebos/eclalugridvanguard.hh
@ -27,19 +27,27 @@
 #ifndef EWOMS_ECL_ALU_GRID_VANGUARD_HH
 #define EWOMS_ECL_ALU_GRID_VANGUARD_HH

-#include "eclbasevanguard.hh"
-#include "ecltransmissibility.hh"
-#include "alucartesianindexmapper.hh"
-#include <opm/models/common/multiphasebaseproperties.hh>
+#include <dune/alugrid/common/fromtogridfactory.hh>
+#include <dune/alugrid/dgf.hh>
+#include <dune/alugrid/grid.hh>
+
+#include <ebos/alucartesianindexmapper.hh>
+#include <ebos/eclbasevanguard.hh>
+#include <ebos/ecltransmissibility.hh>

 #include <opm/common/OpmLog/OpmLog.hpp>

-#include <dune/alugrid/grid.hh>
-#include <dune/alugrid/common/fromtogridfactory.hh>
-#include <dune/alugrid/dgf.hh>
 #include <opm/grid/CpGrid.hpp>
+
+#include <opm/models/common/multiphasebaseproperties.hh>
+
 #include <opm/simulators/utils/ParallelEclipseState.hpp>

+#include <array>
+#include <memory>
+#include <tuple>
+#include <vector>
+
 namespace Opm {
 template <class TypeTag>
 class EclAluGridVanguard;
@ -104,7 +112,7 @@ public:

    static constexpr int dimension = Grid::dimension;
    static constexpr int dimensionworld = Grid::dimensionworld;
-public:
+
    EclAluGridVanguard(Simulator& simulator)
        : EclBaseVanguard<TypeTag>(simulator)
    { 
--- a/ebos/eclbasevanguard.hh
+++ b/ebos/eclbasevanguard.hh
@ -27,21 +27,24 @@
 #ifndef EWOMS_ECL_BASE_VANGUARD_HH
 #define EWOMS_ECL_BASE_VANGUARD_HH

-#include <opm/models/io/basevanguard.hh>
-#include <opm/models/utils/propertysystem.hh>
-#include <opm/models/utils/parametersystem.hh>
-#include <opm/models/discretization/common/fvbaseproperties.hh>
 #include <ebos/eclgenericvanguard.hh>

 #include <opm/grid/common/GridEnums.hpp>
 #include <opm/grid/common/CartesianIndexMapper.hpp>
+
 #include <opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp>
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
+
+#include <opm/models/discretization/common/fvbaseproperties.hh>
+#include <opm/models/io/basevanguard.hh>
+#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/propertysystem.hh>
+
 #include <opm/simulators/flow/BlackoilModelParametersEbos.hpp>

 #include <array>
 #include <optional>
-#include <unordered_set>
+#include <unordered_map>
 #include <vector>

 namespace Opm {
--- a/ebos/eclcpgridvanguard.hh
+++ b/ebos/eclcpgridvanguard.hh
@ -27,14 +27,20 @@
 #ifndef EWOMS_ECL_CP_GRID_VANGUARD_HH
 #define EWOMS_ECL_CP_GRID_VANGUARD_HH

+#include <ebos/eclbasevanguard.hh>
+#include <ebos/eclgenericcpgridvanguard.hh>
+#include <ebos/ecltransmissibility.hh>
+#include <ebos/femcpgridcompat.hh>
+
 #include <opm/common/TimingMacros.hpp>

 #include <opm/models/common/multiphasebaseproperties.hh>

-#include "eclbasevanguard.hh"
-#include "ecltransmissibility.hh"
-#include "femcpgridcompat.hh"
-#include "eclgenericcpgridvanguard.hh"
+#include <array>
+#include <functional>
+#include <memory>
+#include <tuple>
+#include <vector>

 namespace Opm {
 template <class TypeTag>
--- a/ebos/ecldummygradientcalculator.hh
+++ b/ebos/ecldummygradientcalculator.hh
@ -28,9 +28,11 @@
 #ifndef EWOMS_ECL_DUMMY_GRADIENT_CALCULATOR_HH
 #define EWOMS_ECL_DUMMY_GRADIENT_CALCULATOR_HH

+#include <dune/common/fvector.hh>
+
 #include <opm/models/discretization/common/fvbaseproperties.hh>

-#include <dune/common/fvector.hh>
+#include <stdexcept>

 namespace Opm {
 /*!
--- a/ebos/eclequilinitializer.hh
+++ b/ebos/eclequilinitializer.hh
@ -28,13 +28,16 @@
 #ifndef EWOMS_ECL_EQUIL_INITIALIZER_HH
 #define EWOMS_ECL_EQUIL_INITIALIZER_HH

-#include "equil/initstateequil.hh"
+#include <ebos/equil/initstateequil.hh>

-#include <opm/models/utils/propertysystem.hh>
-#include <opm/models/blackoil/blackoilproperties.hh>
+#include <opm/grid/common/CartesianIndexMapper.hpp>

-#include <opm/material/fluidstates/BlackOilFluidState.hpp>
 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
+#include <opm/material/fluidstates/BlackOilFluidState.hpp>
+
+#include <opm/models/blackoil/blackoilproperties.hh>
+#include <opm/models/discretization/common/fvbaseproperties.hh>
+#include <opm/models/utils/propertysystem.hh>

 #include <vector>

--- a/ebos/eclfluxmodule.hh
+++ b/ebos/eclfluxmodule.hh
@ -31,18 +31,20 @@
 #ifndef EWOMS_ECL_FLUX_MODULE_HH
 #define EWOMS_ECL_FLUX_MODULE_HH

+#include <dune/common/fvector.hh>
+#include <dune/common/fmatrix.hh>
+
+#include <opm/common/OpmLog/OpmLog.hpp>
+
+#include <opm/input/eclipse/EclipseState/Grid/FaceDir.hpp>
+
+#include <opm/material/common/MathToolbox.hpp>
+#include <opm/material/common/Valgrind.hpp>
+
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/utils/signum.hh>

-#include <opm/material/common/Valgrind.hpp>
-#include <opm/common/OpmLog/OpmLog.hpp>
-#include <opm/input/eclipse/EclipseState/Grid/FaceDir.hpp>
-
-#include <dune/common/fvector.hh>
-#include <dune/common/fmatrix.hh>
-#include <fmt/format.h>
-
 #include <array>

 namespace Opm {
--- a/ebos/eclgenericcpgridvanguard.hh
+++ b/ebos/eclgenericcpgridvanguard.hh
@ -28,9 +28,11 @@
 #define EWOMS_ECL_CP_GRID_GENERIC_VANGUARD_HH

 #include <ebos/eclgenericvanguard.hh>
+
 #include <opm/grid/CpGrid.hpp>

 #include <functional>
+#include <memory>
 #include <optional>
 #include <vector>

--- a/ebos/eclgenericoutputblackoilmodule.hh
+++ b/ebos/eclgenericoutputblackoilmodule.hh
@ -23,20 +23,22 @@
 #ifndef EWOMS_ECL_GENERIC_OUTPUT_BLACK_OIL_MODULE_HH
 #define EWOMS_ECL_GENERIC_OUTPUT_BLACK_OIL_MODULE_HH

-#include <array>
-#include <functional>
-#include <map>
-#include <numeric>
-#include <optional>
-#include <stdexcept>
-#include <utility>
+#include <ebos/eclinterregflows.hh>

 #include <opm/output/data/Wells.hpp>
 #include <opm/output/eclipse/Inplace.hpp>

 #include <opm/simulators/utils/ParallelCommunication.hpp>

-#include <ebos/eclinterregflows.hh>
+#include <array>
+#include <functional>
+#include <map>
+#include <numeric>
+#include <optional>
+#include <stdexcept>
+#include <unordered_map>
+#include <utility>
+#include <vector>

 namespace Opm {

--- a/ebos/eclgenerictracermodel.hh
+++ b/ebos/eclgenerictracermodel.hh
@ -28,17 +28,18 @@
 #ifndef EWOMS_ECL_GENERIC_TRACER_MODEL_HH
 #define EWOMS_ECL_GENERIC_TRACER_MODEL_HH

+#include <dune/istl/bcrsmatrix.hh>
+
 #include <opm/grid/common/CartesianIndexMapper.hpp>
-#include <opm/common/ErrorMacros.hpp>
+
 #include <opm/models/blackoil/blackoilmodel.hh>

 #include <opm/simulators/linalg/matrixblock.hh>

-#include <dune/istl/bcrsmatrix.hh>
-
 #include <array>
 #include <functional>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>

--- a/ebos/eclgenerictracermodel_impl.hh
+++ b/ebos/eclgenerictracermodel_impl.hh
@ -28,28 +28,31 @@
 #ifndef EWOMS_ECL_GENERIC_TRACER_MODEL_IMPL_HH
 #define EWOMS_ECL_GENERIC_TRACER_MODEL_IMPL_HH

-#include <ebos/eclgenerictracermodel.hh>
-
-#include <opm/simulators/linalg/ilufirstelement.hh>
-#include <opm/simulators/linalg/PropertyTree.hpp>
-#include <opm/simulators/linalg/FlexibleSolver.hpp>
-#include <opm/common/OpmLog/OpmLog.hpp>
-#include <opm/grid/CpGrid.hpp>
-#include <opm/grid/polyhedralgrid.hh>
-#include <opm/models/discretization/ecfv/ecfvstencil.hh>
-#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/input/eclipse/EclipseState/Phase.hpp>
-#include <opm/input/eclipse/EclipseState/Tables/TracerVdTable.hpp>
-
-#include <opm/input/eclipse/Schedule/Well/Well.hpp>
-#include <opm/input/eclipse/Schedule/Well/WellTracerProperties.hpp>
-
 #include <dune/istl/operators.hh>
 #include <dune/istl/solvers.hh>
 #include <dune/istl/schwarz.hh>
 #include <dune/istl/preconditioners.hh>
 #include <dune/istl/schwarz.hh>

+#include <ebos/eclgenerictracermodel.hh>
+
+#include <opm/common/OpmLog/OpmLog.hpp>
+
+#include <opm/grid/CpGrid.hpp>
+#include <opm/grid/polyhedralgrid.hh>
+
+#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/input/eclipse/EclipseState/Phase.hpp>
+#include <opm/input/eclipse/EclipseState/Tables/TracerVdTable.hpp>
+#include <opm/input/eclipse/Schedule/Well/Well.hpp>
+#include <opm/input/eclipse/Schedule/Well/WellTracerProperties.hpp>
+
+#include <opm/models/discretization/ecfv/ecfvstencil.hh>
+
+#include <opm/simulators/linalg/ilufirstelement.hh>
+#include <opm/simulators/linalg/PropertyTree.hpp>
+#include <opm/simulators/linalg/FlexibleSolver.hpp>
+
 #if HAVE_DUNE_FEM
 #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
 #include <dune/fem/gridpart/common/gridpart2gridview.hh>
@ -63,11 +66,13 @@
 #endif // HAVE_DUNE_ALUGRID

 #include <fmt/format.h>
+
+#include <array>
+#include <functional>
 #include <iostream>
+#include <memory>
 #include <set>
 #include <stdexcept>
-#include <functional>
-#include <array>
 #include <string>

 namespace Opm {
--- a/ebos/eclgenericvanguard.hh
+++ b/ebos/eclgenericvanguard.hh
@ -27,14 +27,14 @@
 #ifndef EWOMS_ECL_GENERIC_VANGUARD_HH
 #define EWOMS_ECL_GENERIC_VANGUARD_HH

+#include <dune/common/parallel/communication.hh>
+
 #include <opm/grid/common/GridEnums.hpp>

 #include <opm/input/eclipse/Schedule/Well/WellTestState.hpp>

 #include <opm/simulators/utils/ParallelCommunication.hpp>

-#include <dune/common/parallel/communication.hh>
-
 #include <array>
 #include <cassert>
 #include <memory>
@ -46,7 +46,6 @@
 #include <utility>
 #include <vector>

-
 namespace Opm {

 namespace Action { class State; }
--- a/ebos/eclgenericwriter.hh
+++ b/ebos/eclgenericwriter.hh
@ -28,13 +28,16 @@
 #ifndef EWOMS_ECL_GENERIC_WRITER_HH
 #define EWOMS_ECL_GENERIC_WRITER_HH

-#include "collecttoiorank.hh"
+#include <ebos/collecttoiorank.hh>
 #include <ebos/ecltransmissibility.hh>
+
 #include <opm/models/parallel/tasklets.hh>
+
 #include <opm/simulators/timestepping/SimulatorReport.hpp>

 #include <cstddef>
 #include <map>
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>
--- a/ebos/ecloutputblackoilmodule.hh
+++ b/ebos/ecloutputblackoilmodule.hh
@ -27,6 +27,10 @@
 #ifndef EWOMS_ECL_OUTPUT_BLACK_OIL_MODULE_HH
 #define EWOMS_ECL_OUTPUT_BLACK_OIL_MODULE_HH

+#include <dune/common/fvector.hh>
+
+#include <ebos/eclgenericoutputblackoilmodule.hh>
+
 #include <opm/common/Exceptions.hpp>
 #include <opm/common/TimingMacros.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
@ -45,10 +49,6 @@
 #include <opm/output/eclipse/EclipseIO.hpp>
 #include <opm/output/eclipse/Inplace.hpp>

-#include <ebos/eclgenericoutputblackoilmodule.hh>
-
-#include <dune/common/fvector.hh>
-
 #include <algorithm>
 #include <array>
 #include <cstddef>
--- a/ebos/eclpolyhedralgridvanguard.hh
+++ b/ebos/eclpolyhedralgridvanguard.hh
@ -27,13 +27,19 @@
 #ifndef EWOMS_ECL_POLYHEDRAL_GRID_VANGUARD_HH
 #define EWOMS_ECL_POLYHEDRAL_GRID_VANGUARD_HH

-#include <opm/models/common/multiphasebaseproperties.hh>
-
-#include "eclbasevanguard.hh"
-#include "ecltransmissibility.hh"
+#include <ebos/eclbasevanguard.hh>
+#include <ebos/ecltransmissibility.hh>

 #include <opm/grid/polyhedralgrid.hh>

+#include <opm/models/common/multiphasebaseproperties.hh>
+
+#include <array>
+#include <functional>
+#include <string>
+#include <tuple>
+#include <unordered_set>
+
 namespace Opm {
 template <class TypeTag>
 class EclPolyhedralGridVanguard;
@ -86,7 +92,6 @@ public:
    using Grid = GetPropType<TypeTag, Properties::Grid>;
    using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>;
    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    using TransmissibilityType = EclTransmissibility<Grid, GridView, ElementMapper, Scalar>;

 private:
    using GridPointer = Grid*;
@ -95,6 +100,9 @@ private:
    using CartesianIndexMapperPointer = std::unique_ptr<CartesianIndexMapper>;

 public:
+    using TransmissibilityType = EclTransmissibility<Grid, GridView, ElementMapper,
+                                                     CartesianIndexMapper, Scalar>;
+
    EclPolyhedralGridVanguard(Simulator& simulator)
        : EclBaseVanguard<TypeTag>(simulator),
          simulator_( simulator )
@ -190,7 +198,7 @@ public:
     * It is a function return the centroid for the given element
     * index.
     */
-    std::function<std::array<double,dimensionworld>(int)>
+    std::function<std::array<double,EclBaseVanguard<TypeTag>::dimensionworld>(int)>
    cellCentroids() const
    {
        return this->cellCentroids_(this->cartesianIndexMapper());
--- a/ebos/eclproblem.hh
+++ b/ebos/eclproblem.hh
@ -28,45 +28,37 @@
 #ifndef EWOMS_ECL_PROBLEM_HH
 #define EWOMS_ECL_PROBLEM_HH

-#if USE_ALUGRID
-#define DISABLE_ALUGRID_SFC_ORDERING 1
-#include "eclalugridvanguard.hh"
-#elif USE_POLYHEDRALGRID
-#include "eclpolyhedralgridvanguard.hh"
-#else
-#include "eclcpgridvanguard.hh"
-#endif
+#include <dune/common/version.hh>
+#include <dune/common/fvector.hh>
+#include <dune/common/fmatrix.hh>

-#include "eclactionhandler.hh"
-#include "eclequilinitializer.hh"
-#include "eclwriter.hh"
-#include "ecloutputblackoilmodule.hh"
-#include "ecltransmissibility.hh"
-#include "eclthresholdpressure.hh"
-#include "ecldummygradientcalculator.hh"
-#include "eclfluxmodule.hh"
-#include "eclbaseaquifermodel.hh"
-#include "eclnewtonmethod.hh"
-#include "ecltracermodel.hh"
-#include "vtkecltracermodule.hh"
-#include "eclgenericproblem.hh"
-#include "FIBlackOilModel.hpp"
+#include <ebos/eclactionhandler.hh>
+#include <ebos/eclbaseaquifermodel.hh>
+#include <ebos/ecldummygradientcalculator.hh>
+#include <ebos/eclequilinitializer.hh>
+#include <ebos/eclfluxmodule.hh>
+#include <ebos/eclgenericproblem.hh>
+#include <ebos/eclnewtonmethod.hh>
+#include <ebos/ecloutputblackoilmodule.hh>
+#include <ebos/eclthresholdpressure.hh>
+#include <ebos/ecltransmissibility.hh>
+#include <ebos/eclwriter.hh>
+#include <ebos/ecltracermodel.hh>
+#include <ebos/FIBlackOilModel.hpp>
+#include <ebos/vtkecltracermodule.hh>
+
+#include <opm/common/utility/TimeService.hpp>

 #include <opm/core/props/satfunc/RelpermDiagnostics.hpp>

-#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
-#include <opm/simulators/utils/ParallelSerialization.hpp>
-#include <opm/simulators/timestepping/SimulatorReport.hpp>
+#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/input/eclipse/Parser/ParserKeywords/E.hpp>
+#include <opm/input/eclipse/Schedule/Schedule.hpp>

-#include <opm/models/common/directionalmobility.hh>
-#include <opm/models/utils/pffgridvector.hh>
-#include <opm/models/blackoil/blackoilmodel.hh>
-#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
-
-#include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
-#include <opm/material/thermal/EclThermalLawManager.hpp>
+#include <opm/material/common/ConditionalStorage.hpp>
+#include <opm/material/common/Valgrind.hpp>
 #include <opm/material/densead/Evaluation.hpp>
-
+#include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
 #include <opm/material/fluidstates/CompositionalFluidState.hpp>
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 #include <opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp>
@ -75,29 +67,37 @@
 #include <opm/material/fluidsystems/blackoilpvt/DeadOilPvt.hpp>
 #include <opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp>
 #include <opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp>
+#include <opm/material/thermal/EclThermalLawManager.hpp>

-#include <opm/material/common/Valgrind.hpp>
-#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/input/eclipse/Schedule/Schedule.hpp>
-#include <opm/common/utility/TimeService.hpp>
-#include <opm/utility/CopyablePtr.hpp>
-#include <opm/material/common/ConditionalStorage.hpp>
-
-#include <dune/common/version.hh>
-#include <dune/common/fvector.hh>
-#include <dune/common/fmatrix.hh>
+#include <opm/models/common/directionalmobility.hh>
+#include <opm/models/utils/pffgridvector.hh>
+#include <opm/models/blackoil/blackoilmodel.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>

 #include <opm/output/eclipse/EclipseIO.hpp>

+#include <opm/simulators/timestepping/SimulatorReport.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/utils/ParallelSerialization.hpp>
+
+#include <opm/utility/CopyablePtr.hpp>
+
 #include <opm/common/OpmLog/OpmLog.hpp>

-#include <opm/input/eclipse/Parser/ParserKeywords/E.hpp>
+#if USE_ALUGRID
+#define DISABLE_ALUGRID_SFC_ORDERING 1
+#include <ebos/eclalugridvanguard.hh>
+#elif USE_POLYHEDRALGRID
+#include <ebos/eclpolyhedralgridvanguard.hh>
+#else
+#include <ebos/eclcpgridvanguard.hh>
+#endif

-#include <set>
-#include <vector>
-#include <string>
 #include <algorithm>
 #include <functional>
+#include <set>
+#include <string>
+#include <vector>

 namespace Opm {
 template <class TypeTag>
--- a/ebos/eclthresholdpressure.hh
+++ b/ebos/eclthresholdpressure.hh
@ -28,14 +28,15 @@
 #ifndef EWOMS_ECL_THRESHOLD_PRESSURE_HH
 #define EWOMS_ECL_THRESHOLD_PRESSURE_HH

-#include <opm/models/utils/propertysystem.hh>
-#include <opm/models/discretization/common/fvbaseproperties.hh>
-#include <opm/models/common/multiphasebaseproperties.hh>
 #include <ebos/eclgenericthresholdpressure.hh>

 #include <opm/material/densead/Evaluation.hpp>
 #include <opm/material/densead/Math.hpp>

+#include <opm/models/common/multiphasebaseproperties.hh>
+#include <opm/models/discretization/common/fvbaseproperties.hh>
+#include <opm/models/utils/propertysystem.hh>
+
 #include <algorithm>
 #include <vector>

--- a/ebos/ecltracermodel.hh
+++ b/ebos/ecltracermodel.hh
@ -31,8 +31,13 @@
 #include <ebos/eclgenerictracermodel.hh>

 #include <opm/models/utils/propertysystem.hh>
+
 #include <opm/simulators/utils/VectorVectorDataHandle.hpp>

+#include <array>
+#include <iostream>
+#include <memory>
+#include <stdexcept>
 #include <string>
 #include <vector>

--- a/ebos/ecltransmissibility.hh
+++ b/ebos/ecltransmissibility.hh
@ -28,18 +28,18 @@
 #ifndef EWOMS_ECL_TRANSMISSIBILITY_HH
 #define EWOMS_ECL_TRANSMISSIBILITY_HH

-#include <opm/grid/common/CartesianIndexMapper.hpp>
-
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>

+#include <opm/grid/common/CartesianIndexMapper.hpp>
+
 #include <array>
-#include <map>
-#include <tuple>
-#include <vector>
-#include <unordered_map>
 #include <functional>
+#include <map>
 #include <cstdint>
+#include <tuple>
+#include <unordered_map>
+#include <vector>

 namespace Opm {

--- a/ebos/eclwriter.hh
+++ b/ebos/eclwriter.hh
@ -28,18 +28,19 @@
 #ifndef EWOMS_ECL_WRITER_HH
 #define EWOMS_ECL_WRITER_HH

+#include <dune/grid/common/partitionset.hh>
+
 #include <ebos/collecttoiorank.hh>
+#include <ebos/eclbasevanguard.hh>
 #include <ebos/eclgenericwriter.hh>
 #include <ebos/ecloutputblackoilmodule.hh>

-#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
-#include <opm/simulators/utils/ParallelRestart.hpp>
-
 #include <opm/input/eclipse/Units/UnitSystem.hpp>

 #include <opm/output/eclipse/RestartValue.hpp>

-#include <dune/grid/common/partitionset.hh>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/utils/ParallelRestart.hpp>

 #include <limits>
 #include <stdexcept>
--- a/ebos/vtkecltracermodule.hh
+++ b/ebos/vtkecltracermodule.hh
@ -27,18 +27,16 @@
 #ifndef EWOMS_VTK_ECL_TRACER_MODULE_HH
 #define EWOMS_VTK_ECL_TRACER_MODULE_HH

-
-#include <opm/models/io/vtkmultiwriter.hh>
-#include <opm/models/io/baseoutputmodule.hh>
-
-#include <opm/models/utils/propertysystem.hh>
-#include <opm/models/utils/parametersystem.hh>
-#include <opm/models/blackoil/blackoilproperties.hh>
-
-
 #include <dune/common/fvector.hh>

-#include <cstdio>
+#include <opm/models/blackoil/blackoilproperties.hh>
+#include <opm/models/io/baseoutputmodule.hh>
+#include <opm/models/io/vtkmultiwriter.hh>
+#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/propertysystem.hh>
+
+#include <string>
+#include <vector>

 namespace Opm::Properties {