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

3
ebos/eclcpgridvanguard.hh
View File

@@ -30,13 +30,14 @@
#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 <opm/models/blackoil/blackoilproperties.hh>
#include <opm/simulators/flow/FemCpGridCompat.hpp>
#include <array>
#include <functional>
#include <memory>

2
ebos/eclgenericcpgridvanguard.cc
View File

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

2
ebos/eclgenericproblem.cc
View File

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

2
ebos/eclgenericthresholdpressure.cc
View File

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

2
ebos/eclgenerictracermodel.cc
View File

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

2
ebos/eclgenericwriter.cc
View File

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

2
ebos/ecltransmissibility.cc
View File

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

2
ebos/equil/initstateequil.cc
View File

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

73
ebos/femcpgridcompat.hh
View File

@@ -1,73 +0,0 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
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 2 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 <http://www.gnu.org/licenses/>.
Consult the COPYING file in the top-level source directory of this
module for the precise wording of the license and the list of
copyright holders.
*/
/*!
* \file
*
* \brief This file ensures that ebos 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
#if HAVE_DUNE_FEM
#include <dune/common/version.hh>
#include <dune/fem/gridpart/common/gridpart.hh>
#include <dune/fem/misc/compatibility.hh>
#include <dune/fem/io/streams/streams.hh>
namespace Dune {
namespace cpgrid {
template <int codim>
class Entity;
template <int codim>
class EntityPointer;
}
// specialization of dune-fem compatiblity functions for CpGrid, since CpGrid does not use the interface classes.
namespace Fem {
////////////////////////////////////////////////////////////
//
// GridEntityAccess for CpGrid entities
//
////////////////////////////////////////////////////////////
template<int codim>
struct GridEntityAccess<Dune::cpgrid::Entity<codim> >
{
using EntityType = Dune::cpgrid::Entity<codim>;
using GridEntityType = EntityType;
static const GridEntityType& gridEntity(const EntityType& entity)
{ return entity; }
};
} // namespace Fem
} // end namespace Dune
#endif // #if HAVE_DUNE_FEM
#endif // EWOMS_FEM_CPGRID_COMPAT_HH