diff --git a/dune/tectonic/globalruinanonlinearity.hh b/dune/tectonic/globalratestatefriction.hh similarity index 91% rename from dune/tectonic/globalruinanonlinearity.hh rename to dune/tectonic/globalratestatefriction.hh index 8045d25401549280fb601118296af7ce8cc242a2..6fdcfacd9f3f6ab77fc3682d21e9fc6739290d1d 100644 --- a/dune/tectonic/globalruinanonlinearity.hh +++ b/dune/tectonic/globalratestatefriction.hh @@ -1,5 +1,5 @@ -#ifndef DUNE_TECTONIC_GLOBALRUINANONLINEARITY_HH -#define DUNE_TECTONIC_GLOBALRUINANONLINEARITY_HH +#ifndef DUNE_TECTONIC_GLOBALRATESTATEFRICTION_HH +#define DUNE_TECTONIC_GLOBALRATESTATEFRICTION_HH #include <vector> @@ -16,7 +16,7 @@ #include "frictionpotential.hh" template <class Matrix, class Vector, class GridView> -class GlobalRuinaNonlinearity : public GlobalFriction<Matrix, Vector> { +class GlobalRateStateFriction : public GlobalFriction<Matrix, Vector> { public: using GlobalFriction<Matrix, Vector>::block_size; using typename GlobalFriction<Matrix, Vector>::Friction; @@ -25,7 +25,7 @@ class GlobalRuinaNonlinearity : public GlobalFriction<Matrix, Vector> { using typename GlobalFriction<Matrix, Vector>::ScalarVector; public: - GlobalRuinaNonlinearity(BoundaryPatch<GridView> const &frictionalBoundary, + GlobalRateStateFriction(BoundaryPatch<GridView> const &frictionalBoundary, GridView const &gridView, GlobalFrictionData<block_size> const &frictionInfo, // Note: passing the following two makes no sense diff --git a/src/assemblers.cc b/src/assemblers.cc index 6b2a7471cb53446845d77e430bff357d51d69f6f..1cd1d02fadb0b278d880da4048381926a450dc2e 100644 --- a/src/assemblers.cc +++ b/src/assemblers.cc @@ -122,7 +122,7 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity( BoundaryPatch<GridView> const &frictionalBoundary, GlobalFrictionData<dimension> const &frictionInfo, ScalarVector const &normalStress) - -> std::shared_ptr<GlobalRuinaNonlinearity<Matrix, Vector, GridView>> { + -> std::shared_ptr<GlobalRateStateFriction<Matrix, Vector, GridView>> { // Lump negative normal stress (kludge) ScalarVector weights; { @@ -133,7 +133,7 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity( vertexAssembler.assembleBoundaryFunctional(frictionalBoundaryAssembler, weights, frictionalBoundary); } - return std::make_shared<GlobalRuinaNonlinearity<Matrix, Vector, GridView>>( + return std::make_shared<GlobalRateStateFriction<Matrix, Vector, GridView>>( frictionalBoundary, gridView, frictionInfo, weights, normalStress); } diff --git a/src/assemblers.hh b/src/assemblers.hh index 96f983415f96a6b18046f221023a4f0c3ec549a7..2f944c71e4977b399db0b91438b6f203ab1a85cf 100644 --- a/src/assemblers.hh +++ b/src/assemblers.hh @@ -14,7 +14,7 @@ #include <dune/fufem/functionspacebases/p1nodalbasis.hh> #include <dune/tectonic/globalfrictiondata.hh> -#include <dune/tectonic/globalruinanonlinearity.hh> +#include <dune/tectonic/globalratestatefriction.hh> template <class GridView, int dimension> class MyAssembler { public: @@ -75,7 +75,7 @@ template <class GridView, int dimension> class MyAssembler { ScalarVector &normalStress, double youngModulus, double poissonRatio, Vector const &displacement); - std::shared_ptr<GlobalRuinaNonlinearity<Matrix, Vector, GridView>> + std::shared_ptr<GlobalRateStateFriction<Matrix, Vector, GridView>> assembleFrictionNonlinearity( BoundaryPatch<GridView> const &frictionalBoundary, GlobalFrictionData<dimension> const &frictionInfo,