From 88c8c05ce466510f15f17290f3d46aac8ac7dfa3 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Thu, 3 Nov 2011 01:49:45 +0100
Subject: [PATCH] MyGlobalNonlinearity -> GlobalNonlinearity
---
.../{myglobalnonlinearity.hh => globalnonlinearity.hh} | 8 ++++----
dune/tectonic/myconvexproblem.hh | 6 +++---
src/one-body-sample.cc | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
rename dune/tectonic/{myglobalnonlinearity.hh => globalnonlinearity.hh} (86%)
diff --git a/dune/tectonic/myglobalnonlinearity.hh b/dune/tectonic/globalnonlinearity.hh
similarity index 86%
rename from dune/tectonic/myglobalnonlinearity.hh
rename to dune/tectonic/globalnonlinearity.hh
index 80f4c69d..2dc0a29b 100644
--- a/dune/tectonic/myglobalnonlinearity.hh
+++ b/dune/tectonic/globalnonlinearity.hh
@@ -1,16 +1,16 @@
/* -*- 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)
diff --git a/dune/tectonic/myconvexproblem.hh b/dune/tectonic/myconvexproblem.hh
index 3053151e..7d7302f0 100644
--- a/dune/tectonic/myconvexproblem.hh
+++ b/dune/tectonic/myconvexproblem.hh
@@ -1,6 +1,6 @@
// 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;
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 9a09140d..f93b5b50 100644
--- a/src/one-body-sample.cc
+++ b/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;
--
GitLab