Skip to content
Snippets Groups Projects
Commit 3a1ddbe2 authored by Elias Pipping's avatar Elias Pipping
Browse files

[Cleanup] Rename: Global{RuinaN. -> RateStateF.}

parent c6a767fd
No related branches found
No related tags found
No related merge requests found
#ifndef DUNE_TECTONIC_GLOBALRUINANONLINEARITY_HH #ifndef DUNE_TECTONIC_GLOBALRATESTATEFRICTION_HH
#define DUNE_TECTONIC_GLOBALRUINANONLINEARITY_HH #define DUNE_TECTONIC_GLOBALRATESTATEFRICTION_HH
#include <vector> #include <vector>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "frictionpotential.hh" #include "frictionpotential.hh"
template <class Matrix, class Vector, class GridView> template <class Matrix, class Vector, class GridView>
class GlobalRuinaNonlinearity : public GlobalFriction<Matrix, Vector> { class GlobalRateStateFriction : public GlobalFriction<Matrix, Vector> {
public: public:
using GlobalFriction<Matrix, Vector>::block_size; using GlobalFriction<Matrix, Vector>::block_size;
using typename GlobalFriction<Matrix, Vector>::Friction; using typename GlobalFriction<Matrix, Vector>::Friction;
...@@ -25,7 +25,7 @@ class GlobalRuinaNonlinearity : public GlobalFriction<Matrix, Vector> { ...@@ -25,7 +25,7 @@ class GlobalRuinaNonlinearity : public GlobalFriction<Matrix, Vector> {
using typename GlobalFriction<Matrix, Vector>::ScalarVector; using typename GlobalFriction<Matrix, Vector>::ScalarVector;
public: public:
GlobalRuinaNonlinearity(BoundaryPatch<GridView> const &frictionalBoundary, GlobalRateStateFriction(BoundaryPatch<GridView> const &frictionalBoundary,
GridView const &gridView, GridView const &gridView,
GlobalFrictionData<block_size> const &frictionInfo, GlobalFrictionData<block_size> const &frictionInfo,
// Note: passing the following two makes no sense // Note: passing the following two makes no sense
......
...@@ -122,7 +122,7 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity( ...@@ -122,7 +122,7 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity(
BoundaryPatch<GridView> const &frictionalBoundary, BoundaryPatch<GridView> const &frictionalBoundary,
GlobalFrictionData<dimension> const &frictionInfo, GlobalFrictionData<dimension> const &frictionInfo,
ScalarVector const &normalStress) ScalarVector const &normalStress)
-> std::shared_ptr<GlobalRuinaNonlinearity<Matrix, Vector, GridView>> { -> std::shared_ptr<GlobalRateStateFriction<Matrix, Vector, GridView>> {
// Lump negative normal stress (kludge) // Lump negative normal stress (kludge)
ScalarVector weights; ScalarVector weights;
{ {
...@@ -133,7 +133,7 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity( ...@@ -133,7 +133,7 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity(
vertexAssembler.assembleBoundaryFunctional(frictionalBoundaryAssembler, vertexAssembler.assembleBoundaryFunctional(frictionalBoundaryAssembler,
weights, frictionalBoundary); weights, frictionalBoundary);
} }
return std::make_shared<GlobalRuinaNonlinearity<Matrix, Vector, GridView>>( return std::make_shared<GlobalRateStateFriction<Matrix, Vector, GridView>>(
frictionalBoundary, gridView, frictionInfo, weights, normalStress); frictionalBoundary, gridView, frictionInfo, weights, normalStress);
} }
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <dune/fufem/functionspacebases/p1nodalbasis.hh> #include <dune/fufem/functionspacebases/p1nodalbasis.hh>
#include <dune/tectonic/globalfrictiondata.hh> #include <dune/tectonic/globalfrictiondata.hh>
#include <dune/tectonic/globalruinanonlinearity.hh> #include <dune/tectonic/globalratestatefriction.hh>
template <class GridView, int dimension> class MyAssembler { template <class GridView, int dimension> class MyAssembler {
public: public:
...@@ -75,7 +75,7 @@ template <class GridView, int dimension> class MyAssembler { ...@@ -75,7 +75,7 @@ template <class GridView, int dimension> class MyAssembler {
ScalarVector &normalStress, double youngModulus, ScalarVector &normalStress, double youngModulus,
double poissonRatio, Vector const &displacement); double poissonRatio, Vector const &displacement);
std::shared_ptr<GlobalRuinaNonlinearity<Matrix, Vector, GridView>> std::shared_ptr<GlobalRateStateFriction<Matrix, Vector, GridView>>
assembleFrictionNonlinearity( assembleFrictionNonlinearity(
BoundaryPatch<GridView> const &frictionalBoundary, BoundaryPatch<GridView> const &frictionalBoundary,
GlobalFrictionData<dimension> const &frictionInfo, GlobalFrictionData<dimension> const &frictionInfo,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment