Skip to content
Snippets Groups Projects
Commit 610473a6 authored by Sander, Oliver's avatar Sander, Oliver
Browse files

Fix a few signed/unsigned warnings

parent 7b7db01b
No related branches found
No related tags found
1 merge request!94Make EmbeddedGlobalGFEFunction a dune-functions function
...@@ -468,7 +468,7 @@ int main (int argc, char *argv[]) try ...@@ -468,7 +468,7 @@ int main (int argc, char *argv[]) try
BlockVector<FieldMatrix<double,3,3> > dOV; BlockVector<FieldMatrix<double,3,3> > dOV;
Dune::Functions::interpolate(orientationPowerBasis, dOV, orientationDirichletValues); Dune::Functions::interpolate(orientationPowerBasis, dOV, orientationDirichletValues);
for (int i = 0; i < compositeBasis.size({0}); i++) { for (std::size_t i = 0; i < compositeBasis.size({0}); i++) {
FieldVector<double,3> x0i = x[_0][i].globalCoordinates(); FieldVector<double,3> x0i = x[_0][i].globalCoordinates();
for (int j=0; j<3; j++) { for (int j=0; j<3; j++) {
if (deformationDirichletDofs[i][j]) if (deformationDirichletDofs[i][j])
...@@ -523,7 +523,7 @@ int main (int argc, char *argv[]) try ...@@ -523,7 +523,7 @@ int main (int argc, char *argv[]) try
//Therefore, x and the dirichletDofs are converted to a RigidBodyMotion structure, as well as the Hessian and Gradient that are returned by the assembler //Therefore, x and the dirichletDofs are converted to a RigidBodyMotion structure, as well as the Hessian and Gradient that are returned by the assembler
std::vector<TargetSpace> xTargetSpace(compositeBasis.size({0})); std::vector<TargetSpace> xTargetSpace(compositeBasis.size({0}));
BitSetVector<TargetSpace::TangentVector::dimension> dirichletDofsTargetSpace(compositeBasis.size({0}), false); BitSetVector<TargetSpace::TangentVector::dimension> dirichletDofsTargetSpace(compositeBasis.size({0}), false);
for (int i = 0; i < compositeBasis.size({0}); i++) { for (std::size_t i = 0; i < compositeBasis.size({0}); i++) {
for (int j = 0; j < 3; j ++) { // Displacement part for (int j = 0; j < 3; j ++) { // Displacement part
xTargetSpace[i].r[j] = x[_0][i][j]; xTargetSpace[i].r[j] = x[_0][i][j];
dirichletDofsTargetSpace[i][j] = deformationDirichletDofs[i][j]; dirichletDofsTargetSpace[i][j] = deformationDirichletDofs[i][j];
...@@ -570,7 +570,7 @@ int main (int argc, char *argv[]) try ...@@ -570,7 +570,7 @@ int main (int argc, char *argv[]) try
solver.solve(); solver.solve();
xTargetSpace = solver.getSol(); xTargetSpace = solver.getSol();
} }
for (int i = 0; i < xTargetSpace.size(); i++) { for (std::size_t i = 0; i < xTargetSpace.size(); i++) {
x[_0][i] = xTargetSpace[i].r; x[_0][i] = xTargetSpace[i].r;
x[_1][i] = xTargetSpace[i].q; x[_1][i] = xTargetSpace[i].q;
} }
......
...@@ -101,7 +101,7 @@ double calculateEnergy(const int numLevels, const F1 referenceConfigurationFunct ...@@ -101,7 +101,7 @@ double calculateEnergy(const int numLevels, const F1 referenceConfigurationFunct
BlockVector<FieldVector<double,3> > helperVector2(feBasis.size()); BlockVector<FieldVector<double,3> > helperVector2(feBasis.size());
Dune::Functions::interpolate(deformationPowerBasis, helperVector2, configurationFunction); Dune::Functions::interpolate(deformationPowerBasis, helperVector2, configurationFunction);
for (int i = 0; i < feBasis.size(); i++) { for (std::size_t i = 0; i < feBasis.size(); i++) {
for (int j = 0; j < dimworld; j++) for (int j = 0; j < dimworld; j++)
sol[i].r[j] = helperVector2[i][j]; sol[i].r[j] = helperVector2[i][j];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment