From 511c164d5a0d89b80a49ead1cd8423c295178d57 Mon Sep 17 00:00:00 2001 From: Oliver Sander <oliver.sander@tu-dresden.de> Date: Fri, 14 Jun 2019 12:18:35 +0200 Subject: [PATCH] Use 'override' keyword where appropriate --- dune/gfe/rodassembler.hh | 10 +++++----- dune/gfe/rodlocalstiffness.hh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dune/gfe/rodassembler.hh b/dune/gfe/rodassembler.hh index ce794c71..32c5caf3 100644 --- a/dune/gfe/rodassembler.hh +++ b/dune/gfe/rodassembler.hh @@ -68,8 +68,8 @@ public: { return dynamic_cast<RodLocalStiffness<GridView, double>* >(this->localStiffness_)->referenceConfiguration_; } - void assembleGradient(const std::vector<RigidBodyMotion<double,3> >& sol, - Dune::BlockVector<Dune::FieldVector<double, blocksize> >& grad) const; + virtual void assembleGradient(const std::vector<RigidBodyMotion<double,3> >& sol, + Dune::BlockVector<Dune::FieldVector<double, blocksize> >& grad) const override; void getStrain(const std::vector<RigidBodyMotion<double,3> >& sol, Dune::BlockVector<Dune::FieldVector<double, blocksize> >& strain) const; @@ -137,11 +137,11 @@ public: void assembleMatrix(const std::vector<RigidBodyMotion<double,2> >& sol, Dune::BCRSMatrix<MatrixBlock>& matrix); - void assembleGradient(const std::vector<RigidBodyMotion<double,2> >& sol, - Dune::BlockVector<Dune::FieldVector<double, blocksize> >& grad) const; + virtual void assembleGradient(const std::vector<RigidBodyMotion<double,2> >& sol, + Dune::BlockVector<Dune::FieldVector<double, blocksize> >& grad) const override; /** \brief Compute the energy of a deformation state */ - double computeEnergy(const std::vector<RigidBodyMotion<double,2> >& sol) const; + virtual double computeEnergy(const std::vector<RigidBodyMotion<double,2> >& sol) const override; protected: diff --git a/dune/gfe/rodlocalstiffness.hh b/dune/gfe/rodlocalstiffness.hh index f922e16d..b37bdadc 100644 --- a/dune/gfe/rodlocalstiffness.hh +++ b/dune/gfe/rodlocalstiffness.hh @@ -101,7 +101,7 @@ public: const std::array<RigidBodyMotion<RT,3>, dim+1>& localSolution) const; virtual RT energy (const typename Basis::LocalView& localView, - const std::vector<RigidBodyMotion<RT,3> >& localSolution) const + const std::vector<RigidBodyMotion<RT,3> >& localSolution) const override { assert(localSolution.size()==2); std::array<RigidBodyMotion<RT,3>, 2> localSolutionArray = {localSolution[0], localSolution[1]}; -- GitLab