Changeset 2190 for XIOS

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)

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• node/domain.cpp (modified) (4 diffs)
• transformation/domain_algorithm/domain_algorithm_extract.cpp (modified) (2 diffs)
• transformation/domain_algorithm/domain_algorithm_reorder.cpp (modified) (1 diff)

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;
                 }
               }

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_extract.cpp

@@ -195 +195 @@
       domainDest_->j_index(countDest) = jIdxSrc-extractJBegin_;
       transformationMapping_[extractNi_*(jIdxSrc-extractJBegin_)+iIdxSrc-extractIBegin_]=sourceGlobalIdx(countSrc);
-      if ( sourceFullIdx(countSrc)==sourceWorkflowIdx(countSrc-countMasked) )
-      {
-        domainDest_->mask_1d(countDest) = 1;
-      }
-      else {
+      if ( ( (countSrc-countMasked) >= sourceWorkflowIdx.numElements() )
+         || ( sourceFullIdx(countSrc)!=sourceWorkflowIdx(countSrc-countMasked) ) )
+      {
         domainDest_->mask_1d(countDest) = 0;
         // if point masked, manage offset between full and worfklow views of domainSource
         countMasked++;
+      }
+      else {
+        domainDest_->mask_1d(countDest) = 1;
       }
 
@@ -262 +263 @@
     }
     else
-      if ( sourceFullIdx(countSrc)!=sourceWorkflowIdx(countSrc-countMasked) )
+      if ( ( (countSrc-countMasked) >= sourceWorkflowIdx.numElements() )
+         || ( sourceFullIdx(countSrc)!=sourceWorkflowIdx(countSrc-countMasked) ) )
       {
         // manage offset between full and worfklow views of domainSource even if point i is not concerned

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_reorder.cpp

@@ -110 +110 @@
    int countMasked(0); // countMasked will store the offset index between full and workflow views
    for (size_t i = 0; i < indexSize ; ++i) {
-     if ( sourceFullIdx(i)==sourceWorkflowIdx(i-countMasked) ) {
-       domainDestination->mask_1d(i) = 1;
+       if ( ( (i-countMasked) >= sourceWorkflowIdx.numElements() )
+         || ( sourceFullIdx(i)!=sourceWorkflowIdx(i-countMasked) ) ) {
+       domainDestination->mask_1d(i) = 0;
+       countMasked++;
      }
      else {
-       domainDestination->mask_1d(i) = 0;
-       countMasked++;
+       domainDestination->mask_1d(i) = 1;
      }
    }