Merge pull request #158 from torbjoernk/feature/separate-impl-dir

Moving implementation files into separate directory structure

Author: memmett

CMakeLists.txt

@@ -155,6 +155,7 @@ configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/include/pfasst/site_config.hpp"
 )
 add_subdirectory(include)
+add_subdirectory(src)
 
 if(pfasst_BUILD_EXAMPLES)
     message(STATUS "********************************************************************************")
@@ -177,6 +178,10 @@ install(DIRECTORY include/
     DESTINATION include
     FILES_MATCHING PATTERN "*.hpp"
 )
+install(DIRECTORY src/
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.hpp"
+)
 
 if(pfasst_BUILD_EXAMPLES AND pfasst_INSTALL_EXAMPLES)
     message(STATUS "  example programs:    <PREFIX>/bin")

Doxyfile

@@ -666,7 +666,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = include tests examples doc/source README.md CHANGELOG.md
+INPUT                  = include src tests examples doc/source README.md CHANGELOG.md
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

include/pfasst/config.hpp

@@ -105,6 +105,6 @@ namespace pfasst
   }  // ::pfasst::config
 }  // ::pfasst
 
-#include "config_impl.hpp"
+#include "pfasst/config_impl.hpp"
 
 #endif  // _PFASST__CONFIG_HPP_

include/pfasst/controller.hpp

@@ -1,6 +1,6 @@
 #ifndef _PFASST__CONTROLLER_HPP
 #define _PFASST__CONTROLLER_HPP
 
-#include "controller/controller.hpp"
+#include "pfasst/controller/controller.hpp"
 
 #endif  // _PFASST__CONTROLLER_HPP

include/pfasst/controller/interface.hpp

@@ -7,7 +7,7 @@
 #include <memory>
 using namespace std;
 
-#include "../interfaces.hpp"
+#include "pfasst/interfaces.hpp"
 
 
 namespace pfasst
@@ -193,6 +193,6 @@ namespace pfasst
   };
 }  // ::pfasst
 
-#include "interface_impl.hpp"
+#include "pfasst/controller/interface_impl.hpp"
 
 #endif

include/pfasst/controller/mlsdc.hpp

@@ -4,7 +4,7 @@
 #include <vector>
 using namespace std;
 
-#include "interface.hpp"
+#include "pfasst/controller/interface.hpp"
 
 
 namespace pfasst
@@ -65,6 +65,6 @@ namespace pfasst
   };
 }  // ::pfasst
 
-#include "mlsdc_impl.hpp"
+#include "pfasst/controller/mlsdc_impl.hpp"
 
 #endif

include/pfasst/controller/pfasst.hpp

@@ -1,7 +1,7 @@
 #ifndef _PFASST_PFASST_HPP_
 #define _PFASST_PFASST_HPP_
 
-#include "mlsdc.hpp"
+#include "pfasst/controller/mlsdc.hpp"
 
 
 namespace pfasst
@@ -73,6 +73,6 @@ namespace pfasst
   };
 }  // ::pfasst
 
-#include "pfasst_impl.hpp"
+#include "pfasst/controller/pfasst_impl.hpp"
 
 #endif

include/pfasst/controller/sdc.hpp

@@ -1,7 +1,7 @@
 #ifndef _PFASST_SDC_HPP_
 #define _PFASST_SDC_HPP_
 
-#include "interface.hpp"
+#include "pfasst/controller/interface.hpp"
 
 
 namespace pfasst
@@ -18,6 +18,6 @@ namespace pfasst
   };
 }  // ::pfasst
 
-#include "sdc_impl.hpp"
+#include "pfasst/controller/sdc_impl.hpp"
 
 #endif

include/pfasst/encap/automagic.hpp

@@ -5,8 +5,8 @@
 #include <tuple>
 #include <cassert>
 
-#include "../quadrature.hpp"
-#include "encap_sweeper.hpp"
+#include "pfasst/quadrature.hpp"
+#include "pfasst/encap/encap_sweeper.hpp"
 
 using namespace std;
 

include/pfasst/encap/encap_sweeper.hpp

@@ -9,9 +9,9 @@
 #include <vector>
 using namespace std;
 
-#include "../interfaces.hpp"
-#include "../quadrature.hpp"
-#include "encapsulation.hpp"
+#include "pfasst/interfaces.hpp"
+#include "pfasst/quadrature.hpp"
+#include "pfasst/encap/encapsulation.hpp"
 
 
 namespace pfasst
@@ -166,6 +166,6 @@ namespace pfasst
   }  // ::pfasst::encap
 }  // ::pfasst
 
-#include "encap_sweeper_impl.hpp"
+#include "pfasst/encap/encap_sweeper_impl.hpp"
 
 #endif