Changeset 2340

Timestamp:

06/28/22 17:08:49 (2 years ago)

Author:

jderouillat

Message:

Fix some transformations for nemo domain decomposition

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation

Files:

• axis_algorithm/axis_algorithm_extract_domain.cpp (modified) (2 diffs)
• domain_algorithm/domain_algorithm_extract.cpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_extract_domain.cpp

@@ -130 +130 @@
       {
         axisDest_->index(countDest) = sourceGlobalIdx(countSrc)/domainSource->ni_glo;
-        int iIdxSrc2 = (countSrc+IdxMin)%domainSource->ni_glo;
-        int jIdxSrc2 = (countSrc+IdxMin)/domainSource->ni_glo;
+        int iIdxSrc2 = (countSrc%domainSource->ni)+(IdxMin)%domainSource->ni_glo;
+        int jIdxSrc2 = (countSrc/domainSource->ni)+(IdxMin)/domainSource->ni_glo;
         int convert_locally_global_idx = (jIdxSrc2-jIdxSrcMin)*domainSource->ni + (iIdxSrc2-iIdxSrcMin) ;
         bool concerned_by_WF(false);
@@ -159 +159 @@
       {
         axisDest_->index(countDest) = sourceGlobalIdx(countSrc)%domainSource->ni_glo;
-        int iIdxSrc2 = (countSrc+IdxMin)%domainSource->ni_glo;
-        int jIdxSrc2 = (countSrc+IdxMin)/domainSource->ni_glo;
+        int iIdxSrc2 = (countSrc%domainSource->ni)+(IdxMin)%domainSource->ni_glo;
+        int jIdxSrc2 = (countSrc/domainSource->ni)+(IdxMin)/domainSource->ni_glo;
         int convert_locally_global_idx = (jIdxSrc2-jIdxSrcMin)*domainSource->ni + (iIdxSrc2-iIdxSrcMin) ;
         bool concerned_by_WF(false);

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

@@ -200 +200 @@
       IdxMin = sourceGlobalIdx(countSrc);
   }
-  
   int countDest(0); // increment of the position in destination domain 
   for (int countSrc = 0; countSrc < indexSize ; ++countSrc)
@@ -217 +216 @@
       // 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 iIdxSrc2 = (countSrc%domainSource->ni)+(IdxMin)%domainSource->ni_glo;
+      int jIdxSrc2 = (countSrc/domainSource->ni)+(IdxMin)/domainSource->ni_glo;
       int convert_locally_global_idx = (jIdxSrc2-jIdxSrcMin)*domainSource->ni + (iIdxSrc2-iIdxSrcMin) ;
       bool concerned_by_WF(false);