Merge pull request #181 from torbjoernk/feature/fix-cppcheck-warns

fixing a couple of CppCheck warnings related to style and performance

Author: memmett

.gitignore

@@ -242,6 +242,8 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
+cppcheck.xml
+/cppcheck
 
 # Translations
 *.mo

examples/boris/boris_sweeper.hpp

@@ -182,7 +182,7 @@ namespace pfasst
                                             const scalar energy, const scalar drift, const scalar residual,
                                             const bool with_center = true);
           void update_position(const size_t m, const time dt, const time ds);
-          void update_velocity(const size_t m, const time ds, const vector<time> nodes);
+          void update_velocity(const size_t m, const time ds, const vector<time>& nodes);
 
         public:
           //! @{

examples/boris/boris_sweeper_impl.hpp

@@ -139,6 +139,7 @@ namespace pfasst
         BCVLOG(9) << "writing center particle to file";
         this->data_stream_fmt % (iter+1) % sweep % -1
                               % center[0] % center[1] % center[2]
+                              // cppcheck-suppress zerodiv
                               % 0 % 0 % 0
                               % energy % drift % residual;
         this->data_stream << this->data_stream_fmt << endl;
@@ -154,6 +155,7 @@ namespace pfasst
         this->log_indent->increment(9);
         for (size_t p = 0; p < cloud->size(); ++p) {
           BCVLOG(9) << "writing cloud particle " << p << " to file";
+          // cppcheck-suppress zerodiv
           this->data_stream_fmt % (iter+1) % sweep % p
                                 % cloud->positions()[p * cloud->dim()] % cloud->positions()[p * cloud->dim() + 1] % cloud->positions()[p * cloud->dim() + 2]
                                 % cloud->velocities()[p * cloud->dim()] % cloud->velocities()[p * cloud->dim() + 1] % cloud->velocities()[p * cloud->dim() + 2]
@@ -194,7 +196,7 @@ namespace pfasst
       }
 
       template<typename scalar, typename time>
-      void BorisSweeper<scalar, time>::update_velocity(const size_t m, const time ds, const vector<time> nodes)
+      void BorisSweeper<scalar, time>::update_velocity(const size_t m, const time ds, const vector<time>& nodes)
       {
         BCVLOG(4) << "updating velocity (" << m << "->" << m+1 << ") with ds=" << ds;
         this->log_indent->increment(4);

examples/boris/particle.hpp

@@ -30,7 +30,7 @@ namespace pfasst
        * @ingroup Boris
        */
       template<typename T>
-      inline el::base::type::ostream_t& operator<<(el::base::type::ostream_t& os, const vector<T> vec);
+      inline el::base::type::ostream_t& operator<<(el::base::type::ostream_t& os, const vector<T>& vec);
 
 
       /**

examples/boris/particle_impl.hpp

@@ -12,7 +12,7 @@ namespace pfasst
     namespace boris
     {
       template<typename T>
-      inline el::base::type::ostream_t& operator<<(el::base::type::ostream_t& os, const vector<T> vec) {
+      inline el::base::type::ostream_t& operator<<(el::base::type::ostream_t& os, const vector<T>& vec) {
         os << "[";
         for (auto iter = vec.cbegin(); iter != vec.cend(); ++iter) {
           os << *iter;

examples/vanderpol/vdp_sweeper.hpp

@@ -271,18 +271,15 @@ namespace pfasst
             double residual = this->newton_tol + 1.0;
             size_t iter     = 0.0;
 
-            // initialize temporary variables for use in loop
-            double a, b, c, f0, f1;
-
             // Initial value for q is just rhs: For small dt, P is approximately the identity
             q[0] = rhs[0];
             q[1] = rhs[1];
 
             // NEWTON ITERATION: q_new = q + inv(J(q))*(-f(q))
             do {
               // Store -P(q) in f0, f1
-              f0 = -( q[0] - dt*q[1] - rhs[0] );
-              f1 = -( q[1] - dt*( this->nu*(1-q[0]*q[0])*q[1]-q[0]) - rhs[1] );
+              double f0 = -( q[0] - dt*q[1] - rhs[0] );
+              double f1 = -( q[1] - dt*( this->nu*(1-q[0]*q[0])*q[1]-q[0]) - rhs[1] );
 
               /**
                * The Jacobian of the right hand side of the van der Pol oscillator for \\( q=[x;y] \\)
@@ -307,9 +304,9 @@ namespace pfasst
                *
                * with \\( c:=2*\\nu*x*y*dt^2 + dt^2 + dt*x^2 - dt + 1 \\)
                */
-              a = dt*q[0]*q[0]-dt+1.0;
-              b = -2.0*dt*this->nu*q[0]*q[1]-dt;
-              c = 2.0*this->nu*q[0]*q[1]*dt*dt + dt*dt + dt*q[0]*q[0] - dt + 1.0;
+              double a = dt * q[0] * q[0] - dt + 1.0;
+              double b = -2.0 * dt * this->nu * q[0] * q[1] - dt;
+              double c = 2.0 * this->nu * q[0] * q[1] * dt * dt + dt * dt + dt * q[0] * q[0] - dt + 1.0;
 
               // Compute inv(J(q))*(-f(q)) and store it in f
               f[0] = (1.0/c)*( a*f0 + dt*f1 );

include/pfasst/encap/implicit_sweeper.hpp

@@ -81,11 +81,6 @@ namespace pfasst
          */
         vector<shared_ptr<Encapsulation<time>>> s_integrals;
 
-        /**
-         * FAS corrections \\( \\tau \\) at all time nodes of the current iteration.
-         */
-        vector<shared_ptr<Encapsulation<time>>> fas_corrections;
-
         /**
          * Values of the implicit part of the right hand side \\( F_{impl}(t,u) \\) at all time nodes of the current
          * iteration.

tests/examples/advection_diffusion/test_mpi_advection_diffusion.cpp

@@ -73,6 +73,7 @@ int main(int argc, char** argv)
                pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::init_opts,
                pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::init_logs);
   int result = 1, max_result;  // GTest return value 1 (failure), 0 (success)
+  // cppcheck-suppress redundantAssignment
   result = RUN_ALL_TESTS();
   MPI_Allreduce(&result, &max_result, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD);
   MPI_Finalize();

tests/test_quadrature.cpp

@@ -293,9 +293,8 @@ class QmatTest
 
 TEST_P(QmatTest, AllNodes)
 {
-  long double qsum;
   for (int m = 0; m < this->quad->get_q_mat().rows(); ++m) {
-    qsum = 0;
+    long double qsum = 0;
     for (int j = 0; j < this->quad->get_q_mat().cols(); ++j) {
       qsum += this->quad->get_q_mat()(m,j);
     }