From f8ca286a72cff90a36968aa379d27af67f33493d Mon Sep 17 00:00:00 2001 From: Oliver Sander <sander@igpm.rwth-aachen.de> Date: Fri, 13 Aug 2010 07:07:47 +0000 Subject: [PATCH] Rename assemble() to assembleHessian() [[Imported from SVN: r6209]] --- dune/gfe/geodesicfeassembler.hh | 2 +- dune/gfe/localgeodesicfestiffness.hh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dune/gfe/geodesicfeassembler.hh b/dune/gfe/geodesicfeassembler.hh index bf1593c9..2a13170a 100644 --- a/dune/gfe/geodesicfeassembler.hh +++ b/dune/gfe/geodesicfeassembler.hh @@ -126,7 +126,7 @@ assembleMatrix(const std::vector<TargetSpace>& sol, localSolution[i] = sol[indexSet.subIndex(*it,i,gridDim)]; // setup matrix - localStiffness_->assemble(*it, localSolution); + localStiffness_->assembleHessian(*it, localSolution); // Add element matrix to global stiffness matrix for(int i=0; i<numOfBaseFct; i++) { diff --git a/dune/gfe/localgeodesicfestiffness.hh b/dune/gfe/localgeodesicfestiffness.hh index ae0786d0..f2a2239c 100644 --- a/dune/gfe/localgeodesicfestiffness.hh +++ b/dune/gfe/localgeodesicfestiffness.hh @@ -102,7 +102,7 @@ public: This default implementation used finite-difference approximations to compute the second derivatives */ - virtual void assemble(const Entity& e, + virtual void assembleHessian(const Entity& e, const std::vector<TargetSpace>& localSolution); virtual RT energy (const Entity& e, @@ -158,7 +158,7 @@ assembleGradient(const Entity& element, template <class GridView, class TargetSpace> void LocalGeodesicFEStiffness<GridView,TargetSpace>:: -assemble(const Entity& element, +assembleHessian(const Entity& element, const std::vector<TargetSpace>& localSolution) { // 1 degree of freedom per element vertex @@ -338,7 +338,7 @@ public: This default implementation used finite-difference approximations to compute the second derivatives */ - virtual void assemble(const Entity& e, + virtual void assembleHessian(const Entity& e, const std::vector<TargetSpace>& localSolution); virtual RT energy (const Entity& e, @@ -484,7 +484,7 @@ assembleGradient(const Entity& element, // /////////////////////////////////////////////////////////// template <class GridType, int dim> void LocalGeodesicFEStiffness<GridType,UnitVector<dim> >:: -assemble(const Entity& element, +assembleHessian(const Entity& element, const std::vector<TargetSpace>& localSolution) { // 1 degree of freedom per element vertex -- GitLab