From e9f0cbee15f023822bd572855657cf819228bc9c Mon Sep 17 00:00:00 2001 From: Melanie Lipp <melanie.lipp@iws.uni-stuttgart.de> Date: Fri, 21 May 2021 18:10:18 +0200 Subject: [PATCH] [geometryhelper] Remove compiler warnings. Apply same ordering for private variables and for initialization list in constructor. --- .../geometryhelper/cvdstaggeredgeometryhelper.hh | 6 +++--- .../handlers/cvdstaggerednormalvolvarshandler.hh | 12 ++++++------ .../handlers/cvdstaggeredpairdatahandler.hh | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dumux/discretization/staggered/freeflow/geometryhelper/cvdstaggeredgeometryhelper.hh b/dumux/discretization/staggered/freeflow/geometryhelper/cvdstaggeredgeometryhelper.hh index 76d2f48..895ca52 100644 --- a/dumux/discretization/staggered/freeflow/geometryhelper/cvdstaggeredgeometryhelper.hh +++ b/dumux/discretization/staggered/freeflow/geometryhelper/cvdstaggeredgeometryhelper.hh @@ -95,7 +95,7 @@ public: void updateLocalCVDFace(CVDIntersectionBase<GridView, Intersection>*& intersection){ if(intersection->isSimple()){ - + } } @@ -465,8 +465,6 @@ private: }; Intersection intersection_; //!< The intersection of interest - CVDGeometryHelperUtility<GridView> utility_; - CVDInterpolationHelper<GridView> interpUtility_; const Element element_; //!< The respective element const typename Element::Geometry elementGeometry_; //!< Reference to the element geometry const GridView gridView_; //!< The grid view @@ -479,6 +477,8 @@ private: GlobalPosition oppositePosition_; std::vector<std::pair<GridIndexType, GlobalPosition>> velocityXPositions_; std::vector<std::pair<GridIndexType, GlobalPosition>> velocityYPositions_; + CVDGeometryHelperUtility<GridView> utility_; + CVDInterpolationHelper<GridView> interpUtility_; }; template<class GridView, class IntersectionMapper> diff --git a/dumux/discretization/staggered/freeflow/geometryhelper/handlers/cvdstaggerednormalvolvarshandler.hh b/dumux/discretization/staggered/freeflow/geometryhelper/handlers/cvdstaggerednormalvolvarshandler.hh index cb864a6..0d97b4c 100644 --- a/dumux/discretization/staggered/freeflow/geometryhelper/handlers/cvdstaggerednormalvolvarshandler.hh +++ b/dumux/discretization/staggered/freeflow/geometryhelper/handlers/cvdstaggerednormalvolvarshandler.hh @@ -56,7 +56,7 @@ class CVDStaggeredNormalVolumeVarsHandler { static constexpr int numPairs = 2 * (dimWorld - 1); static int order_; - + public: CVDStaggeredNormalVolumeVarsHandler(const GridView& gridView, const IntersectionMapper& intersectionMapper, const Element& element, Intersection& intersection, MyVolVarsData& data) : gridView_(gridView), @@ -66,7 +66,7 @@ class CVDStaggeredNormalVolumeVarsHandler { utility_(gridView, intersection), volVarsData_(data){ } - + MyVolVarsData getVolVarsData(){ return volVarsData_; } @@ -161,7 +161,7 @@ class CVDStaggeredNormalVolumeVarsHandler { } } else //!normalIs.neighbor() - { + { //Dirichlet & non-dirichlet cases handleCase5and6(numPairParallelIdx, normalIs, dofs, interpFacts, buildingData, emptyBuildingData); } @@ -250,7 +250,7 @@ class CVDStaggeredNormalVolumeVarsHandler { } } else //!normalIs.neighbor() - { + { //Dirichlet and non-Dirichlet cases handleCases22and23(numPairParallelIdx, normalIs, dofs, interpFacts, buildingData, emptyBuildingData); } @@ -263,9 +263,9 @@ class CVDStaggeredNormalVolumeVarsHandler { const GridView gridView_; const IntersectionMapper intersectionMapper_; const Element element_; - MyVolVarsData volVarsData_; Intersection intersection_; CVDGeometryHelperUtility<GridView> utility_; + MyVolVarsData volVarsData_; void handleCases1and4(int& numPairParallelIdx, const Intersection& normalIs, @@ -1347,4 +1347,4 @@ class CVDStaggeredNormalVolumeVarsHandler { }; } // namespace Dumux -#endif \ No newline at end of file +#endif diff --git a/dumux/discretization/staggered/freeflow/geometryhelper/handlers/cvdstaggeredpairdatahandler.hh b/dumux/discretization/staggered/freeflow/geometryhelper/handlers/cvdstaggeredpairdatahandler.hh index f675d0e..7ff0c10 100644 --- a/dumux/discretization/staggered/freeflow/geometryhelper/handlers/cvdstaggeredpairdatahandler.hh +++ b/dumux/discretization/staggered/freeflow/geometryhelper/handlers/cvdstaggeredpairdatahandler.hh @@ -36,7 +36,7 @@ namespace Dumux { */ template <class GridView, class IntersectionMapper, class PairData, class NPGP, class PGP, class AD, class GH> class CVDStaggeredPairDataHandler { - + using Scalar = typename GridView::ctype; static constexpr int dim = GridView::dimension; static constexpr int dimWorld = GridView::dimensionworld; @@ -59,13 +59,13 @@ class CVDStaggeredPairDataHandler { const GridView gridView_; const IntersectionMapper intersectionMapper_; const Element element_; + Intersection intersection_; + CVDGeometryHelperUtility<GridView> utility_; PairData pairData_; NPGP normalPairGlobalPositions_; PGP parallelGlobalPositions_; - AD axisData_; - Intersection intersection_; const GH geomHelper_; - CVDGeometryHelperUtility<GridView> utility_; + AD axisData_; public: CVDStaggeredPairDataHandler(const GridView& gridView, @@ -1432,4 +1432,4 @@ class CVDStaggeredPairDataHandler { }; } // namespace Dumux -#endif \ No newline at end of file +#endif -- GitLab