Changeset 1003 for XIOS/trunk


Ignore:
Timestamp:
11/24/16 13:24:17 (7 years ago)
Author:
mhnguyen
Message:

Correcting the behavior of arithmetic expression in a field which has no reference to another field (no field_ref).
The order of filter chaining is mentioned in r998

Test
+) On Curie
+) Work

Location:
XIOS/trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/filter/spatial_transform_filter.cpp

    r979 r1003  
    218218    if (dataCurrentDest.numElements() != dataDest.numElements()) 
    219219    ERROR("CSpatialTransformFilterEngine::apply(const CArray<double, 1>& dataSrc, CArray<double,1>& dataDest)", 
    220           "Incoherent between the received size and expected size" << 
    221           "Expected size: " << dataDest.numElements() << 
    222           "Received size: " << dataCurrentDest.numElements()); 
     220          "Incoherent between the received size and expected size. " << std::endl  
     221          << "Expected size: " << dataDest.numElements() << std::endl  
     222          << "Received size: " << dataCurrentDest.numElements()); 
    223223 
    224224    dataDest = dataCurrentDest; 
  • XIOS/trunk/src/node/field.cpp

    r1000 r1003  
    11301130     else if (grid && grid->hasTransform() && !grid->isTransformed()) 
    11311131     { 
    1132        grid->transformGrid(grid); 
     1132       // Temporarily deactivate the self-transformation of grid 
     1133       //grid->transformGrid(grid); 
    11331134     } 
    11341135   } 
  • XIOS/trunk/src/node/grid.cpp

    r988 r1003  
    281281 
    282282       if (this->isChecked) return; 
     283 
    283284       if (context->hasClient) 
    284285       { 
     
    286287       } 
    287288 
    288        this->isChecked = true; 
     289       if (!(this->hasTransform() && !this->isTransformed())) 
     290        this->isChecked = true; 
    289291       return; 
    290292     } 
     
    301303        this->computeIndex(); 
    302304     } 
    303      this->isChecked = true; 
     305 
     306     if (!(this->hasTransform() && !this->isTransformed()))  
     307      this->isChecked = true; 
    304308   } 
    305309 
Note: See TracChangeset for help on using the changeset viewer.