From b81b9ff7a6f09fb8706595dba97b4001596fc5b9 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Mon, 7 Oct 2019 22:15:49 +0200
Subject: [PATCH] Rename HarmonicEnergyLocalStiffness to HarmonicEnergy
Because it really is only an energy.
---
dune/gfe/harmonicenergy.hh | 6 +++---
src/gradient-flow.cc | 2 +-
src/harmonicmaps.cc | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dune/gfe/harmonicenergy.hh b/dune/gfe/harmonicenergy.hh
index d4558d21..457e3291 100644
--- a/dune/gfe/harmonicenergy.hh
+++ b/dune/gfe/harmonicenergy.hh
@@ -7,7 +7,7 @@
#include <dune/gfe/localenergy.hh>
template<class Basis, class LocalInterpolationRule, class TargetSpace>
-class HarmonicEnergyLocalStiffness
+class HarmonicEnergy
: public Dune::GFE::LocalEnergy<Basis,TargetSpace>
{
// grid types
@@ -27,8 +27,8 @@ public:
};
template <class Basis, class LocalInterpolationRule, class TargetSpace>
-typename HarmonicEnergyLocalStiffness<Basis, LocalInterpolationRule, TargetSpace>::RT
-HarmonicEnergyLocalStiffness<Basis, LocalInterpolationRule, TargetSpace>::
+typename HarmonicEnergy<Basis, LocalInterpolationRule, TargetSpace>::RT
+HarmonicEnergy<Basis, LocalInterpolationRule, TargetSpace>::
energy(const typename Basis::LocalView& localView,
const std::vector<TargetSpace>& localSolution) const
{
diff --git a/src/gradient-flow.cc b/src/gradient-flow.cc
index 133390bf..e9c32fb1 100644
--- a/src/gradient-flow.cc
+++ b/src/gradient-flow.cc
@@ -203,7 +203,7 @@ int main (int argc, char *argv[]) try
std::vector<std::shared_ptr<GFE::LocalEnergy<FEBasis,ATargetSpace> > > addends(2);
using GeodesicInterpolationRule = LocalGeodesicFEFunction<dim, double, FEBasis::LocalView::Tree::FiniteElement, ATargetSpace>;
- addends[0] = std::make_shared<HarmonicEnergyLocalStiffness<FEBasis, GeodesicInterpolationRule, ATargetSpace> >();
+ addends[0] = std::make_shared<HarmonicEnergy<FEBasis, GeodesicInterpolationRule, ATargetSpace> >();
addends[1] = l2DistanceSquaredEnergy;
std::vector<double> weights = {1.0, 1.0/(2*timeStepSize)};
diff --git a/src/harmonicmaps.cc b/src/harmonicmaps.cc
index 132ec020..e8c84d8b 100644
--- a/src/harmonicmaps.cc
+++ b/src/harmonicmaps.cc
@@ -278,9 +278,9 @@ int main (int argc, char *argv[])
if (energy == "harmonic")
{
if (parameterSet["interpolationMethod"] == "geodesic")
- localEnergy.reset(new HarmonicEnergyLocalStiffness<FEBasis, GeodesicInterpolationRule, ATargetSpace>);
+ localEnergy.reset(new HarmonicEnergy<FEBasis, GeodesicInterpolationRule, ATargetSpace>);
else if (parameterSet["interpolationMethod"] == "projected")
- localEnergy.reset(new HarmonicEnergyLocalStiffness<FEBasis, ProjectedInterpolationRule, ATargetSpace>);
+ localEnergy.reset(new HarmonicEnergy<FEBasis, ProjectedInterpolationRule, ATargetSpace>);
else
DUNE_THROW(Exception, "Unknown interpolation method " << parameterSet["interpolationMethod"] << " requested!");
--
GitLab