some code formatting tweaks

mainly reordered member functions according to order in base classes

Author: torbjoernk

examples/advection_diffusion/advection_diffusion_sweeper.hpp

@@ -73,60 +73,6 @@ class AdvectionDiffusionSweeper
     }
     //! @}
 
-    //! @{
-    void exact(shared_ptr<Encapsulation<time>> q, time t)
-    {
-      this->exact(as_vector<double, time>(q), t);
-    }
-
-    void exact(DVectorT& q, time t)
-    {
-      size_t n = q.size();
-      double a = 1.0 / sqrt(4 * PI * nu * (t + t0));
-
-      for (size_t i = 0; i < n; i++) {
-        q[i] = 0.0;
-      }
-
-      for (int ii = -2; ii < 3; ii++) {
-        for (size_t i = 0; i < n; i++) {
-          double x = double(i) / n - 0.5 + ii - t * v;
-          q[i] += a * exp(-x * x / (4 * nu * (t + t0)));
-        }
-      }
-    }
-
-    void echo_error(time t, bool predict = false)
-    {
-      auto& qend = as_vector<double, time>(this->get_end_state());
-      DVectorT qex(qend.size());
-
-      this->exact(qex, t);
-
-      double max = 0.0;
-      for (size_t i = 0; i < qend.size(); i++) {
-        double d = abs(qend[i] - qex[i]);
-        if (d > max) { max = d; }
-      }
-
-      auto n = this->get_controller()->get_step();
-      auto k = this->get_controller()->get_iteration();
-      cout << "err: " << n << " " << k << " " << scientific << max
-           << " (" << qend.size() << ", " << predict << ")"
-           << endl;
-
-      this->errors.insert(pair<pair<size_t, size_t>, double>(pair<size_t, size_t>(n, k), max));
-    }
-
-    /**
-     * retrieve errors at iterations and time nodes
-     */
-    error_map get_errors()
-    {
-      return this->errors;
-    }
-    //! @}
-
     //! @{
     /**
      * @copybrief pfasst::encap::IMEXSweeper::predict()
@@ -220,6 +166,60 @@ class AdvectionDiffusionSweeper
       }
     }
     //! @}
+
+    //! @{
+    void exact(shared_ptr<Encapsulation<time>> q, time t)
+    {
+      this->exact(as_vector<double, time>(q), t);
+    }
+
+    void exact(DVectorT& q, time t)
+    {
+      size_t n = q.size();
+      double a = 1.0 / sqrt(4 * PI * nu * (t + t0));
+
+      for (size_t i = 0; i < n; i++) {
+        q[i] = 0.0;
+      }
+
+      for (int ii = -2; ii < 3; ii++) {
+        for (size_t i = 0; i < n; i++) {
+          double x = double(i) / n - 0.5 + ii - t * v;
+          q[i] += a * exp(-x * x / (4 * nu * (t + t0)));
+        }
+      }
+    }
+
+    void echo_error(time t, bool predict = false)
+    {
+      auto& qend = as_vector<double, time>(this->get_end_state());
+      DVectorT qex(qend.size());
+
+      this->exact(qex, t);
+
+      double max = 0.0;
+      for (size_t i = 0; i < qend.size(); i++) {
+        double d = abs(qend[i] - qex[i]);
+        if (d > max) { max = d; }
+      }
+
+      auto n = this->get_controller()->get_step();
+      auto k = this->get_controller()->get_iteration();
+      cout << "err: " << n << " " << k << " " << scientific << max
+           << " (" << qend.size() << ", " << predict << ")"
+           << endl;
+
+      this->errors.insert(pair<pair<size_t, size_t>, double>(pair<size_t, size_t>(n, k), max));
+    }
+
+    /**
+     * retrieve errors at iterations and time nodes
+     */
+    error_map get_errors()
+    {
+      return this->errors;
+    }
+    //! @}
 };
 
 #endif

include/pfasst/encap/encap_sweeper.hpp

@@ -42,38 +42,6 @@ namespace pfasst
         {}
         //! @}
 
-        //! @{
-        virtual void spread() override
-        {
-          for (size_t m = 1; m < nodes.size(); m++) {
-            this->get_state(m)->copy(this->get_state(0));
-          }
-        }
-
-        virtual void post(ICommunicator* comm, int tag) override
-        {
-          this->get_state(0)->post(comm, tag);
-        }
-
-        virtual void send(ICommunicator* comm, int tag, bool blocking) override
-        {
-          this->get_state(this->get_nodes().size() - 1)->send(comm, tag, blocking);
-        }
-
-        virtual void recv(ICommunicator* comm, int tag, bool blocking) override
-        {
-          this->get_state(0)->recv(comm, tag, blocking);
-        }
-
-        virtual void broadcast(ICommunicator* comm) override
-        {
-          if (comm->rank() == comm->size() - 1) {
-            this->get_state(0)->copy(this->get_state(this->get_nodes().size() - 1));
-          }
-          this->get_state(0)->broadcast(comm);
-        }
-        //! @}
-
         //! @{
         virtual void set_nodes(vector<time> nodes)
         {
@@ -175,6 +143,13 @@ namespace pfasst
           throw NotImplementedYet("sweeper");
         }
 
+        virtual void spread() override
+        {
+          for (size_t m = 1; m < nodes.size(); m++) {
+            this->get_state(m)->copy(this->get_state(0));
+          }
+        }
+
         /**
          * evaluates the right hand side at given time node
          *
@@ -206,6 +181,31 @@ namespace pfasst
           throw NotImplementedYet("sweeper");
         }
         //! @}
+
+        //! @{
+        virtual void post(ICommunicator* comm, int tag) override
+        {
+          this->get_state(0)->post(comm, tag);
+        }
+
+        virtual void send(ICommunicator* comm, int tag, bool blocking) override
+        {
+          this->get_state(this->get_nodes().size() - 1)->send(comm, tag, blocking);
+        }
+
+        virtual void recv(ICommunicator* comm, int tag, bool blocking) override
+        {
+          this->get_state(0)->recv(comm, tag, blocking);
+        }
+
+        virtual void broadcast(ICommunicator* comm) override
+        {
+          if (comm->rank() == comm->size() - 1) {
+            this->get_state(0)->copy(this->get_state(this->get_nodes().size() - 1));
+          }
+          this->get_state(0)->broadcast(comm);
+        }
+        //! @}
     };
 
 

include/pfasst/encap/imex_sweeper.hpp

@@ -242,7 +242,7 @@ namespace pfasst
          * @param[in] initial if `true` the explicit and implicit part of the right hand side of the
          *     ODE get evaluated with the initial value
          */
-        virtual void predict(bool initial)
+        virtual void predict(bool initial) override
         {
           const auto   nodes  = this->get_nodes();
           const size_t nnodes = nodes.size();
@@ -268,7 +268,7 @@ namespace pfasst
           if (this->last_node_is_virtual()) { this->integrate_end_state(dt); }
         }
 
-        virtual void sweep()
+        virtual void sweep() override
         {
           const auto   nodes  = this->get_nodes();
           const size_t nnodes = nodes.size();

include/pfasst/interfaces.hpp

@@ -31,7 +31,8 @@ namespace pfasst
    * Used by PFASST to mark methods that are required for a particular algorithm (SDC/MLSDC/PFASST)
    * that may not be necessary for all others.
    */
-  class NotImplementedYet : public exception
+  class NotImplementedYet
+    : public exception
   {
       string msg;
     public:
@@ -51,7 +52,8 @@ namespace pfasst
    *
    * Thrown when a PFASST routine is passed an invalid value.
    */
-  class ValueError : public exception
+  class ValueError
+    : public exception
   {
       string msg;
     public: