Skip to content
Snippets Groups Projects
Commit 26091daf authored by Oliver Sander's avatar Oliver Sander Committed by sander@PCPOOL.MI.FU-BERLIN.DE
Browse files

use Rotation class instead of Quaternion

[[Imported from SVN: r3488]]
parent 9e6d3de5
No related branches found
No related tags found
No related merge requests found
......@@ -2,7 +2,7 @@
#define CONFIGURATION_HH
#include <dune/common/fvector.hh>
#include "quaternion.hh"
#include "rotation.hh"
/** \brief Configuration of a nonlinear rod in 3d */
struct Configuration
......@@ -11,7 +11,7 @@ struct Configuration
Dune::FieldVector<double,3> r;
// Rotational part
Quaternion<double> q;
Rotation<3,double> q;
};
......
......@@ -167,7 +167,7 @@ public:
if (i<3)
c.r[i] += eps;
else
c.q = c.q.mult(Quaternion<double>::exp((i==3)*eps,
c.q = c.q.mult(Rotation<3,double>::exp((i==3)*eps,
(i==4)*eps,
(i==5)*eps));
}
......@@ -194,7 +194,7 @@ public:
referenceConfiguration_[idx].r[0] = 0;
referenceConfiguration_[idx].r[1] = 0;
referenceConfiguration_[idx].r[2] = it->geometry().corner(0)[0];
referenceConfiguration_[idx].q = Quaternion<double>::identity();
referenceConfiguration_[idx].q = Rotation<3,double>::identity();
}
}
......
......@@ -70,7 +70,7 @@ void RodSolver<GridType>::setup(const GridType& grid,
EnergyNorm<MatrixType, CorrectionType>* baseEnergyNorm = new EnergyNorm<MatrixType, CorrectionType>(*baseSolverStep);
LoopSolver<CorrectionType>* baseSolver = new LoopSolver<CorrectionType>(baseSolverStep,
::LoopSolver<CorrectionType>* baseSolver = new ::LoopSolver<CorrectionType>(baseSolverStep,
baseIt_,
baseTolerance_,
baseEnergyNorm,
......@@ -106,7 +106,7 @@ void RodSolver<GridType>::setup(const GridType& grid,
h1SemiNorm_ = new H1SemiNorm<CorrectionType>(**A);
mmgSolver_ = new LoopSolver<CorrectionType>(mmgStep,
mmgSolver_ = new ::LoopSolver<CorrectionType>(mmgStep,
multigridIterations_,
qpTolerance_,
h1SemiNorm_,
......@@ -318,7 +318,7 @@ void RodSolver<GridType>::solve()
newIterate[j].r[k] += corr[j][k];
// Add rotational correction
Quaternion<double> qCorr = Quaternion<double>::exp(corr[j][3], corr[j][4], corr[j][5]);
Rotation<3,double> qCorr = Rotation<3,double>::exp(corr[j][3], corr[j][4], corr[j][5]);
newIterate[j].q = newIterate[j].q.mult(qCorr);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment