Merge pull request #7 from Parallel-in-Time/feature/fas

Feature/fas

Author: memmett

README.md

@@ -1,9 +1,10 @@
 PFASST
 ======
 
-[![Build Status](https://travis-ci.org/Parallel-in-Time/PFASST.svg?branch=master)](https://travis-ci.org/Parallel-in-Time/PFASST)
+Master: [![Build Status](https://travis-ci.org/Parallel-in-Time/PFASST.svg?branch=master)](https://travis-ci.org/Parallel-in-Time/PFASST)
 
-Proposed class structure for a C++ PFASST implementation.
+Development: [![Build Status](https://travis-ci.org/Parallel-in-Time/PFASST.svg?branch=development)](https://travis-ci.org/Parallel-in-Time/PFASST)
 
+Proposed class structure for a C++ PFASST implementation.
 
 Doxygen generated documentation can be found [here](https://pint.fz-juelich.de/ci/view/PFASST/job/PFASST%20%28Docu%29/doxygen/).

examples/advection_diffusion/CMakeLists.txt

@@ -5,15 +5,28 @@ include_directories(
     ${pfasst_INCLUDES}
 )
 
-set(advection_diffusion_SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/advection_diffusion.cpp
+set(ex1_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/ex1.cpp
 )
 
-add_executable(advdiff ${advection_diffusion_SOURCES})
-add_dependencies(advdiff fftw3)
-target_link_libraries(advdiff
+set(ex2_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/ex2.cpp
+)
+
+add_executable(ex1 ${ex1_SOURCES})
+add_dependencies(ex1 fftw3)
+target_link_libraries(ex1
+    ${fftw3_LIBS}
+)
+set_target_properties(ex1
+    PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${pfasst_BINARY_DIR}/examples
+)
+
+add_executable(ex2 ${ex2_SOURCES})
+add_dependencies(ex2 fftw3)
+target_link_libraries(ex2
     ${fftw3_LIBS}
 )
-set_target_properties(advdiff
+set_target_properties(ex2
     PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${pfasst_BINARY_DIR}/examples
 )