From cbecba4f9cb7ea561c527afd59e8dc849d8645e8 Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Sun, 15 Mar 2020 16:10:13 +0100 Subject: [PATCH] [cleanup] fixedsize -> fixedSize in data handle (upstream change) --- dumux/io/loadsolution.hh | 2 +- dumux/linear/parallelhelpers.hh | 18 +++++++++--------- dumux/parallel/vectorcommdatahandle.hh | 2 +- test/io/gridmanager/gridmanagertests.hh | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dumux/io/loadsolution.hh b/dumux/io/loadsolution.hh index 224254c1cb..c9770b996c 100644 --- a/dumux/io/loadsolution.hh +++ b/dumux/io/loadsolution.hh @@ -66,7 +66,7 @@ public: bool contains(int dim, int cd) const { return cd == codim; } - bool fixedsize(int dim, int cd) const + bool fixedSize(int dim, int cd) const { return true; } template<class EntityType> diff --git a/dumux/linear/parallelhelpers.hh b/dumux/linear/parallelhelpers.hh index 1f825e3ddf..38624a968e 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; } - bool fixedsize(int dim, int codim) const + bool fixedSize(int dim, int codim) const { return true; } template<class EntityType> @@ -91,7 +91,7 @@ class ParallelISTLHelper public: using DataType = typename V::block_type; using BaseGatherScatter::contains; - using BaseGatherScatter::fixedsize; + using BaseGatherScatter::fixedSize; using BaseGatherScatter::size; ConsistencyBoxGatherScatter(V& container, const DofMapper& mapper) @@ -129,7 +129,7 @@ class ParallelISTLHelper public: using DataType = std::size_t; using BaseGatherScatter::contains; - using BaseGatherScatter::fixedsize; + using BaseGatherScatter::fixedSize; using BaseGatherScatter::size; GhostGatherScatter(std::vector<std::size_t>& ranks, const DofMapper& mapper) @@ -171,7 +171,7 @@ class ParallelISTLHelper public: using DataType = std::size_t; using BaseGatherScatter::contains; - using BaseGatherScatter::fixedsize; + using BaseGatherScatter::fixedSize; using BaseGatherScatter::size; InteriorBorderGatherScatter(std::vector<std::size_t>& ranks, const DofMapper& mapper) @@ -210,7 +210,7 @@ class ParallelISTLHelper { using DataType = int; using BaseGatherScatter::contains; - using BaseGatherScatter::fixedsize; + using BaseGatherScatter::fixedSize; using BaseGatherScatter::size; NeighbourGatherScatter(const DofMapper& mapper, int rank, std::set<int>& neighbours) @@ -246,7 +246,7 @@ class ParallelISTLHelper { using DataType = int; using BaseGatherScatter::contains; - using BaseGatherScatter::fixedsize; + using BaseGatherScatter::fixedSize; using BaseGatherScatter::size; SharedGatherScatter(std::vector<int>& shared, const DofMapper& mapper) @@ -283,7 +283,7 @@ class ParallelISTLHelper { using DataType = GlobalIndex; using BaseGatherScatter::contains; - using BaseGatherScatter::fixedsize; + using BaseGatherScatter::fixedSize; using BaseGatherScatter::size; GlobalIndexGatherScatter(std::vector<GlobalIndex>& globalIndices, const DofMapper& mapper) @@ -539,7 +539,7 @@ class ParallelMatrixHelper /*! * \brief Returns true if size of data per entity of given dim and codim is a constant */ - bool fixedsize (int dim, int codim) const + bool fixedSize (int dim, int codim) const { return false; } /*! @@ -636,7 +636,7 @@ class ParallelMatrixHelper /*! * \brief Returns true if size of data per entity of given dim and codim is a constant */ - bool fixedsize(int dim, int codim) const + bool fixedSize(int dim, int codim) const { return false; } /*! diff --git a/dumux/parallel/vectorcommdatahandle.hh b/dumux/parallel/vectorcommdatahandle.hh index 0bcfa538d8..21f5ffd989 100644 --- a/dumux/parallel/vectorcommdatahandle.hh +++ b/dumux/parallel/vectorcommdatahandle.hh @@ -88,7 +88,7 @@ public: { return (codim == entityCodim); } //! returns true if size per entity of given dim and codim is a constant - bool fixedsize(int dim, int codim) const + bool fixedSize(int dim, int codim) const { return true; } /*! diff --git a/test/io/gridmanager/gridmanagertests.hh b/test/io/gridmanager/gridmanagertests.hh index 9e6da34bae..7dbbc38f24 100644 --- a/test/io/gridmanager/gridmanagertests.hh +++ b/test/io/gridmanager/gridmanagertests.hh @@ -57,7 +57,7 @@ public: return codim == dim; } - bool fixedsize(int dim, int codim) const + bool fixedSize(int dim, int codim) const { // for each vertex we communicate a single field vector which // has a fixed size -- GitLab