diff --git a/src/sand-wedge-data/mybody.hh b/src/sand-wedge-data/mybody.hh index a40f79a6cc8436b291c6d5a8e8c7214423cb0a61..6e3e8debbc96323f192fbbeaf3e9bc2eca81aeab 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 0454d6fc42f46a1d875ea643cc3e7faf3ed41bcf..6660a59686ff71987e77be342396844e2347ef72 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 {