Ignore:
Timestamp:
04/13/18 10:33:54 (3 years ago)
Author:
ymipsl
Message:

Fix for transformation & interpolation : better detection of missing values.

YM

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/XIOS_DEV_CMIP6/src/transformation/domain_algorithm_interpolate.cpp

    r1474 r1480  
    912912     } 
    913913 
     914    if (firstPass) 
     915    { 
     916      allMissing.resize(dataOut.numElements()) ; 
     917      allMissing=true ; 
     918    } 
     919 
    914920    for (int idx = 0; idx < nbLocalIndex; ++idx) 
    915921    { 
    916922      if (NumTraits<double>::isNan(*(dataInput + idx))) 
    917923      { 
    918         flagInitial[localIndex[idx].first] = false; 
     924        allMissing(localIndex[idx].first) = allMissing(localIndex[idx].first) && true; 
    919925        if (renormalize) renormalizationFactor(localIndex[idx].first)-=localIndex[idx].second ; 
    920926      } 
     
    922928      { 
    923929        dataOut(localIndex[idx].first) += *(dataInput + idx) * localIndex[idx].second; 
    924         flagInitial[localIndex[idx].first] = true; // Reset flag to indicate not all data source are nan 
     930        allMissing(localIndex[idx].first) = allMissing(localIndex[idx].first) && false; // Reset flag to indicate not all data source are nan 
    925931      } 
    926932    } 
    927933 
    928     // If all data source are nan then data destination must be nan 
     934  } 
     935  else 
     936  { 
    929937    for (int idx = 0; idx < nbLocalIndex; ++idx) 
    930938    { 
    931       if (!flagInitial[localIndex[idx].first]) 
    932         dataOut(localIndex[idx].first) = defaultValue; 
    933     } 
    934   } 
    935   else 
    936   { 
    937     for (int idx = 0; idx < nbLocalIndex; ++idx) 
    938     { 
    939939      dataOut(localIndex[idx].first) += *(dataInput + idx) * localIndex[idx].second; 
    940940    } 
     
    944944void CDomainAlgorithmInterpolate::updateData(CArray<double,1>& dataOut) 
    945945{ 
    946   if (detectMissingValue && renormalize) 
    947   { 
    948     if (renormalizationFactor.numElements()>0) dataOut/=renormalizationFactor ; // In some case, process doesn't received any data for interpolation (mask) 
    949                                                                                 // so renormalizationFactor is not initialized 
    950   } 
    951 } 
    952  
    953 } 
     946  if (detectMissingValue) 
     947  { 
     948    double defaultValue = std::numeric_limits<double>::quiet_NaN(); 
     949    size_t nbIndex=dataOut.numElements() ;  
     950 
     951    for (int idx = 0; idx < nbIndex; ++idx) 
     952    { 
     953      if (allMissing(idx)) dataOut(idx) = defaultValue; // If all data source are nan then data destination must be nan 
     954    } 
     955     
     956    if (renormalize) 
     957    { 
     958      if (renormalizationFactor.numElements()>0) dataOut/=renormalizationFactor ; // In some case, process doesn't received any data for interpolation (mask) 
     959                                                                                 // so renormalizationFactor is not initialized 
     960    } 
     961  } 
     962} 
     963 
     964} 
Note: See TracChangeset for help on using the changeset viewer.