From 029aaaab30d7965510566926085e998e1d55d198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= Date: Sun, 10 Jun 2018 13:23:52 +0200 Subject: [PATCH] [cc][fvelemgeom] make numScv() constexpr --- .../cellcentered/mpfa/fvelementgeometry.hh | 12 ++++++------ .../cellcentered/tpfa/fvelementgeometry.hh | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh b/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh index 781a11a0a6..25f8dcd040 100644 --- a/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh +++ b/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh @@ -126,10 +126,10 @@ public: ScvfIterator(g.scvfIndicesOfScv(scvIdx).end(), fvGeometry)); } - //! number of sub control volumes in this fv element geometry - std::size_t numScv() const + //! number of sub control volumes in this fv element geometry (always one for cc schemes) + static constexpr std::size_t numScv() { - return scvIndices_.size(); + return 1; } //! number of sub control volumes in this fv element geometry @@ -247,9 +247,9 @@ public: return Dune::IteratorRange(g.scvfs_.begin(), g.scvfs_.end()); } - //! number of sub control volumes in this fv element geometry - std::size_t numScv() const - { return scvs_.size(); } + //! number of sub control volumes in this fv element geometry (always one for cc schemes) + static constexpr std::size_t numScv() + { return 1; } //! number of sub control volumes in this fv element geometry std::size_t numScvf() const diff --git a/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh b/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh index fb1cf2a7fd..bc5ee8d631 100644 --- a/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh +++ b/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh @@ -127,10 +127,10 @@ public: ScvfIterator(g.scvfIndicesOfScv(scvIdx).end(), fvGeometry)); } - //! number of sub control volumes in this fv element geometry - std::size_t numScv() const + //! number of sub control volumes in this fv element geometry (always one for cc schemes) + static constexpr std::size_t numScv() { - return scvIndices_.size(); + return 1; } //! number of sub control volumes in this fv element geometry @@ -261,9 +261,9 @@ public: return Dune::IteratorRange(g.scvfs_.begin(), g.scvfs_.end()); } - //! number of sub control volumes in this fv element geometry - std::size_t numScv() const - { return scvs_.size(); } + //! number of sub control volumes in this fv element geometry (always one for cc schemes) + static constexpr std::size_t numScv() + { return 1; } //! number of sub control volumes in this fv element geometry std::size_t numScvf() const -- GitLab