Changeset 2190 for XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_extract.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/transformation/domain_algorithm/domain_algorithm_extract.cpp (modified) (2 diffs)

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