Changeset 1431

Timestamp:

02/19/18 10:22:30 (7 years ago)

Author:

ymipsl

Message:

Local mask computation must not take into account zoom attributes.

YM

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp (modified) (3 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp

@@ -1173 +1173 @@
      localMask.resize(i_index.numElements()) ;
      localMask=false ;
-     size_t zoom_ibegin= global_zoom_ibegin ;
-     size_t zoom_iend= global_zoom_ibegin+global_zoom_ni-1 ;
-     size_t zoom_jbegin= global_zoom_jbegin ;
-     size_t zoom_jend= global_zoom_jbegin+global_zoom_nj-1 ;
-
 
      size_t dn=data_i_index.numElements() ;
@@ -1192 +1187 @@
           {
             ind=j*ni+i ;
-            if (i_index(ind)>=zoom_ibegin && i_index(ind)<=zoom_iend && j_index(ind)>=zoom_jbegin && j_index(ind)<=zoom_jend)
-            {
-              localMask(ind)=domainMask(ind) ;
-            }
+            localMask(ind)=domainMask(ind) ;
           }
        }
@@ -1204 +1196 @@
           {
             ind=i ;
-            if (i_index(ind)>=zoom_ibegin && i_index(ind)<=zoom_iend && j_index(ind)>=zoom_jbegin && j_index(ind)<=zoom_jend)
-            {
-              localMask(ind)=domainMask(ind) ;
-            }
+            localMask(ind)=domainMask(ind) ;
           }
        }