From 3b3b8bd4d563b496f82abc6bcf78089bec72b211 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Tue, 22 Nov 2011 18:20:58 +0100
Subject: [PATCH] Drop Dune:: from headers
---
dune/tectonic/globallaursennonlinearity.hh | 6 +++---
dune/tectonic/globalruinanonlinearity.hh | 8 ++++----
dune/tectonic/localnonlinearity.hh | 4 ++--
dune/tectonic/samplefunctional.hh | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dune/tectonic/globallaursennonlinearity.hh b/dune/tectonic/globallaursennonlinearity.hh
index 6d9d1ddc..66a601b0 100644
--- a/dune/tectonic/globallaursennonlinearity.hh
+++ b/dune/tectonic/globallaursennonlinearity.hh
@@ -13,11 +13,11 @@
namespace Dune {
template <int dim, class OuterFunctionType>
-class GlobalLaursenNonlinearity : public Dune::GlobalNonlinearity<dim> {
+class GlobalLaursenNonlinearity : public GlobalNonlinearity<dim> {
public:
GlobalLaursenNonlinearity(
std::vector<double> const &mu, std::vector<double> const &normalStress,
- std::vector<Dune::FieldVector<double, 1>> const &nodalIntegrals)
+ std::vector<FieldVector<double, 1>> const &nodalIntegrals)
: mu(mu), normalStress(normalStress), nodalIntegrals(nodalIntegrals) {}
/*
@@ -50,7 +50,7 @@ class GlobalLaursenNonlinearity : public Dune::GlobalNonlinearity<dim> {
// results
std::vector<double> mu;
std::vector<double> normalStress;
- std::vector<Dune::FieldVector<double, 1>> nodalIntegrals;
+ std::vector<FieldVector<double, 1>> nodalIntegrals;
};
}
#endif
diff --git a/dune/tectonic/globalruinanonlinearity.hh b/dune/tectonic/globalruinanonlinearity.hh
index 249be621..fa13f422 100644
--- a/dune/tectonic/globalruinanonlinearity.hh
+++ b/dune/tectonic/globalruinanonlinearity.hh
@@ -12,10 +12,10 @@
namespace Dune {
template <int dim>
-class GlobalRuinaNonlinearity : public Dune::GlobalNonlinearity<dim> {
+class GlobalRuinaNonlinearity : public GlobalNonlinearity<dim> {
public:
GlobalRuinaNonlinearity(
- std::vector<Dune::FieldVector<double, 1>> const &nodalIntegrals,
+ std::vector<FieldVector<double, 1>> const &nodalIntegrals,
std::vector<double> const &a, std::vector<double> const &mu,
std::vector<double> const &eta, std::vector<double> const &normalStress)
: nodalIntegrals(nodalIntegrals),
@@ -33,7 +33,7 @@ class GlobalRuinaNonlinearity : public Dune::GlobalNonlinearity<dim> {
if (nodalIntegrals[i][0] == 0)
return trivialNonlinearity;
- shared_ptr<NiceFunction const> const func(new Dune::RuinaFunction(
+ shared_ptr<NiceFunction const> const func(new RuinaFunction(
nodalIntegrals[i][0], a[i], mu[i], eta[i], normalStress[i]));
return shared_ptr<LocalNonlinearity<dim>>(new LocalNonlinearity<dim>(func));
}
@@ -41,7 +41,7 @@ class GlobalRuinaNonlinearity : public Dune::GlobalNonlinearity<dim> {
private:
shared_ptr<LocalNonlinearity<dim> const> const trivialNonlinearity;
- std::vector<Dune::FieldVector<double, 1>> nodalIntegrals;
+ std::vector<FieldVector<double, 1>> nodalIntegrals;
std::vector<double> a;
std::vector<double> mu;
std::vector<double> eta;
diff --git a/dune/tectonic/localnonlinearity.hh b/dune/tectonic/localnonlinearity.hh
index 0d5b5b78..2e14e1c2 100644
--- a/dune/tectonic/localnonlinearity.hh
+++ b/dune/tectonic/localnonlinearity.hh
@@ -18,7 +18,7 @@ template <int dimension> class LocalNonlinearity {
typedef FieldVector<double, dimension> VectorType;
typedef FieldMatrix<double, dimension, dimension> MatrixType;
- LocalNonlinearity(Dune::shared_ptr<NiceFunction const> func) : func_(func) {}
+ LocalNonlinearity(shared_ptr<NiceFunction const> func) : func_(func) {}
double operator()(VectorType const x) const {
double ret;
@@ -63,7 +63,7 @@ template <int dimension> class LocalNonlinearity {
}
private:
- Dune::shared_ptr<NiceFunction const> const func_;
+ shared_ptr<NiceFunction const> const func_;
};
}
#endif
diff --git a/dune/tectonic/samplefunctional.hh b/dune/tectonic/samplefunctional.hh
index d042d9e7..2a6206f1 100644
--- a/dune/tectonic/samplefunctional.hh
+++ b/dune/tectonic/samplefunctional.hh
@@ -218,7 +218,7 @@ void minimise(Functional const J, typename Functional::SmallVector &x,
Bisection slowBisection(bisection);
slowBisection.setFastQuadratic(false);
- typedef Dune::CurvedFunction<LocalNonlinearityType> MyCurvedFunctionType;
+ typedef CurvedFunction<LocalNonlinearityType> MyCurvedFunctionType;
MyCurvedFunctionType JRest(J.A, J.b, phi, x, descDir);
int count;
--
GitLab