Commit 78be0ce0 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

Merge branch 'cherry-pick-a55f8413' into 'releases/2.11'

Merge branch 'fix/2.x-co2-tests-for-dune-2.6' into 'releases/2.12'

See merge request !964
parents f19765e7 e965151d
......@@ -351,7 +351,11 @@ public:
*/
void boundaryTypes(BoundaryTypes &values, const Intersection &intersection) const
{
#if DUNE_VERSION_NEWER(DUNE_ALUGRID, 2, 6)
int boundaryId = intersection.impl().boundaryId();
#else
int boundaryId = intersection.boundaryId();
#endif
if (boundaryId < 1 || boundaryId > 4)
{
std::cout<<"invalid boundaryId: "<<boundaryId<<std::endl;
......@@ -401,8 +405,11 @@ public:
int scvIdx,
int boundaryFaceIdx) const
{
#if DUNE_VERSION_NEWER(DUNE_ALUGRID, 2, 6)
int boundaryId = intersection.impl().boundaryId();
#else
int boundaryId = intersection.boundaryId();
#endif
values = 0;
if (boundaryId == injectionBottom_)
{
......
......@@ -364,7 +364,11 @@ public:
*/
void boundaryTypes(BoundaryTypes &values, const Intersection &intersection) const
{
#if DUNE_VERSION_NEWER(DUNE_ALUGRID, 2, 6)
int boundaryId = intersection.impl().boundaryId();
#else
int boundaryId = intersection.boundaryId();
#endif
if (boundaryId < 1 || boundaryId > 4)
{
std::cout<<"invalid boundaryId: "<<boundaryId<<std::endl;
......@@ -414,8 +418,11 @@ public:
int scvIdx,
int boundaryFaceIdx) const
{
#if DUNE_VERSION_NEWER(DUNE_ALUGRID, 2, 6)
int boundaryId = intersection.impl().boundaryId();
#else
int boundaryId = intersection.boundaryId();
#endif
values = 0;
if (boundaryId == injectionBottom_)
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment