Changeset 1390 for XIOS/dev/XIOS_DEV_CMIP6/src

Timestamp:

01/08/18 16:46:46 (6 years ago)

Author:

oabramkina

Message:

Taking into account a possibility of having a hole on the client side (NEMO-like grid).

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• io/nc4_data_output.cpp (modified) (5 diffs)
• node/domain.cpp (modified) (1 diff)
• node/grid.hpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_output.cpp

@@ -128 +128 @@
            for (int idx = 0; idx < nbWritten; ++idx)
            {
-              writtenLat(idx) = domain->latvalue(indexToWrite(idx));
-              writtenLon(idx) = domain->lonvalue(indexToWrite(idx));
+                  if (idx < domain->latvalue.numElements())
+                  {
+                writtenLat(idx) = domain->latvalue(indexToWrite(idx));
+                writtenLon(idx) = domain->lonvalue(indexToWrite(idx));
+                  }
+                  else
+                  {
+                writtenLat(idx) = 0.;
+                writtenLon(idx) = 0.;
+                  }
            }
          
@@ -143 +151 @@
                for (int nv = 0; nv < nvertex; ++nv)
                {
-                 writtenBndsLat(nv, idx) = boundslat(nv, int(indexToWrite(idx)));
-                 writtenBndsLon(nv, idx) = boundslon(nv, int(indexToWrite(idx)));
+                 if (idx < boundslat.columns())
+                 {
+                   writtenBndsLat(nv, idx) = boundslat(nv, int(indexToWrite(idx)));
+                   writtenBndsLon(nv, idx) = boundslon(nv, int(indexToWrite(idx)));
+                 }
+                 else
+                 {
+                   writtenBndsLat(nv, idx) = 0.;
+                   writtenBndsLon(nv, idx) = 0.;
+                 }
                }
            }
@@ -154 +170 @@
            for (int idx = 0; idx < nbWritten; ++idx)
            {
-              writtenArea(idx) = domain->areavalue(indexToWrite(idx));                      
+                  if (idx < domain->areavalue.numElements())
+                writtenArea(idx) = domain->areavalue(indexToWrite(idx));
+                  else
+                writtenArea(idx) = 0.;
            }
          }
@@ -940 +959 @@
            for (int idx = 0; idx < nbWritten; ++idx)
            {
-              writtenLat(idx) = domain->latvalue(indexToWrite(idx));
-              writtenLon(idx) = domain->lonvalue(indexToWrite(idx));
-           }
+             if (idx < domain->latvalue.numElements())
+             {
+               writtenLat(idx) = domain->latvalue(indexToWrite(idx));
+               writtenLon(idx) = domain->lonvalue(indexToWrite(idx));
+             }
+             else
+             {
+               writtenLat(idx) = 0.;
+               writtenLon(idx) = 0.;
+             }
+           }
+         }
          
-
-           if (domain->hasBounds)
-           {         
-             int nvertex = domain->nvertex, idx;
-             writtenBndsLat.resize(nvertex, nbWritten);
-             writtenBndsLon.resize(nvertex, nbWritten);
-             CArray<double,2>& boundslat = domain->bounds_latvalue;
-             CArray<double,2>& boundslon = domain->bounds_lonvalue;   
-             for (idx = 0; idx < nbWritten; ++idx)
-               for (int nv = 0; nv < nvertex; ++nv)
+         if (domain->hasBounds)
+         {
+           int nvertex = domain->nvertex, idx;
+           writtenBndsLat.resize(nvertex, nbWritten);
+           writtenBndsLon.resize(nvertex, nbWritten);
+           CArray<double,2>& boundslat = domain->bounds_latvalue;
+           CArray<double,2>& boundslon = domain->bounds_lonvalue;
+           for (idx = 0; idx < nbWritten; ++idx)
+           {
+             for (int nv = 0; nv < nvertex; ++nv)
+             {
+               if (idx < boundslat.columns())
                {
                  writtenBndsLat(nv, idx) = boundslat(nv, int(indexToWrite(idx)));
                  writtenBndsLon(nv, idx) = boundslon(nv, int(indexToWrite(idx)));
                }
+               else
+               {
+                 writtenBndsLat(nv, idx) = 0.;
+                 writtenBndsLon(nv, idx) = 0.;
+                }
+             }
            }
          }
@@ -966 +1002 @@
            for (int idx = 0; idx < nbWritten; ++idx)
            {
-              writtenArea(idx) = domain->areavalue(indexToWrite(idx));                      
+                  if (idx < domain->areavalue.numElements())
+                writtenArea(idx) = domain->areavalue(indexToWrite(idx));
+                  else
+                writtenArea(idx) = 0.;
            }
          }

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

@@ -1902 +1902 @@
                                        itSrve = writtenGlobalIndex.end(), itSrv;
 
+//      for (itSrv = itSrvb; itSrv != itSrve; ++itSrv)
+//      {
+//        indGlo = *itSrv;
+//        if (ite != globalLocalIndexMap_.find(indGlo))
+//        {
+//          ++nbWritten;
+//        }
+//      }
+
+//      localIndexToWriteOnServer.resize(nbWritten);
+      localIndexToWriteOnServer.resize(writtenGlobalIndex.numElements());
+
+      nbWritten = 0;
       for (itSrv = itSrvb; itSrv != itSrve; ++itSrv)
       {
         indGlo = *itSrv;
         if (ite != globalLocalIndexMap_.find(indGlo))
-        {          
-          ++nbWritten;
-        }                 
-      }
-
-      localIndexToWriteOnServer.resize(nbWritten);
-
-      nbWritten = 0;
-      for (itSrv = itSrvb; itSrv != itSrve; ++itSrv)
-      {
-        indGlo = *itSrv;
-        if (ite != globalLocalIndexMap_.find(indGlo))
         {
           localIndexToWriteOnServer(nbWritten) = globalLocalIndexMap_[indGlo];
           ++nbWritten;
-        }                 
+        }
+        else
+        {
+          localIndexToWriteOnServer(nbWritten) = 0;
+          ++nbWritten;
+        }
       }
       

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

@@ -475 +475 @@
         if (2 == axisDomainOrder(i))
         {
-          maskValue = maskValue && (*domainMasks[idxDomain])(idxLoop[indexMap[i]] + idxLoop[indexMap[i]+1] * eachDimSize[indexMap[i]]);
+          int idxTmp = idxLoop[indexMap[i]] + idxLoop[indexMap[i]+1] * eachDimSize[indexMap[i]];
+          if (idxTmp < (*domainMasks[idxDomain]).numElements())
+            maskValue = maskValue && (*domainMasks[idxDomain])(idxTmp);
+          else
+            maskValue = false;
           ++idxDomain;
         }