updated scalar example to fit into testing enviroment; added test routine for scalar example, but so far without any tests

Author: Daniel

examples/scalar/scalar_sdc.cpp

@@ -1,3 +1,10 @@
+/*
+ * Scalar test equation example using an encapsulated IMEX sweeper.
+ * Solves Dahlquist's test equation
+ * y' = a y + i b y
+ * treating the real part implicitly and the imaginary part explicitly.
+ */
+ 
 #include<complex>
 
 #include<pfasst.hpp>
@@ -6,7 +13,7 @@
 
 #include "scalar_sweeper.hpp"
 
-int main(int, char**)
+double run_scalar_sdc()
 {
   pfasst::SDC<> sdc;
 
@@ -34,4 +41,12 @@ int main(int, char**)
 
   sdc.run();
 
+  return sweeper->get_errors();
 }
+
+#ifndef PFASST_UNIT_TESTING
+int main(int /*argc*/, char** /*argv*/)
+{
+  run_scalar_sdc();
+}
+#endif

examples/scalar/scalar_sweeper.hpp

@@ -46,6 +46,12 @@ class ScalarSweeper : public pfasst::encap::IMEXSweeper<time>
       this->exact(qex, t);
       double max_err = abs(qend[0] - qex[0]) / abs(qex[0]);
       cout << "err: " << scientific << max_err << endl;
+      this->_error = max_err;
+    }
+    
+    double get_errors()
+    {
+      return this->_error;    
     }
 
     void predict(bool initial) override
@@ -121,6 +127,7 @@ class ScalarSweeper : public pfasst::encap::IMEXSweeper<time>
     complex<double> _lambda, _y0;
     int _nf1eval, _nf2eval, _nf2comp;
     const complex<double> i_complex = complex<double>(0, 1);
+    double _error;
 
 };
 #endif

tests/examples/CMakeLists.txt

@@ -1,2 +1,3 @@
 
 add_subdirectory(advection_diffusion)
+add_subdirectory(scalar)

tests/examples/scalar/CMakeLists.txt

@@ -0,0 +1,25 @@
+# Building and Running Tests
+include_directories(
+    ${3rdparty_INCLUDES}
+    ${pfasst_INCLUDES}
+)
+
+set(TESTS
+    test_scalar
+)
+
+foreach(test ${TESTS})
+    message(STATUS "  ${test}")
+    add_executable(${test} ${test}.cpp)
+    add_dependencies(${test} googlemock)
+    target_link_libraries(${test}
+        ${3rdparty_DEPENDEND_LIBS}
+        ${pfasst_DEPENDED_LIBS}
+    )
+    set_target_properties(${test}
+        PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tests/examples/scalar
+    )
+    add_test(NAME ${test}
+        COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tests/examples/scalar/${test} --gtest_output=xml:${test}_out.xml
+    )
+endforeach(test)

tests/examples/scalar/test_scalar.cpp

@@ -0,0 +1,16 @@
+/*
+ * Tests for the scalar example solving the test equation
+ */ 
+ 
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#define PFASST_UNIT_TESTING
+#include "../examples/scalar/scalar_sdc.cpp"
+#undef PFASST_UNIT_TESTING
+
+int main(int argc, char** argv)
+{
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}