From 28a3267b5155d5e9a2fd0c3458e837cc460967c6 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Thu, 5 Nov 2020 17:12:12 +0100
Subject: [PATCH] Fix a few simple compiler warnings
---
dune/gfe/geodesicfeassemblerwrapper.hh | 4 ++--
src/rod3d.cc | 1 -
test/cosseratenergytest.cc | 2 --
test/geodesicfeassemblerwrappertest.cc | 3 +--
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/dune/gfe/geodesicfeassemblerwrapper.hh b/dune/gfe/geodesicfeassemblerwrapper.hh
index 4570b407..c42a1e3e 100644
--- a/dune/gfe/geodesicfeassemblerwrapper.hh
+++ b/dune/gfe/geodesicfeassemblerwrapper.hh
@@ -84,7 +84,7 @@ splitVector(const std::vector<TargetSpace>& sol) const {
Dune::TupleVector<std::vector<MixedSpace0>,std::vector<MixedSpace1>> solutionSplit;
solutionSplit[_0].resize(n);
solutionSplit[_1].resize(n);
- for (int i = 0; i < n; i++) {
+ for (std::size_t i = 0; i < n; i++) {
solutionSplit[_0][i] = sol[i].r; // Deformation part
solutionSplit[_1][i] = sol[i].q; // Rotational part
}
@@ -145,7 +145,7 @@ assembleGradientAndHessian(const std::vector<TargetSpace>& sol,
hessian = 0;
gradient.resize(n);
gradient = 0;
- for (int i = 0; i < n; i++) {
+ for (std::size_t i = 0; i < n; i++) {
for (int j = 0; j < blocksize0 + blocksize1; j++)
gradient[i][j] = j < blocksize0 ? gradient0[i][j] : gradient1[i][j - blocksize0];
}
diff --git a/src/rod3d.cc b/src/rod3d.cc
index 8d4a9abc..f751d1df 100644
--- a/src/rod3d.cc
+++ b/src/rod3d.cc
@@ -24,7 +24,6 @@ typedef RigidBodyMotion<double,3> TargetSpace;
const int blocksize = TargetSpace::TangentVector::dimension;
using namespace Dune;
-using std::string;
int main (int argc, char *argv[]) try
{
diff --git a/test/cosseratenergytest.cc b/test/cosseratenergytest.cc
index 256fba6f..cdfc0f38 100644
--- a/test/cosseratenergytest.cc
+++ b/test/cosseratenergytest.cc
@@ -15,8 +15,6 @@
#include "multiindex.hh"
#include "valuefactory.hh"
-const double eps = 1e-4;
-
typedef RigidBodyMotion<double,3> TargetSpace;
using namespace Dune;
diff --git a/test/geodesicfeassemblerwrappertest.cc b/test/geodesicfeassemblerwrappertest.cc
index 3e788135..36250b3c 100644
--- a/test/geodesicfeassemblerwrappertest.cc
+++ b/test/geodesicfeassemblerwrappertest.cc
@@ -114,7 +114,6 @@ int main (int argc, char *argv[])
));
using CompositeBasis = decltype(compositeBasis);
- using LocalView = typename CompositeBasis::LocalView;
/////////////////////////////////////////////////////////////////////////
// Create the energy functions with their parameters
@@ -170,7 +169,7 @@ int main (int argc, char *argv[])
x[_0].resize(compositeBasis.size({0}));
x[_1].resize(compositeBasis.size({1}));
std::vector<RBM> xRBM(compositeBasis.size({0}));
- 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 < gridDim; j++)
initialDeformation[i][j] = identity[i][j];
x[_0][i] = initialDeformation[i];
--
GitLab