Changeset 1571 for XIOS/dev/dev_olga/src/node/axis.cpp

Timestamp:

09/06/18 18:55:44 (6 years ago)

Author:

oabramkina

Message:

Taking care of cases when a process doesn't possess a grid (its domain or axe size is zero).

Tested with CMIP6 toy models and IPSL model.

To do: remove grid mask from transformations.

File:

• XIOS/dev/dev_olga/src/node/axis.cpp (modified) (8 diffs)

XIOS/dev/dev_olga/src/node/axis.cpp

@@ -245 +245 @@
    void CAxis::checkAttributes(void)
    {
-      if (this->n_glo.isEmpty())
+     CContext* context=CContext::getCurrent();
+
+     if (this->n_glo.isEmpty())
         ERROR("CAxis::checkAttributes(void)",
               << "[ id = '" << getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] "
@@ -287 +289 @@
       if (!this->value.isEmpty())
       {
-        StdSize true_size = value.numElements();
-        if (this->n.getValue() != true_size)
-          ERROR("CAxis::checkAttributes(void)",
+        // Avoid this check at writing because it fails in case of a hole
+        if (context->hasClient)
+        {
+          StdSize true_size = value.numElements();
+          if (this->n.getValue() != true_size)
+            ERROR("CAxis::checkAttributes(void)",
                 << "[ id = '" << getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] "
-                << "The axis is wrongly defined, attribute 'value' has a different size (" << true_size << ") than the one defined by the \'size\' attribute (" << n.getValue() << ").");
+                << "The axis is wrongly defined, attribute 'value' has a different size (" << true_size
+                << ") than the one defined by the \'size\' attribute (" << n.getValue() << ").");
+        }
         this->hasValue = true;
       }
@@ -297 +304 @@
       this->checkBounds();
 
-      CContext* context=CContext::getCurrent();
       if (context->hasClient)
       {
@@ -651 +657 @@
          // Even if a client has no index, it must connect to at least one server and 
          // send an "empty" data to this server
-         if (connectedServerRank_[nbServer].empty())
-          connectedServerRank_[nbServer].push_back(client->clientRank % client->serverSize);
+//         if (connectedServerRank_[nbServer].empty())
+//          connectedServerRank_[nbServer].push_back(client->clientRank % client->serverSize);
+        // Send empty data to all servers
+        if (connectedServerRank_[nbServer].empty())
+          for (int i=0; i<nbServer; ++i)
+            connectedServerRank_[nbServer].push_back(i);
+
 
          nbSenders[nbServer] = CClientServerMapping::computeConnectedClients(client->serverSize, client->clientSize, client->intraComm, connectedServerRank_[nbServer]);
@@ -690 +701 @@
     CArray<size_t,1>::const_iterator itSrvb = writtenGlobalIndex.begin(),
                                      itSrve = writtenGlobalIndex.end(), itSrv;  
+//    for (itSrv = itSrvb; itSrv != itSrve; ++itSrv)
+//    {
+//      indGlo = *itSrv;
+//      if (ite != globalLocalIndexMap_.find(indGlo))
+//      {
+//        ++nbWritten;
+//      }
+//    }
+
+    localIndexToWriteOnServer.resize(writtenGlobalIndex.numElements());
+//    localIndexToWriteOnServer.resize(nbWritten);
+
+    nbWritten = 0;
     for (itSrv = itSrvb; itSrv != itSrve; ++itSrv)
     {
@@ -695 +719 @@
       if (ite != globalLocalIndexMap_.find(indGlo))
       {
-        ++nbWritten;
-      }
-    }
-
-    localIndexToWriteOnServer.resize(writtenGlobalIndex.numElements());
-//      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) = -1;
+      }
+      ++nbWritten;
+    }
+
   }
 
@@ -1194 +1210 @@
          if (0 == globalLocalIndexMap_.count(gloInd))
          {
-           index(nbIndLoc) = gloInd % n_glo;
-           globalLocalIndexMap_[gloInd] = nbIndLoc;
+//           index(nbIndLoc) = gloInd % n_glo;
+//           globalLocalIndexMap_[gloInd] = nbIndLoc;
+//           ++nbIndexGlob;
+           index(nbIndexGlob) = gloInd % n_glo;
+           globalLocalIndexMap_[gloInd] = nbIndexGlob;
            ++nbIndexGlob;
          } 
@@ -1271 +1290 @@
   }
 
-
   /*!
     Compare two axis objects.