[Cleanup] Move coefficientOfFriction() to GlobalF.

This allows us to return a GlobalFriction and thus hide some information

dune/tectonic/globalfriction.hh

@@ -82,6 +82,12 @@ template <class Matrix, class Vector> class GlobalFriction {
     return res->regularity(x);
   }
 
+  void coefficientOfFriction(Vector const &x, ScalarVector &coefficient) {
+    coefficient.resize(x.size());
+    for (size_t i = 0; i < x.size(); ++i)
+      coefficient[i] = restriction(i)->coefficientOfFriction(x[i]);
+  }
+
   void virtual updateAlpha(ScalarVector const &alpha) = 0;
 };
 #endif

dune/tectonic/globalratestatefriction.hh

@@ -56,13 +56,6 @@ class GlobalRateStateFriction : public GlobalFriction<Matrix, Vector> {
       restrictions[i]->updateAlpha(alpha[i]);
   }
 
-  void coefficientOfFriction(Vector const &x, ScalarVector &coefficient) {
-    assert(x.size() == restrictions.size());
-    coefficient.resize(restrictions.size());
-    for (size_t i = 0; i < restrictions.size(); ++i)
-      coefficient[i] = restrictions[i]->coefficientOfFriction(x[i]);
-  }
-
   /*
     Return a restriction of the outer function to the i'th node.
   */

src/assemblers.cc

@@ -17,6 +17,8 @@
 #include <dune/fufem/functions/constantfunction.hh>
 #include <dune/fufem/quadraturerules/quadraturerulecache.hh>
 
+#include <dune/tectonic/globalratestatefriction.hh>
+
 #include "assemblers.hh"
 
 template <class GridView, int dimension>
@@ -122,7 +124,7 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity(
     BoundaryPatch<GridView> const &frictionalBoundary,
     GlobalFrictionData<dimension> const &frictionInfo,
     ScalarVector const &normalStress)
-    -> std::shared_ptr<GlobalRateStateFriction<Matrix, Vector, GridView>> {
+    -> std::shared_ptr<GlobalFriction<Matrix, Vector>> {
   // Lump negative normal stress (kludge)
   ScalarVector weights;
   {

src/assemblers.hh

@@ -13,8 +13,8 @@
 #pragma clang diagnostic pop
 #include <dune/fufem/functionspacebases/p1nodalbasis.hh>
 
+#include <dune/tectonic/globalfriction.hh>
 #include <dune/tectonic/globalfrictiondata.hh>
-#include <dune/tectonic/globalratestatefriction.hh>
 
 template <class GridView, int dimension> class MyAssembler {
 public:
@@ -75,8 +75,7 @@ template <class GridView, int dimension> class MyAssembler {
                             ScalarVector &normalStress, double youngModulus,
                             double poissonRatio, Vector const &displacement);
 
-  std::shared_ptr<GlobalRateStateFriction<Matrix, Vector, GridView>>
-  assembleFrictionNonlinearity(
+  std::shared_ptr<GlobalFriction<Matrix, Vector>> assembleFrictionNonlinearity(
       BoundaryPatch<GridView> const &frictionalBoundary,
       GlobalFrictionData<dimension> const &frictionInfo,
       ScalarVector const &normalStress);