Changeset 1509


Ignore:
Timestamp:
05/30/18 17:20:39 (2 years ago)
Author:
oabramkina
Message:

Minor bugfix: in certain cases type of XIOS attributes wasn't recognized by the conditional operator ?:.

Location:
XIOS/dev/XIOS_DEV_CMIP6/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_output.cpp

    r1494 r1509  
    11831183        axis->computeWrittenCompressedIndex(comm_file); 
    11841184        
    1185         int zoom_size  = (MULTI_FILE == SuperClass::type) ? axis->zoom_n 
    1186                                                           : axis->global_zoom_n; 
     1185        int zoom_size  = (MULTI_FILE == SuperClass::type) ? axis->zoom_n.getValue() 
     1186                                                          : axis->global_zoom_n.getValue(); 
    11871187 
    11881188        int zoom_count = axis->zoom_n;                                                  
  • XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp

    r1486 r1509  
    18011801             int iend = ibegin + ni -1; 
    18021802             int jend = jbegin + nj -1; 
    1803              zoom_ibegin = global_zoom_ibegin > ibegin ? global_zoom_ibegin : ibegin; 
     1803             zoom_ibegin = global_zoom_ibegin > ibegin ? global_zoom_ibegin.getValue() : ibegin; 
    18041804             int zoom_iend  = global_zoom_iend < iend ? zoom_iend : iend ; 
    18051805             zoom_ni     = zoom_iend-zoom_ibegin+1 ; 
    18061806 
    1807              zoom_jbegin = global_zoom_jbegin > jbegin ? global_zoom_jbegin : jbegin ; 
     1807             zoom_jbegin = global_zoom_jbegin > jbegin ? global_zoom_jbegin.getValue() : jbegin ; 
    18081808             int zoom_jend   = global_zoom_jend < jend ? zoom_jend : jend; 
    18091809             zoom_nj     = zoom_jend-zoom_jbegin+1; 
     
    25942594    int zoom_jend_glob = global_zoom_jbegin + global_zoom_nj - 1; 
    25952595 
    2596     zoom_ibegin.setValue(global_zoom_ibegin > ibegin ? global_zoom_ibegin : ibegin); 
     2596    zoom_ibegin.setValue(global_zoom_ibegin > ibegin ? global_zoom_ibegin.getValue() : ibegin); 
    25972597    int zoom_iend = zoom_iend_glob < iend ? zoom_iend_glob : iend ; 
    25982598    zoom_ni.setValue(zoom_iend-zoom_ibegin+1); 
    25992599 
    2600     zoom_jbegin.setValue(global_zoom_jbegin > jbegin ? global_zoom_jbegin : jbegin); 
     2600    zoom_jbegin.setValue(global_zoom_jbegin > jbegin ? global_zoom_jbegin.getValue() : jbegin); 
    26012601    int zoom_jend = zoom_jend_glob < jend ? zoom_jend_glob : jend ; 
    26022602    zoom_nj.setValue(zoom_jend-zoom_jbegin+1); 
     
    26572657   
    26582658    if (nbMaskInd != globalLocalIndexMap_.size()) 
    2659       info (0) << "If the domain " << this->getDomainOutputName() <<" does not have overlapped region between processes." 
    2660                << "Something must be wrong with mask index "<< std::endl; 
     2659      info (0) << "If domain " << this->getDomainOutputName() <<" does not have overlapped regions between processes " 
     2660               << "something must be wrong with mask index "<< std::endl; 
    26612661 
    26622662    nbMaskInd = globalLocalIndexMap_.size(); 
     
    27332733     
    27342734      if (nbLonInd != globalLocalIndexMap_.size()) 
    2735         info (0) << "If the domain " << this->getDomainOutputName() <<" does not have overlapped region between processes." 
    2736                  << "Something must be wrong with longitude index "<< std::endl; 
     2735        info (0) << "If domain " << this->getDomainOutputName() <<" does not have overlapped regions between processes " 
     2736                 << "something must be wrong with longitude index "<< std::endl; 
    27372737 
    27382738      nbLonInd = globalLocalIndexMap_.size(); 
     
    28172817     
    28182818      if (nbLatInd != globalLocalIndexMap_.size()) 
    2819         info (0) << "If the domain " << this->getDomainOutputName() <<" does not have overlapped region between processes." 
    2820                 << "Something must be wrong with latitude index "<< std::endl; 
     2819        info (0) << "If domain " << this->getDomainOutputName() <<" does not have overlapped regions between processes " 
     2820                << "something must be wrong with latitude index "<< std::endl; 
    28212821 
    28222822      nbLatInd = globalLocalIndexMap_.size(); 
     
    28992899 
    29002900      if (nbAreaInd != globalLocalIndexMap_.size()) 
    2901         info (0) << "If the domain " << this->getDomainOutputName() <<" does not have overlapped region between processes." 
    2902                  << "Something must be wrong with area index "<< std::endl; 
     2901        info (0) << "If domain " << this->getDomainOutputName() <<" does not have overlapped regions between processes " 
     2902                 << "something must be wrong with area index "<< std::endl; 
    29032903 
    29042904      nbAreaInd = globalLocalIndexMap_.size(); 
  • XIOS/dev/XIOS_DEV_CMIP6/src/type/type_decl.cpp

    r1158 r1509  
    33#include "type_ref_impl.hpp" 
    44#include "type_specialisation.hpp" 
    5 #include <string> ; 
     5#include <string> 
    66#include "date.hpp" 
    77#include "xios_spl.hpp" 
Note: See TracChangeset for help on using the changeset viewer.