interfaces: Plug some memory leaks.

Signed-off-by: Matthew Emmett <[email protected]>

Author: memmett

examples/advection_diffusion/ex1.cpp

@@ -4,6 +4,8 @@
  * This example uses a vanilla SDC sweeper.
  */
 
+#include <fftw3.h>
+
 #include <pfasst.hpp>
 #include <pfasst/sdc.hpp>
 #include <pfasst/encap/vector.hpp>
@@ -35,4 +37,6 @@ int main(int argc, char **argv)
   sweeper->exact(q0, 0.0);
 
   sdc.run();
+
+  fftw_cleanup();
 }

examples/advection_diffusion/ex2.cpp

@@ -4,6 +4,8 @@
  * This example uses a (serial) multi-level SDC sweeper.
  */
 
+#include <fftw3.h>
+
 #include <pfasst.hpp>
 #include <pfasst/mlsdc.hpp>
 #include <pfasst/encap/vector.hpp>
@@ -69,5 +71,5 @@ int main(int argc, char **argv)
   mlsdc.set_duration(dt, nsteps, niters);
   mlsdc.run();
 
-  return 0;
+  fftw_cleanup();
 }

examples/advection_diffusion/ex3.cpp

@@ -7,7 +7,7 @@
  * controller.
  */
 
-#include <tuple>
+#include <fftw3.h>
 
 #include <pfasst.hpp>
 #include <pfasst/mlsdc.hpp>
@@ -65,5 +65,5 @@ int main(int argc, char **argv)
   mlsdc.set_duration(dt, nsteps, niters);
   mlsdc.run();
 
-  return 0;
+  fftw_cleanup();
 }

examples/advection_diffusion/fft.hpp

@@ -33,14 +33,12 @@ class FFT {
   {
     for (auto& x: workspaces) {
       auto* wk = std::get<1>(x);
+      fftw_free(wk->wk);
       fftw_destroy_plan(wk->ffft);
       fftw_destroy_plan(wk->ifft);
-      fftw_free(wk->wk);
       delete wk;
-      //      workspaces.erase(std::get<0>(x));
     }
     workspaces.clear();
-    // workspaces.clear();
   }
 
   workspace* get_workspace(int ndofs)

include/pfasst/interfaces.hpp

@@ -27,8 +27,8 @@ namespace pfasst {
 
   class ISweeper {
   public:
-    virtual void setup(bool coarse=false) { }
     virtual ~ISweeper() { }
+    virtual void setup(bool coarse=false) { }
 
     virtual void sweep(double t, double dt) = 0; // XXX: this needs to be a templated
     virtual void predict(double t, double dt, bool initial) = 0; // XXX: this needs to be templated
@@ -40,6 +40,7 @@ namespace pfasst {
   public:
     // XXX: pass level iterator to these routines as well
     // XXX: these needs to be templated
+    virtual ~ITransfer() { }
     virtual void interpolate(ISweeper *dst, const ISweeper *src,
 			     bool interp_delta_from_initial=false,
 			     bool interp_initial=false) = 0;