From 43ee5e8ac6bbc5aeb932168a5e4855c086cd1077 Mon Sep 17 00:00:00 2001 From: DennisGlaeser <dennis.glaeser@iws.uni-stuttgart.de> Date: Thu, 25 Feb 2016 14:08:56 +0100 Subject: [PATCH] [ImplicitModel] onBoundary function gets scv now --- dumux/implicit/model.hh | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/dumux/implicit/model.hh b/dumux/implicit/model.hh index f77a51da90..00747bb700 100644 --- a/dumux/implicit/model.hh +++ b/dumux/implicit/model.hh @@ -591,8 +591,7 @@ public: * \param element The DUNE codim 0 entity * \param volVars All volume variables for the element */ - void updatePVWeights(const Element &element, - const ElementVolumeVariables &volVars) const + void updatePVWeights(const FVElementGeometry& fvGeometry) const { } /*! @@ -727,30 +726,9 @@ public: * volume's associated vertex. * \param vIdx The local vertex index inside element */ - bool onBoundary(const Element &element, const int vIdx) const + bool onBoundary(const SubControlVolume &scv) const { - if (isBox) - return asImp_().onBoundary(vertexMapper().subIndex(element, vIdx, dim)); - - DUNE_THROW(Dune::InvalidStateException, - "requested for cell-centered model"); - } - - - /*! - * \brief Returns true if the control volume touches - * the grid's boundary. - * - * \param element A DUNE Codim<0> entity coinciding with the control - * volume. - */ - bool onBoundary(const Element &element) const - { - if (!isBox) - return asImp_().onBoundary(elementMapper().index(element)); - - DUNE_THROW(Dune::InvalidStateException, - "requested for box model"); + return asImp_().onBoundary(onBoundary(scv.dofIdxGlobal())); } /*! -- GitLab