From c9b3de16f10ddf8802b528956b3a33c7f4143c55 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 5 Feb 2024 19:22:15 +0100 Subject: [PATCH] move ebos/femcpgridcompat.hh to opm/simulators/flow --- CMakeLists_files.cmake | 2 +- ebos/eclcpgridvanguard.hh | 3 ++- ebos/eclgenericcpgridvanguard.cc | 2 +- ebos/eclgenericproblem.cc | 2 +- ebos/eclgenericthresholdpressure.cc | 2 +- ebos/eclgenerictracermodel.cc | 2 +- ebos/eclgenericwriter.cc | 2 +- ebos/ecltransmissibility.cc | 2 +- ebos/equil/initstateequil.cc | 2 +- opm/simulators/flow/CollectDataOnIORank.cpp | 2 +- .../simulators/flow/FemCpGridCompat.hpp | 8 ++++---- opm/simulators/utils/GridDataOutput.cpp | 2 +- tests/test_RestartSerialization.cpp | 2 +- 13 files changed, 17 insertions(+), 16 deletions(-) rename ebos/femcpgridcompat.hh => opm/simulators/flow/FemCpGridCompat.hpp (92%) diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index a19276af6..072acaa91 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -435,7 +435,6 @@ list (APPEND PUBLIC_HEADER_FILES ebos/ecltransmissibility.hh ebos/ecltransmissibility_impl.hh ebos/eclwriter.hh - ebos/femcpgridcompat.hh ebos/vtkecltracermodule.hh opm/simulators/flow/ActionHandler.hpp opm/simulators/flow/AluGridCartesianIndexMapper.hpp @@ -451,6 +450,7 @@ list (APPEND PUBLIC_HEADER_FILES opm/simulators/flow/countGlobalCells.hpp opm/simulators/flow/DummyGradientCalculator.hpp opm/simulators/flow/ExtraConvergenceOutputThread.hpp + opm/simulators/flow/FemCpGridCompat.hpp opm/simulators/flow/FlowMain.hpp opm/simulators/flow/FlowUtils.hpp opm/simulators/flow/FlowsData.hpp diff --git a/ebos/eclcpgridvanguard.hh b/ebos/eclcpgridvanguard.hh index ae5113da8..d9815d89c 100644 --- a/ebos/eclcpgridvanguard.hh +++ b/ebos/eclcpgridvanguard.hh @@ -30,13 +30,14 @@ #include #include #include -#include #include #include #include +#include + #include #include #include diff --git a/ebos/eclgenericcpgridvanguard.cc b/ebos/eclgenericcpgridvanguard.cc index 7746a6b2b..ba75cf784 100644 --- a/ebos/eclgenericcpgridvanguard.cc +++ b/ebos/eclgenericcpgridvanguard.cc @@ -49,7 +49,7 @@ #if HAVE_DUNE_FEM #include #include -#include +#include #endif //HAVE_DUNE_FEM #include diff --git a/ebos/eclgenericproblem.cc b/ebos/eclgenericproblem.cc index 4798a2097..0fb8cef19 100644 --- a/ebos/eclgenericproblem.cc +++ b/ebos/eclgenericproblem.cc @@ -36,7 +36,7 @@ #if HAVE_DUNE_FEM #include #include -#include +#include #endif // HAVE_DUNE_FEM namespace Opm { diff --git a/ebos/eclgenericthresholdpressure.cc b/ebos/eclgenericthresholdpressure.cc index 2dc901f6b..e4def11ae 100644 --- a/ebos/eclgenericthresholdpressure.cc +++ b/ebos/eclgenericthresholdpressure.cc @@ -31,7 +31,7 @@ #if HAVE_DUNE_FEM #include #include -#include +#include #endif // HAVE_DUNE_FEM namespace Opm { diff --git a/ebos/eclgenerictracermodel.cc b/ebos/eclgenerictracermodel.cc index 07dedddaf..d4d9d8e4a 100644 --- a/ebos/eclgenerictracermodel.cc +++ b/ebos/eclgenerictracermodel.cc @@ -26,7 +26,7 @@ #if HAVE_DUNE_FEM #include #include -#include +#include #endif // HAVE_DUNE_FEM namespace Opm { diff --git a/ebos/eclgenericwriter.cc b/ebos/eclgenericwriter.cc index 62ddd929f..fa6d3b6b0 100644 --- a/ebos/eclgenericwriter.cc +++ b/ebos/eclgenericwriter.cc @@ -33,7 +33,7 @@ #if HAVE_DUNE_FEM #include #include -#include +#include #endif // HAVE_DUNE_FEM namespace Opm { diff --git a/ebos/ecltransmissibility.cc b/ebos/ecltransmissibility.cc index 9a6d40961..584b70b39 100644 --- a/ebos/ecltransmissibility.cc +++ b/ebos/ecltransmissibility.cc @@ -30,7 +30,7 @@ #if HAVE_DUNE_FEM #include #include -#include +#include #endif namespace Opm { diff --git a/ebos/equil/initstateequil.cc b/ebos/equil/initstateequil.cc index 984b3f058..47a084dfb 100644 --- a/ebos/equil/initstateequil.cc +++ b/ebos/equil/initstateequil.cc @@ -30,7 +30,7 @@ #if HAVE_DUNE_FEM #include #include -#include +#include #endif namespace Opm { diff --git a/opm/simulators/flow/CollectDataOnIORank.cpp b/opm/simulators/flow/CollectDataOnIORank.cpp index 14255c775..7ae952f45 100644 --- a/opm/simulators/flow/CollectDataOnIORank.cpp +++ b/opm/simulators/flow/CollectDataOnIORank.cpp @@ -29,7 +29,7 @@ #if HAVE_DUNE_FEM #include #include -#include +#include #endif // HAVE_DUNE_FEM namespace Opm { diff --git a/ebos/femcpgridcompat.hh b/opm/simulators/flow/FemCpGridCompat.hpp similarity index 92% rename from ebos/femcpgridcompat.hh rename to opm/simulators/flow/FemCpGridCompat.hpp index c480f5e74..e41c87665 100644 --- a/ebos/femcpgridcompat.hh +++ b/opm/simulators/flow/FemCpGridCompat.hpp @@ -23,13 +23,13 @@ /*! * \file * - * \brief This file ensures that ebos can be compiled in the presence of dune-fem + * \brief This file ensures that flow can be compiled in the presence of dune-fem * * It implements a few work-arounds for some incompatibilities with the Dune grid * interface of CpGrid. A better way would be to make CpGrid conforming. */ -#ifndef EWOMS_FEM_CPGRID_COMPAT_HH -#define EWOMS_FEM_CPGRID_COMPAT_HH +#ifndef OPM_FEM_CPGRID_COMPAT_HPP +#define OPM_FEM_CPGRID_COMPAT_HPP #if HAVE_DUNE_FEM #include @@ -70,4 +70,4 @@ struct GridEntityAccess > #endif // #if HAVE_DUNE_FEM -#endif // EWOMS_FEM_CPGRID_COMPAT_HH +#endif // OPM_FEM_CPGRID_COMPAT_HPP diff --git a/opm/simulators/utils/GridDataOutput.cpp b/opm/simulators/utils/GridDataOutput.cpp index 0b66606c3..37192240b 100644 --- a/opm/simulators/utils/GridDataOutput.cpp +++ b/opm/simulators/utils/GridDataOutput.cpp @@ -26,7 +26,7 @@ #if HAVE_DUNE_FEM #include #include -#include +#include #endif // HAVE_DUNE_FEM namespace Opm::GridDataOutput { diff --git a/tests/test_RestartSerialization.cpp b/tests/test_RestartSerialization.cpp index bc3eafc41..9edafa12b 100644 --- a/tests/test_RestartSerialization.cpp +++ b/tests/test_RestartSerialization.cpp @@ -21,7 +21,6 @@ #include #include -#include #include @@ -37,6 +36,7 @@ #include +#include #include #include #include