Changeset 1474 for XIOS/dev/XIOS_DEV_CMIP6/src/filter

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.

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/filter

Files:

• file_writer_filter.cpp (modified) (1 diff)
• spatial_transform_filter.cpp (modified) (1 diff)
• store_filter.cpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/filter/file_writer_filter.cpp

@@ -29 +29 @@
       for (size_t idx = 0; idx < nbData; ++idx)
       {
-        if (NumTraits<double>::isnan(dataArray(idx)))
+        if (NumTraits<double>::isNan(dataArray(idx)))
           dataArray(idx) = missingValue;
       }

XIOS/dev/XIOS_DEV_CMIP6/src/filter/spatial_transform_filter.cpp

@@ -196 +196 @@
     bool ignoreMissingValue = false; 
     double defaultValue = std::numeric_limits<double>::quiet_NaN();
-    if (0 != dataDest.numElements()) ignoreMissingValue = NumTraits<double>::isnan(dataDest(0));
+    if (0 != dataDest.numElements()) ignoreMissingValue = NumTraits<double>::isNan(dataDest(0));
 
     const std::list<CGridTransformation::SendingIndexGridSourceMap>& listLocalIndexSend = gridTransformation->getLocalIndexToSendFromGridSource();

XIOS/dev/XIOS_DEV_CMIP6/src/filter/store_filter.cpp

@@ -93 +93 @@
       for (size_t idx = 0; idx < nbData; ++idx)
       {
-        if (NumTraits<double>::isnan(packet->data(idx)))
+        if (NumTraits<double>::isNan(packet->data(idx)))
           packet->data(idx) = missingValue;
       }