From 5e8f6610a27426473c4f76b0a4756b54f93df40e Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 9 Jan 2012 18:02:50 +0100
Subject: [PATCH] Drop obsolete template parameter
---
dune/tectonic/globallaursennonlinearity.hh | 6 +++---
dune/tectonic/globalnonlinearity.hh | 2 +-
dune/tectonic/globalruinanonlinearity.hh | 6 +++---
dune/tectonic/myblockproblem.hh | 10 ++++++----
dune/tectonic/myconvexproblem.hh | 9 ++++-----
src/one-body-sample.cc | 17 ++++++++---------
6 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/dune/tectonic/globallaursennonlinearity.hh b/dune/tectonic/globallaursennonlinearity.hh
index 84e13def..ff8f3034 100644
--- a/dune/tectonic/globallaursennonlinearity.hh
+++ b/dune/tectonic/globallaursennonlinearity.hh
@@ -13,11 +13,11 @@
#include "nicefunction.hh"
namespace Dune {
-template <int dimZ, class OuterFunctionType, class VectorType, class MatrixType>
+template <class OuterFunctionType, class VectorType, class MatrixType>
class GlobalLaursenNonlinearity
- : public GlobalNonlinearity<dimZ, VectorType, MatrixType> {
+ : public GlobalNonlinearity<VectorType, MatrixType> {
public:
- using GlobalNonlinearity<dimZ, VectorType, MatrixType>::dim;
+ using GlobalNonlinearity<VectorType, MatrixType>::dim;
GlobalLaursenNonlinearity(
shared_ptr<BlockVector<FieldVector<double, 1>> const> mu,
diff --git a/dune/tectonic/globalnonlinearity.hh b/dune/tectonic/globalnonlinearity.hh
index 64e3178c..d64d04bd 100644
--- a/dune/tectonic/globalnonlinearity.hh
+++ b/dune/tectonic/globalnonlinearity.hh
@@ -12,7 +12,7 @@
#include "localnonlinearity.hh"
namespace Dune {
-template <int dimX, class VectorTypeTEMPLATE, class MatrixTypeTEMPLATE>
+template <class VectorTypeTEMPLATE, class MatrixTypeTEMPLATE>
class GlobalNonlinearity {
public:
typedef VectorTypeTEMPLATE VectorType;
diff --git a/dune/tectonic/globalruinanonlinearity.hh b/dune/tectonic/globalruinanonlinearity.hh
index c4229812..0edc2361 100644
--- a/dune/tectonic/globalruinanonlinearity.hh
+++ b/dune/tectonic/globalruinanonlinearity.hh
@@ -14,11 +14,11 @@
#include "nicefunction.hh"
namespace Dune {
-template <int dimX, class VectorType, class MatrixType>
+template <class VectorType, class MatrixType>
class GlobalRuinaNonlinearity
- : public GlobalNonlinearity<dimX, VectorType, MatrixType> {
+ : public GlobalNonlinearity<VectorType, MatrixType> {
public:
- using GlobalNonlinearity<dimX, VectorType, MatrixType>::dim;
+ using GlobalNonlinearity<VectorType, MatrixType>::dim;
GlobalRuinaNonlinearity(
shared_ptr<BlockVector<FieldVector<double, 1>> const> nodalIntegrals,
diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh
index 92937712..3ff9d2b6 100644
--- a/dune/tectonic/myblockproblem.hh
+++ b/dune/tectonic/myblockproblem.hh
@@ -19,7 +19,7 @@
template <int dim, class VectorType, class MatrixType>
double computeEnergy(
MatrixType const &A, VectorType const &b,
- Dune::GlobalNonlinearity<dim, VectorType, MatrixType> const &phi,
+ Dune::GlobalNonlinearity<VectorType, MatrixType> const &phi,
VectorType const &x) {
double ret;
VectorType tmp(x.size());
@@ -124,8 +124,10 @@ template <class MyConvexProblemTypeTEMPLATE> class MyBlockProblem {
*/
MyDirectionalConvexFunction<
- Dune::GlobalNonlinearity<block_size, VectorType, MatrixType>> const
- psi(localA, localb, problem.phi, u, v);
+ Dune::GlobalNonlinearity<VectorType, MatrixType>> const psi(localA,
+ localb,
+ problem.phi,
+ u, v);
Interval<double> D;
psi.subDiff(0, D);
@@ -199,7 +201,7 @@ template <class MyConvexProblemTypeTEMPLATE> class MyBlockProblem {
double const localb = tmp * direction; // <Av,v>
MyDirectionalConvexFunction<
- Dune::GlobalNonlinearity<block_size, VectorType, MatrixType>> const
+ Dune::GlobalNonlinearity<VectorType, MatrixType>> const
psi(localA, localb, problem.phi, u, direction);
Interval<double> D;
diff --git a/dune/tectonic/myconvexproblem.hh b/dune/tectonic/myconvexproblem.hh
index 48b45d72..2febf31a 100644
--- a/dune/tectonic/myconvexproblem.hh
+++ b/dune/tectonic/myconvexproblem.hh
@@ -21,14 +21,13 @@ class MyConvexProblem {
\param f The linear functional
\param u The solution vector
*/
- MyConvexProblem(
- MatrixType const &A,
- Dune::GlobalNonlinearity<block_size, VectorType, MatrixType> const &phi,
- VectorType const &f)
+ MyConvexProblem(MatrixType const &A,
+ Dune::GlobalNonlinearity<VectorType, MatrixType> const &phi,
+ VectorType const &f)
: A(A), phi(phi), f(f) {};
MatrixType const &A;
- Dune::GlobalNonlinearity<block_size, VectorType, MatrixType> const φ
+ Dune::GlobalNonlinearity<VectorType, MatrixType> const φ
VectorType const &f;
};
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index e0f44bf8..5ba0d2fe 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -139,8 +139,8 @@ void assemble_frictional(
template <class VectorType, class MatrixType>
void assemble_nonlinearity(
int size, Dune::ParameterTree const &parset,
- Dune::shared_ptr<Dune::GlobalNonlinearity<
- dim, VectorType, MatrixType> const> &myGlobalNonlinearity,
+ Dune::shared_ptr<Dune::GlobalNonlinearity<VectorType, MatrixType> const> &
+ myGlobalNonlinearity,
Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>>
nodalIntegrals) {
typedef Dune::BlockVector<Dune::FieldVector<double, 1>> SingletonVectorType;
@@ -162,13 +162,12 @@ void assemble_nonlinearity(
*eta = parset.get<double>("boundary.friction.eta");
myGlobalNonlinearity = Dune::make_shared<
- Dune::GlobalRuinaNonlinearity<dim, VectorType, MatrixType> const>(
+ Dune::GlobalRuinaNonlinearity<VectorType, MatrixType> const>(
nodalIntegrals, a, mu, eta, normalStress);
} else if (friction_model == std::string("Laursen")) {
- myGlobalNonlinearity = Dune::make_shared<
- Dune::GlobalLaursenNonlinearity<dim, Dune::LinearFunction, VectorType,
- MatrixType> const>(mu, normalStress,
- nodalIntegrals);
+ myGlobalNonlinearity = Dune::make_shared<Dune::GlobalLaursenNonlinearity<
+ Dune::LinearFunction, VectorType, MatrixType> const>(mu, normalStress,
+ nodalIntegrals);
} else {
assert(false);
}
@@ -269,8 +268,8 @@ int main(int argc, char *argv[]) {
assemble_frictional<GridType, GridView, SmallVector, P1Basis>(
leafView, p1Basis, frictionalNodes, *nodalIntegrals);
- Dune::shared_ptr<Dune::GlobalNonlinearity<
- dim, VectorType, OperatorType> const> myGlobalNonlinearity;
+ Dune::shared_ptr<Dune::GlobalNonlinearity<VectorType, OperatorType> const>
+ myGlobalNonlinearity;
assemble_nonlinearity<VectorType, OperatorType>(
grid.size(grid.maxLevel(), dim), parset, myGlobalNonlinearity,
nodalIntegrals);
--
GitLab