Changeset 1578


Ignore:
Timestamp:
09/19/18 14:15:45 (21 months ago)
Author:
ymipsl
Message:

Bug fix when reading rectilinear and attemp to call generate_rectilinear_domain filter. Coordinates in file was not taking into account.

YM

Location:
XIOS/trunk/src/node
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/node/domain.cpp

    r1565 r1578  
    3333      , lonvalue(), latvalue(), bounds_lonvalue(), bounds_latvalue() 
    3434      , globalLocalIndexMap_(), computedWrittenIndex_(false) 
    35       , clients() 
     35      , clients(), hasLatInReadFile_(false), hasBoundsLatInReadFile_(false) 
     36      , hasLonInReadFile_(false), hasBoundsLonInReadFile_(false) 
    3637   { 
    3738   } 
     
    4546      , lonvalue(), latvalue(), bounds_lonvalue(), bounds_latvalue() 
    4647      , globalLocalIndexMap_(), computedWrittenIndex_(false) 
    47       , clients() 
     48      , clients(), hasLatInReadFile_(false), hasBoundsLatInReadFile_(false) 
     49      , hasLonInReadFile_(false), hasBoundsLonInReadFile_(false) 
    4850   { 
    4951    } 
     
    466468       lon_end.setValue(lonvalue_rectilinear_read_from_file(ni_glo-1)); 
    467469     } 
    468      else 
     470     else if (!hasLonInReadFile_) 
    469471     { 
    470472       if (!lonvalue_2d.isEmpty()) lonvalue_2d.free(); 
     
    500502       lat_end.setValue(latvalue_rectilinear_read_from_file(nj_glo-1)); 
    501503     } 
    502      else 
     504     else if (!hasLatInReadFile_) 
    503505     { 
    504506       if (!latvalue_2d.isEmpty()) latvalue_1d.free(); 
  • XIOS/trunk/src/node/domain.hpp

    r1553 r1578  
    151151         bool hasLonLat; 
    152152         bool hasPole ; 
     153         bool hasLatInReadFile_ ; // specify if latitude is defined on read file, so it can be read later when grid distribution will be defined 
     154         bool hasBoundsLatInReadFile_ ; // specify if latitude boundarues are defined on read file, so it can be read later when grid distribution will be defined 
     155         bool hasLonInReadFile_ ; // specify if longitude is defined on read file, so it can be read later when grid distribution will be defined 
     156         bool hasBoundsLonInReadFile_ ; // specify if longitude boundaries are defined on read file, so it can be read later when grid distribution will be defined 
    153157 
    154158         void computeLocalMask(void) ; 
Note: See TracChangeset for help on using the changeset viewer.