- Timestamp:
- 05/30/18 17:20:39 (6 years ago)
- 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 1183 1183 axis->computeWrittenCompressedIndex(comm_file); 1184 1184 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(); 1187 1187 1188 1188 int zoom_count = axis->zoom_n; -
XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp
r1486 r1509 1801 1801 int iend = ibegin + ni -1; 1802 1802 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; 1804 1804 int zoom_iend = global_zoom_iend < iend ? zoom_iend : iend ; 1805 1805 zoom_ni = zoom_iend-zoom_ibegin+1 ; 1806 1806 1807 zoom_jbegin = global_zoom_jbegin > jbegin ? global_zoom_jbegin : jbegin ;1807 zoom_jbegin = global_zoom_jbegin > jbegin ? global_zoom_jbegin.getValue() : jbegin ; 1808 1808 int zoom_jend = global_zoom_jend < jend ? zoom_jend : jend; 1809 1809 zoom_nj = zoom_jend-zoom_jbegin+1; … … 2594 2594 int zoom_jend_glob = global_zoom_jbegin + global_zoom_nj - 1; 2595 2595 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); 2597 2597 int zoom_iend = zoom_iend_glob < iend ? zoom_iend_glob : iend ; 2598 2598 zoom_ni.setValue(zoom_iend-zoom_ibegin+1); 2599 2599 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); 2601 2601 int zoom_jend = zoom_jend_glob < jend ? zoom_jend_glob : jend ; 2602 2602 zoom_nj.setValue(zoom_jend-zoom_jbegin+1); … … 2657 2657 2658 2658 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; 2661 2661 2662 2662 nbMaskInd = globalLocalIndexMap_.size(); … … 2733 2733 2734 2734 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; 2737 2737 2738 2738 nbLonInd = globalLocalIndexMap_.size(); … … 2817 2817 2818 2818 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; 2821 2821 2822 2822 nbLatInd = globalLocalIndexMap_.size(); … … 2899 2899 2900 2900 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; 2903 2903 2904 2904 nbAreaInd = globalLocalIndexMap_.size(); -
XIOS/dev/XIOS_DEV_CMIP6/src/type/type_decl.cpp
r1158 r1509 3 3 #include "type_ref_impl.hpp" 4 4 #include "type_specialisation.hpp" 5 #include <string> ;5 #include <string> 6 6 #include "date.hpp" 7 7 #include "xios_spl.hpp"
Note: See TracChangeset
for help on using the changeset viewer.