Ignore:
Timestamp:
10/24/17 11:03:29 (4 years ago)
Author:
ymipsl
Message:

Fix conflict between for domain mask_1d and mask_2d when inheritance is done after transformation. Now class attribute "domainMask" is fill either by mask_1d or mask_2d and will be used instead of mask_1d in code.
This is a temporary fix which will solve later by reconstructing a cleanear grid graph.

YM

File:
1 edited

Legend:

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

    r937 r1311  
    313313    for (size_t idx = 0; idx < vecAxisValueSize; ++idx) 
    314314    { 
    315       if (dom->mask_1d(idx)) ++vecAxisValueSizeWithMask; 
     315      if (dom->domainMask(idx)) ++vecAxisValueSizeWithMask; 
    316316    } 
    317317 
     
    324324      for (size_t idx = 0; idx < vecAxisValueSize; ++idx) 
    325325      { 
    326         if (dom->mask_1d(idx)) 
     326        if (dom->domainMask(idx)) 
    327327        { 
    328328          transPosition_[indexMask].resize(1); 
     
    345345    for (size_t idx = 0; idx < vecAxisValueSize; ++idx) 
    346346    { 
    347       if (dom->mask_1d(idx)) 
     347      if (dom->domainMask(idx)) 
    348348      { 
    349349        size_t axisValueSize = 0; 
Note: See TracChangeset for help on using the changeset viewer.