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

replace RodAssembler<GridView> by RodAssembler<GridView,3>

[[Imported from SVN: r5722]]
parent 5c1c2d75
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,7 @@ template <class GridType> ...@@ -20,7 +20,7 @@ template <class GridType>
void strainFD(const std::vector<RigidBodyMotion<3> >& x, void strainFD(const std::vector<RigidBodyMotion<3> >& x,
double pos, double pos,
Dune::array<Dune::FieldMatrix<double,2,6>, 6>& fdStrainDerivatives, Dune::array<Dune::FieldMatrix<double,2,6>, 6>& fdStrainDerivatives,
const RodAssembler<GridType>& assembler) const RodAssembler<GridType,3>& assembler)
{ {
assert(x.size()==2); assert(x.size()==2);
double eps = 1e-8; double eps = 1e-8;
...@@ -66,7 +66,7 @@ void strain2ndOrderFD(const std::vector<RigidBodyMotion<3> >& x, ...@@ -66,7 +66,7 @@ void strain2ndOrderFD(const std::vector<RigidBodyMotion<3> >& x,
double pos, double pos,
Dune::array<Dune::Matrix<Dune::FieldMatrix<double,6,6> >, 3>& translationDer, Dune::array<Dune::Matrix<Dune::FieldMatrix<double,6,6> >, 3>& translationDer,
Dune::array<Dune::Matrix<Dune::FieldMatrix<double,3,3> >, 3>& rotationDer, Dune::array<Dune::Matrix<Dune::FieldMatrix<double,3,3> >, 3>& rotationDer,
const RodAssembler<GridType>& assembler) const RodAssembler<GridType,3>& assembler)
{ {
assert(x.size()==2); assert(x.size()==2);
double eps = 1e-3; double eps = 1e-3;
...@@ -177,7 +177,7 @@ void strain2ndOrderFD2(const std::vector<RigidBodyMotion<3> >& x, ...@@ -177,7 +177,7 @@ void strain2ndOrderFD2(const std::vector<RigidBodyMotion<3> >& x,
Dune::FieldVector<double,1> shapeFunction[2], Dune::FieldVector<double,1> shapeFunction[2],
Dune::array<Dune::Matrix<Dune::FieldMatrix<double,6,6> >, 3>& translationDer, Dune::array<Dune::Matrix<Dune::FieldMatrix<double,6,6> >, 3>& translationDer,
Dune::array<Dune::Matrix<Dune::FieldMatrix<double,3,3> >, 3>& rotationDer, Dune::array<Dune::Matrix<Dune::FieldMatrix<double,3,3> >, 3>& rotationDer,
const RodAssembler<GridType>& assembler) const RodAssembler<GridType,3>& assembler)
{ {
assert(x.size()==2); assert(x.size()==2);
double eps = 1e-3; double eps = 1e-3;
...@@ -306,7 +306,7 @@ void expHessianFD() ...@@ -306,7 +306,7 @@ void expHessianFD()
template <class GridType> template <class GridType>
void gradientFDCheck(const std::vector<RigidBodyMotion<3> >& x, void gradientFDCheck(const std::vector<RigidBodyMotion<3> >& x,
const Dune::BlockVector<Dune::FieldVector<double,6> >& gradient, const Dune::BlockVector<Dune::FieldVector<double,6> >& gradient,
const RodAssembler<GridType>& assembler) const RodAssembler<GridType,3>& assembler)
{ {
#ifndef ABORT_ON_ERROR #ifndef ABORT_ON_ERROR
static int gradientError = 0; static int gradientError = 0;
...@@ -364,7 +364,7 @@ void gradientFDCheck(const std::vector<RigidBodyMotion<3> >& x, ...@@ -364,7 +364,7 @@ void gradientFDCheck(const std::vector<RigidBodyMotion<3> >& x,
template <class GridType> template <class GridType>
void hessianFDCheck(const std::vector<RigidBodyMotion<3> >& x, void hessianFDCheck(const std::vector<RigidBodyMotion<3> >& x,
const Dune::BCRSMatrix<Dune::FieldMatrix<double,6,6> >& hessian, const Dune::BCRSMatrix<Dune::FieldMatrix<double,6,6> >& hessian,
const RodAssembler<GridType>& assembler) const RodAssembler<GridType,3>& assembler)
{ {
#ifndef ABORT_ON_ERROR #ifndef ABORT_ON_ERROR
static int hessianError = 0; static int hessianError = 0;
......
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