From 3714cd8137eabf37d5595184f1dcf28864710dca Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sun, 5 Jan 2014 17:46:58 +0100
Subject: [PATCH] [Cleanup] virtual keyword
---
dune/tectonic/globalnonlinearity.hh | 4 ++--
src/state/dieterichstateupdater.hh | 8 ++++----
src/state/ruinastateupdater.hh | 8 ++++----
src/state/stateupdater.hh | 8 ++++----
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dune/tectonic/globalnonlinearity.hh b/dune/tectonic/globalnonlinearity.hh
index 7318a85b..55311622 100644
--- a/dune/tectonic/globalnonlinearity.hh
+++ b/dune/tectonic/globalnonlinearity.hh
@@ -34,7 +34,7 @@ template <class Matrix, class Vector> class GlobalNonlinearity {
/*
Return a restriction of the outer function to the i'th node.
*/
- virtual std::shared_ptr<LocalFriction<block_size>> restriction(size_t i)
+ std::shared_ptr<LocalFriction<block_size>> virtual restriction(size_t i)
const = 0;
void addHessian(Vector const &v, Matrix &hessian) const {
@@ -79,6 +79,6 @@ template <class Matrix, class Vector> class GlobalNonlinearity {
return res->regularity(x);
}
- virtual void updateLogState(ScalarVector const &logState) = 0;
+ void virtual updateLogState(ScalarVector const &logState) = 0;
};
#endif
diff --git a/src/state/dieterichstateupdater.hh b/src/state/dieterichstateupdater.hh
index 13f2b62c..cd28d978 100644
--- a/src/state/dieterichstateupdater.hh
+++ b/src/state/dieterichstateupdater.hh
@@ -10,10 +10,10 @@ class DieterichStateUpdater : public StateUpdater<ScalarVector, Vector> {
DieterichStateUpdater(ScalarVector _logState_initial,
Dune::BitSetVector<1> const &_nodes, double _L);
- virtual void nextTimeStep();
- virtual void setup(double _tau);
- virtual void solve(Vector const &velocity_field);
- virtual void extractLogState(ScalarVector &);
+ void virtual nextTimeStep();
+ void virtual setup(double _tau);
+ void virtual solve(Vector const &velocity_field);
+ void virtual extractLogState(ScalarVector &);
private:
ScalarVector logState_o;
diff --git a/src/state/ruinastateupdater.hh b/src/state/ruinastateupdater.hh
index ea39530e..18604f99 100644
--- a/src/state/ruinastateupdater.hh
+++ b/src/state/ruinastateupdater.hh
@@ -10,10 +10,10 @@ class RuinaStateUpdater : public StateUpdater<ScalarVector, Vector> {
RuinaStateUpdater(ScalarVector _logState_initial,
Dune::BitSetVector<1> const &_nodes, double _L);
- virtual void nextTimeStep();
- virtual void setup(double _tau);
- virtual void solve(Vector const &velocity_field);
- virtual void extractLogState(ScalarVector &);
+ void virtual nextTimeStep();
+ void virtual setup(double _tau);
+ void virtual solve(Vector const &velocity_field);
+ void virtual extractLogState(ScalarVector &);
private:
ScalarVector logState_o;
diff --git a/src/state/stateupdater.hh b/src/state/stateupdater.hh
index bc7ed84d..9ff93756 100644
--- a/src/state/stateupdater.hh
+++ b/src/state/stateupdater.hh
@@ -3,10 +3,10 @@
template <class ScalarVector, class Vector> class StateUpdater {
public:
- virtual void nextTimeStep() = 0;
- virtual void setup(double _tau) = 0;
- virtual void solve(Vector const &velocity_field) = 0;
- virtual void extractLogState(ScalarVector &logState) = 0;
+ void virtual nextTimeStep() = 0;
+ void virtual setup(double _tau) = 0;
+ void virtual solve(Vector const &velocity_field) = 0;
+ void virtual extractLogState(ScalarVector &logState) = 0;
};
#endif
--
GitLab