Changeset 2190 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp

Timestamp:

07/20/21 16:22:31 (3 years ago)

Author:

jderouillat

Message:

Add bound checking when the workflow view is scaned (highlighted by blitz check in debug mode)

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp (modified) (4 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp

@@ -1125 +1125 @@
             {
               ind=j*ni+i ;
-              if (!domainMask(ind))
+              if ( (ind<0)||(!domainMask(ind)) )
               {
                 data_i_index(k) = -1;
@@ -1155 +1155 @@
               data_i_index(k) = -1;
 
-            if (!domainMask(i)) data_i_index(k) = -1;
+            if ( (i<0)||(!domainMask(i)) ) data_i_index(k) = -1;
           }
         }
@@ -1177 +1177 @@
             if (i>=0 && i < domainMask.size())
             {
-              if (domainMask(i))
+              if ( (i<0)||(!domainMask(i)) )
+                data_i_index(k) = -1;
+              else
                 data_i_index(k) = k;
-              else
-                data_i_index(k) = -1;
             }
             else
@@ -1201 +1201 @@
               if (i>=0 && i<ni && j>=0 && j<nj)
               {
-                if (domainMask(ind))
+                if ( (ind<0)||(!domainMask(ind)) )
+                {
+                  data_i_index(count) = -1;
+                  data_j_index(count) = -1;
+                }
+                else
                 {
                   data_i_index(count) = ki;
                   data_j_index(count) = kj;
-                }
-                else
-                {
-                  data_i_index(count) = -1;
-                  data_j_index(count) = -1;
                 }
               }