From e2e4ae3761b5adcf71462f3c0f269281c9380675 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Sun, 27 Feb 2022 07:48:05 +0100
Subject: [PATCH] Fix some simple compiler warnings, and remove unused code
---
dune/gfe/polardecomposition.hh | 2 +-
test/cosseratenergytest.cc | 4 +---
test/cosseratrodenergytest.cc | 2 +-
test/polardecompositiontest.cc | 1 -
test/surfacecosseratstressassemblertest.cc | 6 +++---
test/targetspacetest.cc | 2 +-
6 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/dune/gfe/polardecomposition.hh b/dune/gfe/polardecomposition.hh
index 9f7098ae..3665392b 100644
--- a/dune/gfe/polardecomposition.hh
+++ b/dune/gfe/polardecomposition.hh
@@ -244,7 +244,7 @@ namespace Dune::GFE {
mini = i;
Pleft[3][mini] = 1;
- Pright[mini][3] = 1; // Smalest element to the last position
+ Pright[mini][3] = 1; // Smallest element to the last position
for (int i = 0; i < 4; ++i) {
diff --git a/test/cosseratenergytest.cc b/test/cosseratenergytest.cc
index cdfc0f38..9f4b5bc4 100644
--- a/test/cosseratenergytest.cc
+++ b/test/cosseratenergytest.cc
@@ -7,8 +7,6 @@
#include <dune/functions/functionspacebases/lagrangebasis.hh>
-#include <dune/fufem/functions/constantfunction.hh>
-
#include <dune/gfe/rigidbodymotion.hh>
#include <dune/gfe/cosseratenergystiffness.hh>
@@ -44,7 +42,7 @@ std::unique_ptr<GridType> makeSingleSimplexGrid()
v[i] = i;
factory.insertElement(GeometryTypes::simplex(domainDim), v);
- return std::unique_ptr<GridType>(factory.createGrid());
+ return factory.createGrid();
}
diff --git a/test/cosseratrodenergytest.cc b/test/cosseratrodenergytest.cc
index ff65271b..6a485ac5 100644
--- a/test/cosseratrodenergytest.cc
+++ b/test/cosseratrodenergytest.cc
@@ -80,7 +80,7 @@ int main (int argc, char *argv[]) try
std::vector<RigidBodyMotion<double,3> > referenceConfiguration(gridView.size(1));
- for (const auto vertex : vertices(gridView))
+ for (const auto& vertex : vertices(gridView))
{
auto idx = gridView.indexSet().index(vertex);
diff --git a/test/polardecompositiontest.cc b/test/polardecompositiontest.cc
index cc10676d..779d929c 100644
--- a/test/polardecompositiontest.cc
+++ b/test/polardecompositiontest.cc
@@ -168,7 +168,6 @@ static bool test4dDeterminant() {
static bool testdominantEVNewton() {
field_type detB = 0.992928;
- field_type detM = 0.000620104;
FieldVector<field_type,3> minpol = {0, -1.99999, -0.00496083};
double correctDominantEV = 1.05397;
diff --git a/test/surfacecosseratstressassemblertest.cc b/test/surfacecosseratstressassemblertest.cc
index 66cbddd5..9e2ea960 100644
--- a/test/surfacecosseratstressassemblertest.cc
+++ b/test/surfacecosseratstressassemblertest.cc
@@ -92,7 +92,7 @@ static bool symmetryTest(std::unordered_map<std::string, FieldVector<double,d>>
int main (int argc, char *argv[])
{
- MPIHelper& mpiHelper = MPIHelper::instance(argc, argv);
+ MPIHelper::instance(argc, argv);
/////////////////////////////////////////////////////////////
// CREATE THE GRID
@@ -186,7 +186,7 @@ int main (int argc, char *argv[])
Functions::interpolate(basisOrderD, x, [](FieldVector<double,dim> x){ return x; });
Functions::interpolate(basisOrderD, xInitial, [](FieldVector<double,dim> x){ return x; });
- for (int i = 0; i < basisOrderD.size(); i++) {
+ for (std::size_t i = 0; i < basisOrderD.size(); i++) {
std::stringstream stream;
stream << x[i];
//Look up the displacement for this vertex in the deformationMap
@@ -201,7 +201,7 @@ int main (int argc, char *argv[])
DisplacementVector xOrderR;
xOrderR.resize(basisOrderR.size());
Functions::interpolate(basisOrderR, xOrderR, [](FieldVector<double,dim> x){ return x; });
- for (int i = 0; i < basisOrderR.size(); i++) {
+ for (std::size_t i = 0; i < basisOrderR.size(); i++) {
std::stringstream stream;
stream << xOrderR[i];
Rotation<double,dim> rotation(rotationMap.at(stream.str()));
diff --git a/test/targetspacetest.cc b/test/targetspacetest.cc
index d24e6651..34b5a285 100644
--- a/test/targetspacetest.cc
+++ b/test/targetspacetest.cc
@@ -374,7 +374,7 @@ int main() try
} catch (Exception& e) {
- std::cout << e << std::endl;
+ std::cout << e.what() << std::endl;
}
--
GitLab