Changeset 1239

Timestamp:

08/08/17 20:21:43 (7 years ago)

Author:

mhnguyen

Message:

Correcting a minor bug on detecting server reading level

+) Reading server level should be 1 (for now). In the future, maybe level-2 server can be used
+) Correct nbReadSenders with the right ContextClient?

Test
+) On Curie
+) Work with toy

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/node

Files:

• context.cpp (modified) (3 diffs)
• context.hpp (modified) (1 diff)
• field.cpp (modified) (2 diffs)
• field.hpp (modified) (1 diff)
• file.cpp (modified) (2 diffs)
• file.hpp (modified) (1 diff)
• grid.cpp (modified) (1 diff)

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

@@ -558 +558 @@
         sendEnabledFieldsInFiles(this->enabledReadModeFiles);
 
-      // We have all info of domain, axis and scalar, so send them
+      // Then, check whether we have domain_ref, axis_ref or scalar_ref attached to the enabled fields
+      // If any, so send them to server
        sendRefDomainsAxisScalars(this->enabledWriteModeFiles);
       if (!hasServer)
         sendRefDomainsAxisScalars(this->enabledReadModeFiles);        
 
-       // After that, send all grid (if any)
+       // Check whether enabled fields have grid_ref, if any, send this info to server
       sendRefGrid(this->enabledFiles);
       // This code may be useful in the future when we want to seperate completely read and write
@@ -569 +570 @@
       // if (!hasServer)
       //   sendRefGrid(this->enabledReadModeFiles);
+      
+      // A grid of enabled fields composed of several components which must be checked then their
+      // checked attributes should be sent to server
+      sendGridComponentEnabledFieldsInFiles(this->enabledFiles); // This code can be seperated in two (one for reading, another for writing)
 
        // We have a xml tree on the server side and now, it should be also processed
-       sendPostProcessing();
+      sendPostProcessing();
        
-       sendGridEnabledFieldsInFiles(this->enabledWriteModeFiles);       
-       if (!hasServer)
+      // Finally, we send information of grid itself to server 
+      sendGridEnabledFieldsInFiles(this->enabledWriteModeFiles);       
+      if (!hasServer)
         sendGridEnabledFieldsInFiles(this->enabledReadModeFiles);       
      }
@@ -669 +675 @@
       for (unsigned int i = 0; i < this->enabledReadModeFiles.size(); ++i)
         (void)this->enabledReadModeFiles[i]->readAttributesOfEnabledFieldsInReadMode();
+   }
+
+   void CContext::sendGridComponentEnabledFieldsInFiles(const std::vector<CFile*>& activeFiles)
+   {
+     int size = activeFiles.size();
+     for (int i = 0; i < size; ++i)
+     {       
+       activeFiles[i]->sendGridComponentOfEnabledFields();
+     }
    }
 

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

@@ -131 +131 @@
          void checkGridEnabledFields();
          void checkGridEnabledFieldsInFiles(const std::vector<CFile*>& activeFiles);
-         void sendGridEnabledFieldsInFiles(const std::vector<CFile*>& activeFiles);         
+         void sendGridEnabledFieldsInFiles(const std::vector<CFile*>& activeFiles);  
+         void sendGridComponentEnabledFieldsInFiles(const std::vector<CFile*>& activeFiles)       ;
 
 //         std::map<int, StdSize> getAttributesBufferSize(std::map<int, StdSize>& maxEventSize);

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

@@ -376 +376 @@
                   break;
                 case RF_NODATA:
-                  msg << int(-2);
+                  msg << int(-2) << recvDataSrv;
                   break;
                 case RF_EOF:                  
@@ -797 +797 @@
    }
 
+   void CField::sendGridComponentOfEnabledFields()
+   {
+      solveGridDomainAxisRef(true);
+      // solveCheckMaskIndex(true);
+   }
+
    void CField::sendGridOfEnabledFields()
    {
-      solveGridDomainAxisRef(true);
+      // solveGridDomainAxisRef(true);
       solveCheckMaskIndex(true);
-   }
-
-
-    void CField::solveOnlyReferenceEnabledField(bool doSending2Server)
+   }   
+
+   void CField::solveOnlyReferenceEnabledField(bool doSending2Server)
    {
      CContext* context = CContext::getCurrent();

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

@@ -130 +130 @@
          void checkGridOfEnabledFields();
          void sendGridOfEnabledFields();
+         void sendGridComponentOfEnabledFields();   
 
          void buildFilterGraph(CGarbageCollector& gc, bool enableOutput);

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

@@ -327 +327 @@
       // Done by classical server or secondary server
       // TODO: This condition should be changed soon. It only works with maximum number of level as 2
-      if (CServer::serverLevel == 0 || CServer::serverLevel == 2)
+      if (CServer::serverLevel == 0 || CServer::serverLevel == 1)
       {
         if (!mode.isEmpty() && mode.getValue() == mode_attr::read)
@@ -795 +795 @@
    }
 
+   void CFile::sendGridComponentOfEnabledFields()
+   { 
+     int size = this->enabledFields.size();
+     for (int i = 0; i < size; ++i)
+     {
+       this->enabledFields[i]->sendGridComponentOfEnabledFields();
+     }
+   }
+
    void CFile::sendGridOfEnabledFields()
    { 

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

@@ -116 +116 @@
          void checkGridOfEnabledFields();
          void sendGridOfEnabledFields();
+         void sendGridComponentOfEnabledFields();   
 
          // Add component into file

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

@@ -1541 +1541 @@
     {
       CContextServer* server = (!context->hasClient) ? context->server : context->serverPrimServer[p];
-      CContextClient* client = (!context->hasClient) ? context->client : context->clientPrimServer[p];
+      CContextClient* client = context->client;   //(!context->hasClient) ? context->client : context->clientPrimServer[p];
       
       int idx = 0, numElement = axis_domain_order.numElements();