Changeset 2658 for XIOS3

Timestamp:

09/20/24 11:09:47 (5 months ago)

Author:

jderouillat

Message:

Functions called in a kernel must be marked as a device function

Location:

XIOS3/dev/XIOS_KOKKOS/src

Files:

• functor/average.cpp (modified) (2 diffs)
• utils.hpp (modified) (1 diff)

XIOS3/dev/XIOS_KOKKOS/src/functor/average.cpp

@@ -44 +44 @@
             Kokkos::parallel_for( "init_avg", nElements, KOKKOS_LAMBDA( const size_t i )
             {
-              //if (!NumTraits<double>::isNan(_dinput(i))) (nbcalls(i)) ++;
-              if ((_dinput(i)<100000)) (nbcalls_loc(i)) ++;
+              if (!NumTraits<double>::isNan(_dinput(i))) (nbcalls_loc(i)) ++;
             });
             Kokkos::fence();
@@ -57 +56 @@
             Kokkos::parallel_for( "increment_avg", nElements, KOKKOS_LAMBDA( const size_t i )
             {
-              //if (!NumTraits<double>::isNan(_dinput(i))) 
-              if ((_dinput(i)<100000)) 
+              if (!NumTraits<double>::isNan(_dinput(i))) 
               {
                 if (nbcalls_loc(i) != 0) _doutput(i)  += _dinput(i);

XIOS3/dev/XIOS_KOKKOS/src/utils.hpp

@@ -278 +278 @@
     return 1e-12;
   }
-  static inline bool isNan(const Scalar& v) {
+  static inline bool __device__ __host__ isNan(const Scalar& v) {
     return (v != v);
   }