Changeset 1390 for XIOS/dev/XIOS_DEV_CMIP6/src/node
- Timestamp:
- 01/08/18 16:46:46 (6 years ago)
- Location:
- XIOS/dev/XIOS_DEV_CMIP6/src/node
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp
r1364 r1390 1902 1902 itSrve = writtenGlobalIndex.end(), itSrv; 1903 1903 1904 // for (itSrv = itSrvb; itSrv != itSrve; ++itSrv) 1905 // { 1906 // indGlo = *itSrv; 1907 // if (ite != globalLocalIndexMap_.find(indGlo)) 1908 // { 1909 // ++nbWritten; 1910 // } 1911 // } 1912 1913 // localIndexToWriteOnServer.resize(nbWritten); 1914 localIndexToWriteOnServer.resize(writtenGlobalIndex.numElements()); 1915 1916 nbWritten = 0; 1904 1917 for (itSrv = itSrvb; itSrv != itSrve; ++itSrv) 1905 1918 { 1906 1919 indGlo = *itSrv; 1907 1920 if (ite != globalLocalIndexMap_.find(indGlo)) 1908 {1909 ++nbWritten;1910 }1911 }1912 1913 localIndexToWriteOnServer.resize(nbWritten);1914 1915 nbWritten = 0;1916 for (itSrv = itSrvb; itSrv != itSrve; ++itSrv)1917 {1918 indGlo = *itSrv;1919 if (ite != globalLocalIndexMap_.find(indGlo))1920 1921 { 1921 1922 localIndexToWriteOnServer(nbWritten) = globalLocalIndexMap_[indGlo]; 1922 1923 ++nbWritten; 1923 } 1924 } 1925 else 1926 { 1927 localIndexToWriteOnServer(nbWritten) = 0; 1928 ++nbWritten; 1929 } 1924 1930 } 1925 1931 -
XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.hpp
r1353 r1390 475 475 if (2 == axisDomainOrder(i)) 476 476 { 477 maskValue = maskValue && (*domainMasks[idxDomain])(idxLoop[indexMap[i]] + idxLoop[indexMap[i]+1] * eachDimSize[indexMap[i]]); 477 int idxTmp = idxLoop[indexMap[i]] + idxLoop[indexMap[i]+1] * eachDimSize[indexMap[i]]; 478 if (idxTmp < (*domainMasks[idxDomain]).numElements()) 479 maskValue = maskValue && (*domainMasks[idxDomain])(idxTmp); 480 else 481 maskValue = false; 478 482 ++idxDomain; 479 483 }
Note: See TracChangeset
for help on using the changeset viewer.