Changeset 2228

Timestamp:

09/14/21 09:37:55 (3 years ago)

Author:

jderouillat

Message:

Fix in exclude masked points from transformation definition (domain_extract)

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_extract.cpp (modified) (4 diffs)

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

@@ -189 +189 @@
   {
     {
-      int iIdxSrc = sourceWorkflowIdx(i)%domainSource->ni_glo-destIBegin;
-      int jIdxSrc = sourceWorkflowIdx(i)/domainSource->ni_glo-destJBegin;
+      int iIdxSrc = sourceWorkflowIdx(i)%domainSource->ni-destIBegin;
+      int jIdxSrc = sourceWorkflowIdx(i)/domainSource->ni-destJBegin;
       int extractedSrcWFIdx = jIdxSrc * niDest + iIdxSrc;
       if ((extractedSrcWFIdx>=0)&&(extractedSrcWFIdx<niDest*njDest))
@@ -198 +198 @@
     }
   }
+
+  int iIdxSrcMin = INT_MAX;
+  int jIdxSrcMin = INT_MAX;
+  for (int countSrc = 0; countSrc < indexSize ; ++countSrc)
+  {
+      if ( sourceGlobalIdx(countSrc)%domainSource->ni_glo < iIdxSrcMin )
+          iIdxSrcMin = sourceGlobalIdx(countSrc)%domainSource->ni_glo;
+      if ( sourceGlobalIdx(countSrc)/domainSource->ni_glo < jIdxSrcMin )
+          jIdxSrcMin = sourceGlobalIdx(countSrc)/domainSource->ni_glo;
+  }
   
   int countDest(0); // increment of the position in destination domain 
-  for (int countSrc = 0; countSrc < indexSize ; ++countSrc) {
+  for (int countSrc = 0; countSrc < indexSize ; ++countSrc)
+  {
     int iIdxSrc = sourceGlobalIdx(countSrc)%domainSource->ni_glo;
     int jIdxSrc = sourceGlobalIdx(countSrc)/domainSource->ni_glo;
@@ -211 +222 @@
       domainDest_->j_index(countDest) = jIdxSrc-extractJBegin_;
 
+      // ------------------ define transformation only if in the WF ------------------ 
+      int convert_locally_global_idx = (jIdxSrc-jIdxSrcMin)*domainSource->ni + (iIdxSrc-iIdxSrcMin) ;
       bool concerned_by_WF(false);
       for ( int i = 0 ; i<sourceWorkflowIdx.numElements() ; ++i )
       {
-        if (sourceWorkflowIdx(i)==countSrc)
+        if (sourceWorkflowIdx(i)==convert_locally_global_idx)
         {      
           concerned_by_WF = true;
@@ -224 +237 @@
         transformationMapping_[extractNi_*(jIdxSrc-extractJBegin_)+iIdxSrc-extractIBegin_]=sourceGlobalIdx(countSrc);
       }
+      // -----------------------------------------------------------------------------
 
       int iIdxDestLocal = countDest%niDest;