From ccaf796291e469c412fee8452419d30edcca5aaf Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 31 May 2013 18:18:52 +0200
Subject: [PATCH] Make as little virtual as possible
---
dune/tectonic/frictionpotential.hh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/dune/tectonic/frictionpotential.hh b/dune/tectonic/frictionpotential.hh
index a46b1ba5..35e7f693 100644
--- a/dune/tectonic/frictionpotential.hh
+++ b/dune/tectonic/frictionpotential.hh
@@ -48,7 +48,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
// which would avoid the std::exp(std::log())
{}
- double virtual evaluate(double V) const {
+ double evaluate(double V) const {
assert(V >= 0);
if (V <= V_m)
return 0;
@@ -59,7 +59,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
// log(V/V_m) if V >= V_0
// 0 otherwise
- double virtual differential(double V) const {
+ double differential(double V) const {
assert(V >= 0);
if (V <= V_m)
return 0;
@@ -70,7 +70,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
// 1/V if V > V_0
// undefined if V == V_0
// 0 if V < V_0
- double virtual second_deriv(double V) const {
+ double second_deriv(double V) const {
assert(V >= 0);
if (V <= V_m)
return 0;
@@ -78,7 +78,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
return coefficientProduct / V;
}
- double virtual regularity(double V) const {
+ double regularity(double V) const {
assert(V >= 0);
// TODO: Make this controllable
if (std::abs(V - V_m) < 1e-14)
@@ -87,7 +87,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
return std::abs(second_deriv(V));
}
- double virtual smallestPositivePoint() const { return V_m; }
+ double smallestPositivePoint() const { return V_m; }
private:
double const coefficientProduct;
@@ -96,15 +96,15 @@ class FrictionPotential : public FrictionPotentialWrapper {
class TrivialFunction : public FrictionPotentialWrapper {
public:
- double virtual evaluate(double) const { return 0; }
+ double evaluate(double) const { return 0; }
- double virtual differential(double) const { return 0; }
+ double differential(double) const { return 0; }
- double virtual second_deriv(double) const { return 0; }
+ double second_deriv(double) const { return 0; }
- double virtual regularity(double) const { return 0; }
+ double regularity(double) const { return 0; }
- double virtual smallestPositivePoint() const {
+ double smallestPositivePoint() const {
return std::numeric_limits<double>::infinity();
}
};
--
GitLab