diff --git a/dune/gfe/rigidbodymotion.hh b/dune/gfe/rigidbodymotion.hh index ed3ef3e3ffd7f09802e5480919c7b03751917d0a..a68e796f2277b2ef07acac1dafb2e55b7ed8edd4 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 703ffa714de07e274fc1cebe6d0aa3786e3cda1c..0000000000000000000000000000000000000000 --- 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)