From 963c6d746e34fa6c9f94e03fdd2ced62c3a4f0ea Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sat, 11 Apr 2015 15:45:07 +0200
Subject: [PATCH] [Cleanup] Rename: TwoPieceFunc. -> SegmentedFunc.
---
src/sand-wedge-data/mybody.hh | 8 ++++----
.../{twopiece.hh => segmented-function.hh} | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
rename src/sand-wedge-data/{twopiece.hh => segmented-function.hh} (82%)
diff --git a/src/sand-wedge-data/mybody.hh b/src/sand-wedge-data/mybody.hh
index a40f79a6..6e3e8deb 100644
--- a/src/sand-wedge-data/mybody.hh
+++ b/src/sand-wedge-data/mybody.hh
@@ -8,8 +8,8 @@
#include <dune/tectonic/body.hh>
#include <dune/tectonic/gravity.hh>
-#include "twopiece.hh"
#include "mygeometry.hh"
+#include "segmented-function.hh"
template <int dimension> class MyBody : public Body<dimension> {
using typename Body<dimension>::ScalarFunction;
@@ -47,9 +47,9 @@ template <int dimension> class MyBody : public Body<dimension> {
private:
double const poissonRatio_;
double const youngModulus_;
- TwoPieceFunction const shearViscosityField_;
- TwoPieceFunction const bulkViscosityField_;
- TwoPieceFunction const densityField_;
+ SegmentedFunction const shearViscosityField_;
+ SegmentedFunction const bulkViscosityField_;
+ SegmentedFunction const densityField_;
Gravity<dimension> const gravityField_;
};
#endif
diff --git a/src/sand-wedge-data/twopiece.hh b/src/sand-wedge-data/segmented-function.hh
similarity index 82%
rename from src/sand-wedge-data/twopiece.hh
rename to src/sand-wedge-data/segmented-function.hh
index 0454d6fc..6660a596 100644
--- a/src/sand-wedge-data/twopiece.hh
+++ b/src/sand-wedge-data/segmented-function.hh
@@ -1,5 +1,5 @@
-#ifndef SRC_SAND_WEDGE_DATA_TWOPIECE_HH
-#define SRC_SAND_WEDGE_DATA_TWOPIECE_HH
+#ifndef SRC_SAND_WEDGE_DATA_SEGMENTED_FUNCTION_HH
+#define SRC_SAND_WEDGE_DATA_SEGMENTED_FUNCTION_HH
#include <dune/common/function.hh>
#include <dune/common/fvector.hh>
@@ -7,7 +7,7 @@
#include "mygeometry.hh"
-class TwoPieceFunction
+class SegmentedFunction
: public Dune::VirtualFunction<Dune::FieldVector<double, MY_DIM>,
Dune::FieldVector<double, 1>> {
private:
@@ -24,7 +24,7 @@ class TwoPieceFunction
double const _v2;
public:
- TwoPieceFunction(double v1, double v2) : _v1(v1), _v2(v2) {}
+ SegmentedFunction(double v1, double v2) : _v1(v1), _v2(v2) {}
void evaluate(Dune::FieldVector<double, MY_DIM> const &x,
Dune::FieldVector<double, 1> &y) const {
--
GitLab