Skip to content
Snippets Groups Projects
Commit cee0eda3 authored by Youett, Jonathan's avatar Youett, Jonathan Committed by akbib@FU-BERLIN.DE
Browse files

FieldVector::SIZE -> FieldVector::DIMENSION 

[[Imported from SVN: r7991]]
parent 267da294
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dune/gfe/rigidbodymotion.hh
+ 14
− 14
View file @ cee0eda3
...@@ -123,9 +123,9 @@ public: ...@@ -123,9 +123,9 @@ public:
result[i][j] = linearPart[i][j]; result[i][j] = linearPart[i][j];
// The rotation part // The rotation part
Dune::FieldMatrix<double,Rotation<dim,T>::EmbeddedTangentVector::size,Rotation<dim,T>::EmbeddedTangentVector::size> rotationPart = Rotation<dim,ctype>::secondDerivativeOfDistanceSquaredWRTSecondArgument(p.q,q.q); Dune::FieldMatrix<double,Rotation<dim,T>::EmbeddedTangentVector::dimension,Rotation<dim,T>::EmbeddedTangentVector::dimension> rotationPart = Rotation<dim,ctype>::secondDerivativeOfDistanceSquaredWRTSecondArgument(p.q,q.q);
for (int i=0; i<Rotation<dim,T>::EmbeddedTangentVector::size; i++) for (int i=0; i<Rotation<dim,T>::EmbeddedTangentVector::dimension; i++)
for (int j=0; j<Rotation<dim,T>::EmbeddedTangentVector::size; j++) for (int j=0; j<Rotation<dim,T>::EmbeddedTangentVector::dimension; j++)
result[dim+i][dim+j] = rotationPart[i][j]; result[dim+i][dim+j] = rotationPart[i][j];
return result; return result;
...@@ -146,9 +146,9 @@ public: ...@@ -146,9 +146,9 @@ public:
result[i][j] = linearPart[i][j]; result[i][j] = linearPart[i][j];
// The rotation part // The rotation part
Dune::FieldMatrix<double,Rotation<dim,T>::EmbeddedTangentVector::size,Rotation<dim,T>::EmbeddedTangentVector::size> rotationPart = Rotation<dim,ctype>::secondDerivativeOfDistanceSquaredWRTFirstAndSecondArgument(p.q,q.q); Dune::FieldMatrix<double,Rotation<dim,T>::EmbeddedTangentVector::dimension,Rotation<dim,T>::EmbeddedTangentVector::dimension> rotationPart = Rotation<dim,ctype>::secondDerivativeOfDistanceSquaredWRTFirstAndSecondArgument(p.q,q.q);
for (int i=0; i<Rotation<dim,T>::EmbeddedTangentVector::size; i++) for (int i=0; i<Rotation<dim,T>::EmbeddedTangentVector::dimension; i++)
for (int j=0; j<Rotation<dim,T>::EmbeddedTangentVector::size; j++) for (int j=0; j<Rotation<dim,T>::EmbeddedTangentVector::dimension; j++)
result[dim+i][dim+j] = rotationPart[i][j]; result[dim+i][dim+j] = rotationPart[i][j];
return result; return result;
...@@ -170,10 +170,10 @@ public: ...@@ -170,10 +170,10 @@ public:
result[i][j][k] = linearPart[i][j][k]; result[i][j][k] = linearPart[i][j][k];
// The rotation part // The rotation part
Tensor3<double,Rotation<dim,T>::EmbeddedTangentVector::size,Rotation<dim,T>::EmbeddedTangentVector::size,Rotation<dim,T>::EmbeddedTangentVector::size> rotationPart = Rotation<dim,ctype>::thirdDerivativeOfDistanceSquaredWRTSecondArgument(p.q,q.q); Tensor3<double,Rotation<dim,T>::EmbeddedTangentVector::dimension,Rotation<dim,T>::EmbeddedTangentVector::dimension,Rotation<dim,T>::EmbeddedTangentVector::dimension> rotationPart = Rotation<dim,ctype>::thirdDerivativeOfDistanceSquaredWRTSecondArgument(p.q,q.q);
for (int i=0; i<Rotation<dim,T>::EmbeddedTangentVector::size; i++) for (int i=0; i<Rotation<dim,T>::EmbeddedTangentVector::dimension; i++)
for (int j=0; j<Rotation<dim,T>::EmbeddedTangentVector::size; j++) for (int j=0; j<Rotation<dim,T>::EmbeddedTangentVector::dimension; j++)
for (int k=0; k<Rotation<dim,T>::EmbeddedTangentVector::size; k++) for (int k=0; k<Rotation<dim,T>::EmbeddedTangentVector::dimension; k++)
result[dim+i][dim+j][dim+j] = rotationPart[i][j][k]; result[dim+i][dim+j][dim+j] = rotationPart[i][j][k];
return result; return result;
...@@ -195,10 +195,10 @@ public: ...@@ -195,10 +195,10 @@ public:
result[i][j][k] = linearPart[i][j][k]; result[i][j][k] = linearPart[i][j][k];
// The rotation part // The rotation part
Tensor3<double,Rotation<dim,T>::EmbeddedTangentVector::size,Rotation<dim,T>::EmbeddedTangentVector::size,Rotation<dim,T>::EmbeddedTangentVector::size> rotationPart = Rotation<dim,ctype>::thirdDerivativeOfDistanceSquaredWRTFirst1AndSecond2Argument(p.q,q.q); Tensor3<double,Rotation<dim,T>::EmbeddedTangentVector::dimension,Rotation<dim,T>::EmbeddedTangentVector::dimension,Rotation<dim,T>::EmbeddedTangentVector::dimension> rotationPart = Rotation<dim,ctype>::thirdDerivativeOfDistanceSquaredWRTFirst1AndSecond2Argument(p.q,q.q);
for (int i=0; i<Rotation<dim,T>::EmbeddedTangentVector::size; i++) for (int i=0; i<Rotation<dim,T>::EmbeddedTangentVector::dimension; i++)
for (int j=0; j<Rotation<dim,T>::EmbeddedTangentVector::size; j++) for (int j=0; j<Rotation<dim,T>::EmbeddedTangentVector::dimension; j++)
for (int k=0; k<Rotation<dim,T>::EmbeddedTangentVector::size; k++) for (int k=0; k<Rotation<dim,T>::EmbeddedTangentVector::dimension; k++)
result[dim+i][dim+j][dim+j] = rotationPart[i][j][k]; result[dim+i][dim+j][dim+j] = rotationPart[i][j][k];
return result; return result;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment