Sacado: rework mat-vec and advection performance tests.

Tests were reorganized so that different kinds of hierarchical parallelism
can be used in the same test.  The old versions are still in the repo, but
are not compiled.  Once I determine the old ones are no longer needed, I'll
remove them in a later commit.

packages/sacado/test/performance/CMakeLists.txt

@@ -76,29 +76,34 @@ ENDIF()
 
 IF (Sacado_ENABLE_TeuchosCore AND Sacado_ENABLE_KokkosCore)
 
-  TRIBITS_ADD_EXECUTABLE(
-    fad_kokkos_view
-    SOURCES fad_kokkos_view.cpp
-    COMM serial mpi
-    )
-
-  # These tests do not compile with gcc 4.7.x because it doesn't properly
-  # support lambdas.  See github issue #854
-  IF(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8")))
-    TRIBITS_ADD_EXECUTABLE(
-      fad_kokkos_hierarchical
-      SOURCES fad_kokkos_hierarchical.cpp
-      COMM serial mpi
-      )
-
-#    TRIBITS_ADD_EXECUTABLE(
-#      fad_kokkos_mat_vec_perf
-#      SOURCES fad_kokkos_mat_vec_perf.cpp
-#      COMM serial mpi
-#      )
-  ENDIF()
+  # Disable these tests as they have been replaced by mat_vec, advection* below
+
+  # TRIBITS_ADD_EXECUTABLE(
+  #   fad_kokkos_view
+  #   SOURCES fad_kokkos_view.cpp
+  #   COMM serial mpi
+  #   )
+
+  # # These tests do not compile with gcc 4.7.x because it doesn't properly
+  # # support lambdas.  See github issue #854
+  # IF(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8")))
+  #   TRIBITS_ADD_EXECUTABLE(
+  #     fad_kokkos_hierarchical
+  #     SOURCES fad_kokkos_hierarchical.cpp
+  #     COMM serial mpi
+  #     )
+
+  #  TRIBITS_ADD_EXECUTABLE(
+  #    fad_kokkos_mat_vec_perf
+  #    SOURCES fad_kokkos_mat_vec_perf.cpp
+  #    COMM serial mpi
+  #    )
+  # ENDIF()
 
 ENDIF()
 
 ADD_SUBDIRECTORY(fenl_assembly)
 ADD_SUBDIRECTORY(fenl_assembly_view)
+ADD_SUBDIRECTORY(mat_vec)
+ADD_SUBDIRECTORY(advection)
+ADD_SUBDIRECTORY(advection_const_basis)

packages/sacado/test/performance/advection/CMakeLists.txt

@@ -0,0 +1,22 @@
+ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
+
+INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+
+IF (Sacado_ENABLE_KokkosCore AND Sacado_ENABLE_TeuchosCore)
+
+  IF(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8")))
+
+    TRIBITS_ADD_EXECUTABLE(
+      FadAdvectionHierarchicalTest
+      SOURCES common.hpp
+              advection.hpp advection.cpp
+              advection_hierarchical.hpp advection_hierarchical.cpp
+              advection_hierarchical_dfad.hpp advection_hierarchical_dfad.cpp
+              driver.cpp
+      COMM serial mpi
+      )
+
+  ENDIF()
+
+ENDIF()