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 #4765 from hnil/change_poly_alugrid

Browse Source 
removed use of hidden private defines for poly and alugrid
This commit is contained in:
Arne Morten Kvarving
2023-08-09 11:15:02 +02:00
committed by GitHub
parent 60b71dac25 e55008b336
commit c6f1aa0110
24 changed files with 4163 additions and 4307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/simulators/aquifers/BlackoilAquiferModel.hpp
View File

@@ -37,10 +37,8 @@
#include <opm/simulators/aquifers/AquiferNumerical.hpp>
#include <opm/grid/CpGrid.hpp>
#ifdef USE_POLYHEDRALGRID
#include <opm/grid/polyhedralgrid.hh>
#endif
#if USE_ALUGRID
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
@@ -65,14 +63,12 @@ class SupportsFaceTag<Dune::CpGrid>
{};
#ifdef USE_POLYHEDRALGRID
template<>
class SupportsFaceTag<Dune::PolyhedralGrid<3, 3>>
: public std::bool_constant<true>
{};
#endif
#if USE_ALUGRID
#if HAVE_DUNE_ALUGRID
template<>
class SupportsFaceTag<Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>>
: public std::bool_constant<true>

6
opm/simulators/linalg/ISTLSolverEbos.cpp
View File

@@ -43,6 +43,8 @@
#include <ebos/alucartesianindexmapper.hh>
#endif // HAVE_DUNE_ALUGRID
#include <opm/grid/polyhedralgrid.hh>
namespace Opm {
namespace detail {
@@ -387,7 +389,7 @@ using CommunicationType = Dune::CollectiveCommunication<int>;
const std::vector<Well>&, \
const std::vector<int>&, \
const size_t, const bool);
using PolyHedralGrid3D = Dune::PolyhedralGrid<3, 3>;
#if HAVE_DUNE_ALUGRID
#if HAVE_MPI
using ALUGrid3CN = Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming, Dune::ALUGridMPIComm>;
@@ -398,11 +400,13 @@ using CommunicationType = Dune::CollectiveCommunication<int>;
template struct BdaSolverInfo<BM<Dim>,BV<Dim>>; \
INSTANCE_GRID(Dim,Dune::CpGrid) \
INSTANCE_GRID(Dim,ALUGrid3CN) \
INSTANCE_GRID(Dim,PolyHedralGrid3D) \
INSTANCE_FLEX(Dim)
#else
#define INSTANCE(Dim) \
template struct BdaSolverInfo<BM<Dim>,BV<Dim>>; \
INSTANCE_GRID(Dim,Dune::CpGrid) \
INSTANCE_GRID(Dim,PolyHedralGrid3D) \
INSTANCE_FLEX(Dim)
#endif
#else