Commit 44dd84b3 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

Merge branch 'cherry-pick-08da3c23' into 'releases/2.10'

[test] fix co2 tests for Dumux 2.x and Dune 2.6

See merge request !966
parents dd6b1fdd a1785b36
......@@ -353,7 +353,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;
......@@ -403,8 +407,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_)
{
......
......@@ -366,7 +366,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;
......@@ -416,8 +420,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