Reorganize directory structure.

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

Author: memmett

examples/ad/main.cpp

@@ -11,8 +11,8 @@
 #include <tuple>
 
 #include <pfasst.hpp>
-#include <pfasst-imex.hpp>
-#include <pfasst-vector.hpp>
+#include <pfasst/encap/imex.hpp>
+#include <pfasst/encap/vector.hpp>
 
 #include <fftw3.h>
 

src/CMakeLists.txt renamed to include/CMakeLists.txt

@@ -0,0 +1,4 @@
+#include "pfasst/interfaces.hpp"
+#include "pfasst/sdc.hpp"
+#include "pfasst/mlsdc.hpp"
+#include "pfasst/pfasst.hpp"

include/pfasst.hpp

@@ -5,7 +5,7 @@
 #ifndef _PFASST_CONTROLLER_HPP_
 #define _PFASST_CONTROLLER_HPP_
 
-#include "pfasst-interfaces.hpp"
+#include "interfaces.hpp"
 
 namespace pfasst {
 

src/pfasst-controller.hpp renamed to include/pfasst/controller.hpp

@@ -7,8 +7,8 @@
 
 #include <vector>
 
-#include "pfasst-interfaces.hpp"
-#include "pfasst-quadrature.hpp"
+#include "../interfaces.hpp"
+#include "../quadrature.hpp"
 
 using namespace std;
 

src/pfasst-encapsulated.hpp renamed to include/pfasst/encap/encapsulation.hpp

@@ -4,8 +4,7 @@
 
 #include <iostream>
 
-#include "pfasst-encapsulated.hpp"
-#include "pfasst-quadrature.hpp"
+#include "encapsulation.hpp"
 
 using namespace std;
 

src/pfasst-imex.hpp renamed to include/pfasst/encap/imex.hpp

@@ -15,7 +15,7 @@
 
 #define GPCHKERR(err, msg) if ((err) == -1) { perror(msg); return; }
 
-#include "pfasst-encapsulated.hpp"
+#include "encapsulation.hpp"
 
 using namespace std;
 
@@ -25,10 +25,8 @@ namespace pfasst {
     template<typename scalar, typename time>
     class VectorEncapsulation : public vector<scalar>, public Encapsulation<scalar> {
 
-      FILE *gp_to, *gp_fr;
-
     public:
-      VectorEncapsulation(int size) : vector<scalar>(size) { gp_to = NULL; }
+      VectorEncapsulation(int size) : vector<scalar>(size) { }
 
       void setval(scalar v) {
 	std::fill(this->begin(), this->end(), v);

src/pfasst-vector.hpp renamed to include/pfasst/encap/vector.hpp

@@ -9,7 +9,7 @@
 #include <iostream>
 #include <vector>
 
-#include "pfasst-controller.hpp"
+#include "controller.hpp"
 
 using namespace std;
 

src/pfasst-interfaces.hpp renamed to include/pfasst/interfaces.hpp

@@ -5,7 +5,7 @@
 #ifndef _PFASST_PFASST_HPP_
 #define _PFASST_PFASST_HPP_
 
-#include "pfasst-controller.hpp"
+#include "controller.hpp"
 
 using namespace std;