diff --git a/dumux/io/grid/gmshgriddatahandle.hh b/dumux/io/grid/gmshgriddatahandle.hh index 49646d789e6b4a0925cc23a53a575c57166bb8e4..8a81145d0879c032d7cc246d57de9b448050ef80 100644 --- a/dumux/io/grid/gmshgriddatahandle.hh +++ b/dumux/io/grid/gmshgriddatahandle.hh @@ -103,7 +103,7 @@ struct GmshGridDataHandle : public Dune::CommDataHandleIF<GmshGridDataHandle<Gri bool contains (int dim, int codim) const { return codim == 0 || codim == 1; } -#if DUNE_VERSION_GT(DUNE_GRID,2,7) +#if DUNE_VERSION_GTE(DUNE_GRID,2,7) //! returns true if size per entity of given dim and codim is a constant bool fixedSize(int dim, int codim) const { return true; } @@ -188,7 +188,7 @@ struct GmshGridDataHandle<Dune::UGGrid<dimgrid>, GridFactory, Data> bool contains (int dim, int codim) const { return codim == 0 || codim == 1; } -#if DUNE_VERSION_GT(DUNE_GRID,2,7) +#if DUNE_VERSION_GTE(DUNE_GRID,2,7) //! returns true if size per entity of given dim and codim is a constant bool fixedSize(int dim, int codim) const { return true; } diff --git a/dumux/io/loadsolution.hh b/dumux/io/loadsolution.hh index c53517ce1859c0a2e1b5626ca69e2509017afe8b..1037932bbae206b6ea91862060dee292057c4c69 100644 --- a/dumux/io/loadsolution.hh +++ b/dumux/io/loadsolution.hh @@ -67,7 +67,7 @@ public: bool contains(int dim, int cd) const { return cd == codim; } -#if DUNE_VERSION_GT(DUNE_GRID,2,7) +#if DUNE_VERSION_GTE(DUNE_GRID,2,7) //! returns true if size per entity of given dim and codim is a constant bool fixedSize(int dim, int cd) const { return true; } diff --git a/dumux/linear/parallelhelpers.hh b/dumux/linear/parallelhelpers.hh index 23e7fbca2e014f4f58e840cfa801acff96464597..d8999b99262ad46ec77f7c1f7fa6153b598ce03a 100644 --- a/dumux/linear/parallelhelpers.hh +++ b/dumux/linear/parallelhelpers.hh @@ -65,7 +65,7 @@ class ParallelISTLHelper bool contains(int dim, int codim) const { return dofCodim == codim; } -#if DUNE_VERSION_GT(DUNE_GRID,2,7) +#if DUNE_VERSION_GTE(DUNE_GRID,2,7) //! returns true if size per entity of given dim and codim is a constant bool fixedSize(int dim, int codim) const { return true; } @@ -98,7 +98,7 @@ class ParallelISTLHelper public: using DataType = typename V::block_type; using BaseGatherScatter::contains; -#if DUNE_VERSION_GT(DUNE_GRID,2,7) +#if DUNE_VERSION_GTE(DUNE_GRID,2,7) using BaseGatherScatter::fixedSize; #else using BaseGatherScatter::fixedsize; @@ -140,7 +140,7 @@ class ParallelISTLHelper public: using DataType = std::size_t; using BaseGatherScatter::contains; -#if DUNE_VERSION_GT(DUNE_GRID,2,7) +#if DUNE_VERSION_GTE(DUNE_GRID,2,7) using BaseGatherScatter::fixedSize; #else using BaseGatherScatter::fixedsize; @@ -186,7 +186,7 @@ class ParallelISTLHelper public: using DataType = std::size_t; using BaseGatherScatter::contains; -#if DUNE_VERSION_GT(DUNE_GRID,2,7) +#if DUNE_VERSION_GTE(DUNE_GRID,2,7) using BaseGatherScatter::fixedSize; #else using BaseGatherScatter::fixedsize; @@ -229,7 +229,7 @@ class ParallelISTLHelper { using DataType = int; using BaseGatherScatter::contains; -#if DUNE_VERSION_GT(DUNE_GRID,2,7) +#if DUNE_VERSION_GTE(DUNE_GRID,2,7) using BaseGatherScatter::fixedSize; #else using BaseGatherScatter::fixedsize; @@ -269,7 +269,7 @@ class ParallelISTLHelper { using DataType = int; using BaseGatherScatter::contains; -#if DUNE_VERSION_GT(DUNE_GRID,2,7) +#if DUNE_VERSION_GTE(DUNE_GRID,2,7) using BaseGatherScatter::fixedSize; #else using BaseGatherScatter::fixedsize; @@ -310,7 +310,7 @@ class ParallelISTLHelper { using DataType = GlobalIndex; using BaseGatherScatter::contains; -#if DUNE_VERSION_GT(DUNE_GRID,2,7) +#if DUNE_VERSION_GTE(DUNE_GRID,2,7) using BaseGatherScatter::fixedSize; #else using BaseGatherScatter::fixedsize; @@ -567,7 +567,7 @@ class ParallelMatrixHelper bool contains (int dim, int codim) const { return (codim == dofCodim); } -#if DUNE_VERSION_GT(DUNE_GRID,2,7) +#if DUNE_VERSION_GTE(DUNE_GRID,2,7) //! returns true if size per entity of given dim and codim is a constant bool fixedSize(int dim, int codim) const { return false; } @@ -668,7 +668,7 @@ class ParallelMatrixHelper bool contains(int dim, int codim) const { return (codim == dofCodim); } -#if DUNE_VERSION_GT(DUNE_GRID,2,7) +#if DUNE_VERSION_GTE(DUNE_GRID,2,7) //! returns true if size per entity of given dim and codim is a constant bool fixedSize(int dim, int codim) const { return false; } diff --git a/dumux/parallel/vectorcommdatahandle.hh b/dumux/parallel/vectorcommdatahandle.hh index 74122a6ec7902060a5b86200954affe531558c5f..caf8b9ffc4ad8d5132f3751436d5f4d4ec3759d2 100644 --- a/dumux/parallel/vectorcommdatahandle.hh +++ b/dumux/parallel/vectorcommdatahandle.hh @@ -89,7 +89,7 @@ public: bool contains(int dim, int codim) const { return (codim == entityCodim); } -#if DUNE_VERSION_GT(DUNE_GRID,2,7) +#if DUNE_VERSION_GTE(DUNE_GRID,2,7) //! returns true if size per entity of given dim and codim is a constant bool fixedSize(int dim, int codim) const { return true; }