Changeset 1160 for XIOS/dev/branch_yushan_merged/src/transformation

Timestamp:

06/06/17 19:06:45 (7 years ago)

Author:

yushan

Message:

fix bad commit. Back to R1155 branch not merged

Location:

XIOS/dev/branch_yushan_merged/src/transformation

Files:

• Functions/average_reduction.cpp (modified) (2 diffs)
• Functions/max_reduction.cpp (modified) (2 diffs)
• Functions/min_reduction.cpp (modified) (2 diffs)
• Functions/sum_reduction.cpp (modified) (2 diffs)
• generic_algorithm_transformation.cpp (modified) (1 diff)

XIOS/dev/branch_yushan_merged/src/transformation/Functions/average_reduction.cpp

@@ -39 +39 @@
     int nbLocalIndex = localIndex.size();
     int currentlocalIndex = 0;
-    double currentWeight  = 0.0;    
+    double currentWeight  = 0.0;
 
+    dataOut=std::numeric_limits<double>::quiet_NaN();
 
     for (int idx = 0; idx < nbLocalIndex; ++idx)
@@ -58 +59 @@
           weights_(currentlocalIndex) += 1.0;
         }
-      }
-      else
-      {
-        if (flagInitial[currentlocalIndex]) 
-          dataOut(currentlocalIndex) = std::numeric_limits<double>::quiet_NaN();
       }
     }

XIOS/dev/branch_yushan_merged/src/transformation/Functions/max_reduction.cpp

@@ -37 +37 @@
     int nbLocalIndex = localIndex.size();
     int currentlocalIndex = 0;
-
+    dataOut=std::numeric_limits<double>::quiet_NaN();    
     for (int idx = 0; idx < nbLocalIndex; ++idx)
     {
@@ -52 +52 @@
           dataOut(currentlocalIndex) = std::max(*(dataInput + idx), dataOut(currentlocalIndex));
         }
-      }
-      else
-      {
-        if (flagInitial[currentlocalIndex]) 
-          dataOut(currentlocalIndex) = std::numeric_limits<double>::quiet_NaN();
       }
     }

XIOS/dev/branch_yushan_merged/src/transformation/Functions/min_reduction.cpp

@@ -37 +37 @@
     int nbLocalIndex = localIndex.size();
     int currentlocalIndex = 0;
-
+    dataOut=std::numeric_limits<double>::quiet_NaN();
     for (int idx = 0; idx < nbLocalIndex; ++idx)
     {
@@ -52 +52 @@
           dataOut(currentlocalIndex) = std::min(*(dataInput + idx), dataOut(currentlocalIndex));
         }
-      }
-      else
-      {
-        if (flagInitial[currentlocalIndex]) 
-          dataOut(currentlocalIndex) = std::numeric_limits<double>::quiet_NaN();
       }
     }

XIOS/dev/branch_yushan_merged/src/transformation/Functions/sum_reduction.cpp

@@ -37 +37 @@
     int nbLocalIndex = localIndex.size();
     int currentlocalIndex = 0;
+
+    dataOut=std::numeric_limits<double>::quiet_NaN();
   
     for (int idx = 0; idx < nbLocalIndex; ++idx)
@@ -52 +54 @@
           dataOut(currentlocalIndex) += *(dataInput + idx);
         }
-      }
-      else
-      {
-        if (flagInitial[currentlocalIndex]) 
-          dataOut(currentlocalIndex) = std::numeric_limits<double>::quiet_NaN();
       }
     }    

XIOS/dev/branch_yushan_merged/src/transformation/generic_algorithm_transformation.cpp

@@ -45 +45 @@
       {
         dataOut(localIndex[idx].first) += *(dataInput + idx) * localIndex[idx].second;
-        flagInitial[localIndex[idx].first] = true; // Reset flag to indicate not all data source are nan
-      }
-    }
-
-    // If all data source are nan then data destination must be nan
-    for (int idx = 0; idx < nbLocalIndex; ++idx)
-    {
-      if (!flagInitial[localIndex[idx].first])
-        dataOut(localIndex[idx].first) = defaultValue;
-    }
+      }
+    }
+
+    // for (int idx = 0; idx < nbLocalIndex; ++idx)
+    // {
+    //   if (!flagInitial[localIndex[idx].first])
+    //     dataOut(localIndex[idx].first) = defaultValue;
+    // }
   }
   else