Changeset 775 for XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp

Timestamp:

11/02/15 11:46:25 (9 years ago)

Author:

mhnguyen

Message:

Implementing the reading of attributes of an axis from a file

+) 3d grid can be read directly from a file
+) Clean some redundant codes
+) Add new attribute declaration that allows to output only desired attributes

Test
+) On Curie
+) test_remap passes and result is correct

File:

• XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp (modified) (2 diffs)

XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp

@@ -78 +78 @@
     bool isNorthPole = false;
     bool isSouthPole = false;
-    if (poleValue == std::abs(domainSrc_->lat_start)) isNorthPole = true;
-    if (poleValue == std::abs(domainSrc_->lat_end)) isSouthPole = true;
+    if (std::abs(poleValue - std::abs(domainSrc_->lat_start)) < NumTraits<double>::epsilon()) isNorthPole = true;
+    if (std::abs(poleValue - std::abs(domainSrc_->lat_end)) < NumTraits<double>::epsilon()) isSouthPole = true;
 
     nVertexSrc = constNVertex;
@@ -121 +121 @@
     bool isNorthPole = false;
     bool isSouthPole = false;
-    if (poleValue == std::abs(domainDest_->lat_start)) isNorthPole = true;
-    if (poleValue == std::abs(domainDest_->lat_end)) isSouthPole = true;
+    if (std::abs(poleValue - std::abs(domainDest_->lat_start)) < NumTraits<double>::epsilon()) isNorthPole = true;
+    if (std::abs(poleValue - std::abs(domainDest_->lat_end)) < NumTraits<double>::epsilon()) isSouthPole = true;
     if (isNorthPole && (0 == domainDest_->jbegin.getValue()))
     {