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

move ebos/femcpgridcompat.hh to opm/simulators/flow

Browse Source
This commit is contained in:
Arne Morten Kvarving
2024-02-05 19:22:15 +01:00
parent 388c6c72f7
commit c9b3de16f1
13 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@@ -435,7 +435,6 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/ecltransmissibility.hh ebos/ecltransmissibility.hh
ebos/ecltransmissibility_impl.hh ebos/ecltransmissibility_impl.hh
ebos/eclwriter.hh ebos/eclwriter.hh
ebos/femcpgridcompat.hh
ebos/vtkecltracermodule.hh ebos/vtkecltracermodule.hh
opm/simulators/flow/ActionHandler.hpp opm/simulators/flow/ActionHandler.hpp
opm/simulators/flow/AluGridCartesianIndexMapper.hpp opm/simulators/flow/AluGridCartesianIndexMapper.hpp
@@ -451,6 +450,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/flow/countGlobalCells.hpp opm/simulators/flow/countGlobalCells.hpp
opm/simulators/flow/DummyGradientCalculator.hpp opm/simulators/flow/DummyGradientCalculator.hpp
opm/simulators/flow/ExtraConvergenceOutputThread.hpp opm/simulators/flow/ExtraConvergenceOutputThread.hpp
opm/simulators/flow/FemCpGridCompat.hpp
opm/simulators/flow/FlowMain.hpp opm/simulators/flow/FlowMain.hpp
opm/simulators/flow/FlowUtils.hpp opm/simulators/flow/FlowUtils.hpp
opm/simulators/flow/FlowsData.hpp opm/simulators/flow/FlowsData.hpp

3
ebos/eclcpgridvanguard.hh
View File

@@ -30,13 +30,14 @@
#include <ebos/eclbasevanguard.hh> #include <ebos/eclbasevanguard.hh>
#include <ebos/eclgenericcpgridvanguard.hh> #include <ebos/eclgenericcpgridvanguard.hh>
#include <ebos/ecltransmissibility.hh> #include <ebos/ecltransmissibility.hh>
#include <ebos/femcpgridcompat.hh>
#include <opm/common/TimingMacros.hpp> #include <opm/common/TimingMacros.hpp>
#include <opm/models/common/multiphasebaseproperties.hh> #include <opm/models/common/multiphasebaseproperties.hh>
#include <opm/models/blackoil/blackoilproperties.hh> #include <opm/models/blackoil/blackoilproperties.hh>
#include <opm/simulators/flow/FemCpGridCompat.hpp>
#include <array> #include <array>
#include <functional> #include <functional>
#include <memory> #include <memory>

2
ebos/eclgenericcpgridvanguard.cc
View File

@@ -49,7 +49,7 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#include <dune/fem/gridpart/common/gridpart2gridview.hh> #include <dune/fem/gridpart/common/gridpart2gridview.hh>
#include <ebos/femcpgridcompat.hh> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif //HAVE_DUNE_FEM #endif //HAVE_DUNE_FEM
#include <cassert> #include <cassert>

2
ebos/eclgenericproblem.cc
View File

@@ -36,7 +36,7 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#include <dune/fem/gridpart/common/gridpart2gridview.hh> #include <dune/fem/gridpart/common/gridpart2gridview.hh>
#include <ebos/femcpgridcompat.hh> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM
namespace Opm { namespace Opm {

2
ebos/eclgenericthresholdpressure.cc
View File

@@ -31,7 +31,7 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#include <dune/fem/gridpart/common/gridpart2gridview.hh> #include <dune/fem/gridpart/common/gridpart2gridview.hh>
#include <ebos/femcpgridcompat.hh> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM
namespace Opm { namespace Opm {

2
ebos/eclgenerictracermodel.cc
View File

@@ -26,7 +26,7 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#include <dune/fem/gridpart/common/gridpart2gridview.hh> #include <dune/fem/gridpart/common/gridpart2gridview.hh>
#include <ebos/femcpgridcompat.hh> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM
namespace Opm { namespace Opm {

2
ebos/eclgenericwriter.cc
View File

@@ -33,7 +33,7 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#include <dune/fem/gridpart/common/gridpart2gridview.hh> #include <dune/fem/gridpart/common/gridpart2gridview.hh>
#include <ebos/femcpgridcompat.hh> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM
namespace Opm { namespace Opm {

2
ebos/ecltransmissibility.cc
View File

@@ -30,7 +30,7 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#include <dune/fem/gridpart/common/gridpart2gridview.hh> #include <dune/fem/gridpart/common/gridpart2gridview.hh>
#include <ebos/femcpgridcompat.hh> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif #endif
namespace Opm { namespace Opm {

2
ebos/equil/initstateequil.cc
View File

@@ -30,7 +30,7 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#include <dune/fem/gridpart/common/gridpart2gridview.hh> #include <dune/fem/gridpart/common/gridpart2gridview.hh>
#include <ebos/femcpgridcompat.hh> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif #endif
namespace Opm { namespace Opm {

2
opm/simulators/flow/CollectDataOnIORank.cpp
View File

@@ -29,7 +29,7 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#include <dune/fem/gridpart/common/gridpart2gridview.hh> #include <dune/fem/gridpart/common/gridpart2gridview.hh>
#include <ebos/femcpgridcompat.hh> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM
namespace Opm { namespace Opm {

8
ebos/femcpgridcompat.hh → opm/simulators/flow/FemCpGridCompat.hpp
View File

@@ -23,13 +23,13 @@
/*! /*!
* \file * \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 * 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. * interface of CpGrid. A better way would be to make CpGrid conforming.
*/ */
#ifndef EWOMS_FEM_CPGRID_COMPAT_HH #ifndef OPM_FEM_CPGRID_COMPAT_HPP
#define EWOMS_FEM_CPGRID_COMPAT_HH #define OPM_FEM_CPGRID_COMPAT_HPP
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/common/version.hh> #include <dune/common/version.hh>
@@ -70,4 +70,4 @@ struct GridEntityAccess<Dune::cpgrid::Entity<codim> >
#endif // #if HAVE_DUNE_FEM #endif // #if HAVE_DUNE_FEM
#endif // EWOMS_FEM_CPGRID_COMPAT_HH #endif // OPM_FEM_CPGRID_COMPAT_HPP

2
opm/simulators/utils/GridDataOutput.cpp
View File

@@ -26,7 +26,7 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#include <dune/fem/gridpart/common/gridpart2gridview.hh> #include <dune/fem/gridpart/common/gridpart2gridview.hh>
#include <ebos/femcpgridcompat.hh> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM
namespace Opm::GridDataOutput { namespace Opm::GridDataOutput {

2
tests/test_RestartSerialization.cpp
View File

@@ -21,7 +21,6 @@
#include <ebos/ebos.hh> #include <ebos/ebos.hh>
#include <ebos/eclgenericvanguard.hh> #include <ebos/eclgenericvanguard.hh>
#include <ebos/femcpgridcompat.hh>
#include <opm/common/utility/Serializer.hpp> #include <opm/common/utility/Serializer.hpp>
@@ -37,6 +36,7 @@
#include <opm/models/blackoil/blackoilprimaryvariables.hh> #include <opm/models/blackoil/blackoilprimaryvariables.hh>
#include <opm/simulators/flow/FemCpGridCompat.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp> #include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>
#include <opm/simulators/timestepping/SimulatorReport.hpp> #include <opm/simulators/timestepping/SimulatorReport.hpp>
#include <opm/simulators/timestepping/SimulatorTimer.hpp> #include <opm/simulators/timestepping/SimulatorTimer.hpp>