Changeset 2232

Timestamp:

09/15/21 14:41:40 (3 years ago)

Author:

jderouillat

Message:

Reconsider the workflow view to identify points to exclude 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

@@ -175 +175 @@
   if (domainSrc_->hasArea) domainDest_->area.resize(niDest,njDest);
 
-
   // Set attributes required to define domainDestination->localElement_ and associated views, full and workflow)
   CArray<size_t,1> sourceGlobalIdx = domainSource->getLocalElement()->getGlobalIndex();
@@ -186 +185 @@
   CArray<int,1> sourceWorkflowIdx = domainSource->getLocalView(CElementView::WORKFLOW)->getIndex();
   int srcWorkflowSize = sourceWorkflowIdx.numElements();
-  for (size_t i = 0; i < srcWorkflowSize ; ++i)
-  {
-    {
-      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))
-      {
-        domainDest_->data_i_index(extractedSrcWFIdx) = extractedSrcWFIdx;
-      }
-    }
-  }
 
   int iIdxSrcMin = INT_MAX;
   int jIdxSrcMin = INT_MAX;
+  int IdxMin = 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;
+    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;
+    if ( sourceGlobalIdx(countSrc) < IdxMin )
+      IdxMin = sourceGlobalIdx(countSrc);
   }
   
@@ -223 +213 @@
 
       // ------------------ define transformation only if in the WF ------------------ 
-      int convert_locally_global_idx = (jIdxSrc-jIdxSrcMin)*domainSource->ni + (iIdxSrc-iIdxSrcMin) ;
+      // countSrc+IdxMin is the global position (not index) considering the distributed memory
+      //     - can be compared to the workflow view
+      int iIdxSrc2 = (countSrc+IdxMin)%domainSource->ni_glo;
+      int jIdxSrc2 = (countSrc+IdxMin)/domainSource->ni_glo;
+      int convert_locally_global_idx = (jIdxSrc2-jIdxSrcMin)*domainSource->ni + (iIdxSrc2-iIdxSrcMin) ;
       bool concerned_by_WF(false);
       for ( int i = 0 ; i<sourceWorkflowIdx.numElements() ; ++i )
@@ -236 +230 @@
       {
         transformationMapping_[extractNi_*(jIdxSrc-extractJBegin_)+iIdxSrc-extractIBegin_]=sourceGlobalIdx(countSrc);
+        domainDest_->data_i_index( countDest ) = countDest;
       }
       // -----------------------------------------------------------------------------