Changeset 1311 for XIOS/dev/XIOS_DEV_CMIP6/src/node

Timestamp:

10/24/17 11:03:29 (7 years ago)

Author:

ymipsl

Message:

Fix conflict between for domain mask_1d and mask_2d when inheritance is done after transformation. Now class attribute "domainMask" is fill either by mask_1d or mask_2d and will be used instead of mask_1d in code.
This is a temporary fix which will solve later by reconstructing a cleanear grid graph.

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/node

Files:

• domain.cpp (modified) (6 diffs)
• domain.hpp (modified) (1 diff)
• grid.cpp (modified) (4 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp

@@ -1040 +1040 @@
       if (!mask_2d.isEmpty())
       {
-        mask_1d.resize(mask_2d.extent(0) * mask_2d.extent(1));
+        domainMask.resize(mask_2d.extent(0) * mask_2d.extent(1));
         for (int j = 0; j < nj; ++j)
-          for (int i = 0; i < ni; ++i) mask_1d(i+j*ni) = mask_2d(i,j);
-        mask_2d.reset();
+          for (int i = 0; i < ni; ++i) domainMask(i+j*ni) = mask_2d(i,j);
+//        mask_2d.reset();
       }
       else if (mask_1d.isEmpty())
       {
-        mask_1d.resize(i_index.numElements());
-        for (int i = 0; i < i_index.numElements(); ++i) mask_1d(i) = true;
+        domainMask.resize(i_index.numElements());
+        for (int i = 0; i < i_index.numElements(); ++i) domainMask(i) = true;
       }
    }
@@ -1197 +1197 @@
          {
            ind=i+ni*j ;
-           localMask(ind)=mask_1d(ind) ;
+           localMask(ind)=domainMask(ind) ;
          }
      }
@@ -2186 +2186 @@
         {
           idx = static_cast<int>(it->second[n]);
-          list_mask.back()(n) = mask_1d(globalLocalIndexMap_[idx]);
+          list_mask.back()(n) = domainMask(globalLocalIndexMap_[idx]);
         }
 
@@ -2660 +2660 @@
     nbMaskInd = globalLocalIndexMap_.size();
     mask_1d.resize(nbMaskInd);
+    domainMask.resize(nbMaskInd);
     mask_1d = false;
     
@@ -2672 +2673 @@
           mask_1d(lInd) = tmp(ind);
       }
-    }    
+    }
+    domainMask=mask_1d ;
   }
 
@@ -3012 +3014 @@
          dataJIndex(lInd) = (-1 == dataJIndex(lInd)) ? tmpJ(ind) : dataJIndex(lInd);  
 
-         if (!mask_1d(lInd))   // Include mask info into data index on the RECEIVE getServerDimensionSizes    
+         if (!domainMask(lInd))   // Include mask info into data index on the RECEIVE getServerDimensionSizes    
          {
            dataIIndex(lInd) = dataJIndex(lInd) = -1;

XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.hpp

@@ -142 +142 @@
          CArray<size_t,1> localIndexToWriteOnServer;         
 
-         CArray<bool, 1> localMask;
+         CArray<bool, 1> domainMask; // mask_1d, mask_2d -> domainMask
+         CArray<bool, 1> localMask; // domainMask + indexing
          bool isCurvilinear ;
          bool hasBounds ;

XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.cpp

@@ -362 +362 @@
 
       std::vector<CArray<bool,1>* > domainMasks(domainP.size());
-      for (int i = 0; i < domainMasks.size(); ++i) domainMasks[i] = &(domainP[i]->mask_1d);
+      for (int i = 0; i < domainMasks.size(); ++i) domainMasks[i] = &(domainP[i]->domainMask);
       std::vector<CArray<bool,1>* > axisMasks(axisP.size());
       for (int i = 0; i < axisMasks.size(); ++i) axisMasks[i] = &(axisP[i]->mask);
@@ -404 +404 @@
 
       std::vector<CArray<bool,1>* > domainMasks(domainP.size());
-      for (int i = 0; i < domainMasks.size(); ++i) domainMasks[i] = &(domainP[i]->mask_1d);
+      for (int i = 0; i < domainMasks.size(); ++i) domainMasks[i] = &(domainP[i]->domainMask);
       std::vector<CArray<bool,1>* > axisMasks(axisP.size());
       for (int i = 0; i < axisMasks.size(); ++i) axisMasks[i] = &(axisP[i]->mask);
@@ -1775 +1775 @@
                                         const CArray<int,1>& axisDomainOrder)
   {
-    globalDim.resize(domains.size()*2+axis.size()+scalars.size());
+ //   globalDim.resize(domains.size()*2+axis.size()+scalars.size());
+    globalDim.resize(domains.size()*2+axis.size());
     int positionDimensionDistributed = 1;
     int idx = 0, idxDomain = 0, idxAxis = 0, idxScalar = 0;
@@ -1805 +1806 @@
       else
       {
-        globalDim[idx] = 1;
+//        globalDim[idx] = 1;
         ++idxScalar;
-        ++idx;
+//        ++idx;
       }
     }