Changeset 1239 for XIOS/dev/XIOS_DEV_CMIP6/src/node/context.cpp

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

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/context.cpp (modified) (3 diffs)

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();
+     }
    }