panzer: update ArithTraits namespace for KOKKOS_VERSION > 40799

Compatibility update corresponding to kokkos/kokkos-kernels#2771

Signed-off-by: Nathan Ellingwood <ndellin@sandia.gov>

Author: ndellingwood

packages/panzer/disc-fe/src/Panzer_Interpolation.cpp

@@ -33,9 +33,17 @@ removeSmallEntries(Teuchos::RCP<Tpetra::CrsMatrix<Scalar, LocalOrdinal, GlobalOr
   using col_idx_type = typename crs_matrix::local_graph_device_type::entries_type::non_const_type;
   using vals_type    = typename crs_matrix::local_matrix_device_type::values_type;
 
+#if KOKKOS_VERSION > 40799
+  using ATS = KokkosKernels::ArithTraits<Scalar>;
+#else
   using ATS = Kokkos::ArithTraits<Scalar>;
+#endif
   using impl_SC  = typename ATS::val_type;
+#if KOKKOS_VERSION > 40799
+  using impl_ATS = KokkosKernels::ArithTraits<impl_SC>;
+#else
   using impl_ATS = Kokkos::ArithTraits<impl_SC>;
+#endif
 
   auto lclA = A->getLocalMatrixDevice();
 
@@ -159,7 +167,11 @@ Teuchos::RCP<Thyra::LinearOpBase<double> > buildInterpolation(const Teuchos::RCP
   using Scalar = double;
 
   using STS = Teuchos::ScalarTraits<Scalar>;
+#if KOKKOS_VERSION > 40799
+  using KAT = KokkosKernels::ArithTraits<Scalar>;
+#else
   using KAT = Kokkos::ArithTraits<Scalar>;
+#endif
   using OT  = Teuchos::OrdinalTraits<GlobalOrdinal>;
 
   using DeviceSpace = PHX::Device;

packages/panzer/mini-em/src/closures/MiniEM_DarcyAnalyticForcing_impl.hpp

@@ -17,7 +17,11 @@
 #include "Panzer_GatherBasisCoordinates.hpp"
 
 #include "Panzer_Traits.hpp"
+#if KOKKOS_VERSION > 40799
+#include "KokkosKernels_ArithTraits.hpp"
+#else
 #include "Kokkos_ArithTraits.hpp"
+#endif
 #include "Kokkos_MathematicalConstants.hpp"
 #include "Kokkos_MathematicalFunctions.hpp"
 

packages/panzer/mini-em/src/closures/MiniEM_DarcyAnalyticSolution_impl.hpp

@@ -17,7 +17,11 @@
 #include "Panzer_GatherBasisCoordinates.hpp"
 
 #include "Panzer_Traits.hpp"
+#if KOKKOS_VERSION > 40799
+#include "KokkosKernels_ArithTraits.hpp"
+#else
 #include "Kokkos_ArithTraits.hpp"
+#endif
 #include "Kokkos_MathematicalConstants.hpp"
 #include "Kokkos_MathematicalFunctions.hpp"
 

packages/panzer/mini-em/src/closures/MiniEM_MaxwellAnalyticForcing_impl.hpp

@@ -17,7 +17,11 @@
 #include "Panzer_GatherBasisCoordinates.hpp"
 
 #include "Panzer_Traits.hpp"
+#if KOKKOS_VERSION > 40799
+#include "KokkosKernels_ArithTraits.hpp"
+#else
 #include "Kokkos_ArithTraits.hpp"
+#endif
 #include "Kokkos_MathematicalConstants.hpp"
 #include "Kokkos_MathematicalFunctions.hpp"
 

packages/panzer/mini-em/src/closures/MiniEM_MaxwellAnalyticSolution_impl.hpp

@@ -17,7 +17,11 @@
 #include "Panzer_GatherBasisCoordinates.hpp"
 
 #include "Panzer_Traits.hpp"
+#if KOKKOS_VERSION > 40799
+#include "KokkosKernels_ArithTraits.hpp"
+#else
 #include "Kokkos_ArithTraits.hpp"
+#endif
 #include "Kokkos_MathematicalConstants.hpp"
 #include "Kokkos_MathematicalFunctions.hpp"
 

packages/panzer/mini-em/src/closures/MiniEM_RandomForcing_impl.hpp

@@ -21,7 +21,11 @@
 #include "Panzer_Traits.hpp"
 #include "Kokkos_Random.hpp"
 #include "MiniEM_Sacado_Kokkos_Random.hpp"
+#if KOKKOS_VERSION > 40799
+#include "KokkosKernels_ArithTraits.hpp"
+#else
 #include "Kokkos_ArithTraits.hpp"
+#endif
 
 
 namespace mini_em {
@@ -74,7 +78,11 @@ void RandomForcing<EvalT,Traits>::evaluateFields(typename Traits::EvalData works
 
   // double time = workset.time;
 
+#if KOKKOS_VERSION > 40799
+  using IST = typename KokkosKernels::ArithTraits<ScalarT>::val_type;
+#else
   using IST = typename Kokkos::ArithTraits<ScalarT>::val_type;
+#endif
 
   const IST max = static_cast<IST>(rangeMin_);
   const IST min = static_cast<IST>(rangeMax_);