MyGlobalNonlinearity -> GlobalNonlinearity

dune/tectonic/myglobalnonlinearity.hh → dune/tectonic/globalnonlinearity.hh

 /* -*- mode:c++; mode:semantic -*- */
 
-#ifndef MY_GLOBAL_NONLINEARITY_HH
-#define MY_GLOBAL_NONLINEARITY_HH
+#ifndef GLOBAL_NONLINEARITY_HH
+#define GLOBAL_NONLINEARITY_HH
 
 //#include <dune/common/bitsetvector.hh>
 #include <dune/common/fvector.hh>
 #include <dune/tectonic/mynonlinearity.hh>
 
 namespace Dune {
-template <int dim, class OuterFunctionType> class MyGlobalNonlinearity {
+template <int dim, class OuterFunctionType> class GlobalNonlinearity {
 public:
-  MyGlobalNonlinearity(
+  GlobalNonlinearity(
       std::vector<double> const &coefficientOfFriction,
       std::vector<double> const &normalStress,
       std::vector<Dune::FieldVector<double, 1>> const &nodalIntegrals)

dune/tectonic/myconvexproblem.hh

 // Based on dune/tnnmg/problem-classes/convexproblem.hh
 
-#include <dune/tectonic/myglobalnonlinearity.hh>
+#include <dune/tectonic/globalnonlinearity.hh>
 
 #ifndef MY_CONVEX_PROBLEM_HH
 #define MY_CONVEX_PROBLEM_HH
@@ -29,12 +29,12 @@ class MyConvexProblem {
       \param u The solution vector
   */
   MyConvexProblem(MatrixType const &A,
-                  Dune::MyGlobalNonlinearity<block_size, FunctionType> &newphi,
+                  Dune::GlobalNonlinearity<block_size, FunctionType> &newphi,
                   VectorType const &f, VectorType &u)
       : A(A), newphi(newphi), f(f), u(u) {};
 
   MatrixType const &A;
-  Dune::MyGlobalNonlinearity<block_size, FunctionType> const &newphi;
+  Dune::GlobalNonlinearity<block_size, FunctionType> const &newphi;
 
   VectorType const &f;
 

src/one-body-sample.cc

@@ -34,7 +34,7 @@
 #include <dune/solvers/norms/energynorm.hh>
 #include <dune/solvers/solvers/loopsolver.hh>
 
-#include <dune/tectonic/myglobalnonlinearity.hh>
+#include <dune/tectonic/globalnonlinearity.hh>
 #include <dune/tectonic/myconvexproblem.hh>
 #include <dune/tectonic/myblockproblem.hh>
 
@@ -184,8 +184,8 @@ int main() {
           true); // resize the output vector and zero all of its entries
 
       // FIXME: We should be using S_F instead of S_N here
-      Dune::MyGlobalNonlinearity<dim, Dune::LinearFunction>
-      myGlobalNonlinearity(coefficientOfFriction, normalStress, nodalIntegrals);
+      Dune::GlobalNonlinearity<dim, Dune::LinearFunction> myGlobalNonlinearity(
+          coefficientOfFriction, normalStress, nodalIntegrals);
 
       { // constant 2D function
         std::vector<SmallVector> b;