From aba4fd6aa46c121b269b1815c5a45331e760b138 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Sun, 21 Feb 2016 06:35:59 +0100
Subject: [PATCH] Replace 'Dune::is_same' by 'std::is_same'
---
dune/gfe/rigidbodymotion.hh | 2 +-
src/inverse-stereographic-projection.py | 17 -----------------
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 src/inverse-stereographic-projection.py
diff --git a/dune/gfe/rigidbodymotion.hh b/dune/gfe/rigidbodymotion.hh
index ed3ef3e3..a68e796f 100644
--- a/dune/gfe/rigidbodymotion.hh
+++ b/dune/gfe/rigidbodymotion.hh
@@ -88,7 +88,7 @@ public:
result.r[i] = p.r[i] + v[i];
// Add rotational correction
- typedef typename std::conditional<Dune::is_same<TVector,TangentVector>::value,
+ typedef typename std::conditional<std::is_same<TVector,TangentVector>::value,
typename Rotation<ctype,N>::TangentVector,
typename Rotation<ctype,N>::EmbeddedTangentVector>::type RotationTangentVector;
RotationTangentVector qCorr;
diff --git a/src/inverse-stereographic-projection.py b/src/inverse-stereographic-projection.py
deleted file mode 100644
index 703ffa71..00000000
--- a/src/inverse-stereographic-projection.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# The inverse stereographic projection through the north pole, and its derivative
-def f(x):
- normSquared = x[0]*x[0]+x[1]*x[1]
- return [2*x[0] / (normSquared+1), 2*x[1] / (normSquared+1), (normSquared-1)/ (normSquared+1)]
- #a = 20
- #normSquared = a*a*(x[0]*x[0]+x[1]*x[1])
- #return [a*2*x[0] / (normSquared+1), a*2*x[1] / (normSquared+1), (normSquared-1)/ (normSquared+1)]
-
-def df(x):
- normSquared = x[0]*x[0]+x[1]*x[1]
- denominator = (1+normSquared)*(1+normSquared)
-
- return (( (2*(1+normSquared) - 4*x[0]*x[0]) / denominator, (-4*x[0]*x[1]) / denominator),
- ( (-4*x[1]*x[0]) / denominator, (2*(1+normSquared) - 4*x[1]*x[1]) / denominator),
- (4*x[0]/denominator,4*x[1]/denominator))
-
-fdf = (f, df)
--
GitLab