Changeset 1474 for XIOS/dev/XIOS_DEV_CMIP6/src/functor/maximum.cpp

Timestamp:

04/04/18 12:48:53 (6 years ago)

Author:

oabramkina

Message:

DEV_CMIP6: porting changes in r1471.

Now DEV_CMIP6 compiles with PGI.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/functor/maximum.cpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/functor/maximum.cpp

@@ -34 +34 @@
            { 
              for (; it1 != end1; it1++, it++) 
-               if (!NumTraits<double>::isnan(*it1))
+               if (!NumTraits<double>::isNan(*it1))
                {
-                 if (!NumTraits<double>::isnan(*it)) *it = std::max(*it1, *it);
+                 if (!NumTraits<double>::isNan(*it)) *it = std::max(*it1, *it);
                  else *it=*it1 ;  
                }