Changeset 569 for XIOS/trunk/src/node/context.cpp

Timestamp:

03/10/15 10:49:13 (9 years ago)

Author:

mhnguyen

Message:

Correct some bugs on discovering server index and do some code cleanings

+) Add some checking functions to make sure mpi_isend and mpi_irecv work correctly
+) Add comments to code
+) Remove some redundant code and comments

Test
+) On Curie
+) The new functions are tested in test_new_features.f90. Test_client and test_complete work like before
+) Test cases:

• 3 dimension grid with: 1 domain, 1 axis
• 3 dimension grid with: 3 axis
• Attached and connected

+) All pass and results are correct

TODO:
+) Fix zoom bug with grid composed of only one axis

File:

• XIOS/trunk/src/node/context.cpp (modified) (2 diffs)

XIOS/trunk/src/node/context.cpp

@@ -330 +330 @@
 
       // At last, we have all info of domain and axis, then send them
-//       sendRefDomainsAxis();
+       sendRefDomainsAxis();
 
       // After that, send all grid (if any)
@@ -799 +799 @@
 
    //! Client side: Send information of reference domain and axis of active fields
-//   void CContext::sendRefDomainsAxis()
-//   {
-//     std::set<StdString> domainIds;
-//     std::set<StdString> axisIds;
-//
-//     // Find all reference domain and axis of all active fields
-//     int numEnabledFiles = this->enabledFiles.size();
-//     for (int i = 0; i < numEnabledFiles; ++i)
-//     {
-//       std::vector<CField*> enabledFields = this->enabledFiles[i]->getEnabledFields();
-//       int numEnabledFields = enabledFields.size();
-//       for (int j = 0; j < numEnabledFields; ++j)
-//       {
-//         const std::pair<StdString, StdString>& prDomAxisId = enabledFields[j]->getDomainAxisIds();
-//         domainIds.insert(prDomAxisId.first);
-//         axisIds.insert(prDomAxisId.second);
-//       }
-//     }
-//
-//     // Create all reference axis on server side
-//     std::set<StdString>::iterator itDom, itAxis;
-//     std::set<StdString>::const_iterator itE;
-//
-//     StdString axiDefRoot("axis_definition");
-//     CAxisGroup* axisPtr = CAxisGroup::get(axiDefRoot);
-//     itE = axisIds.end();
-//     for (itAxis = axisIds.begin(); itAxis != itE; ++itAxis)
-//     {
-//       if (!itAxis->empty())
-//       {
-//         axisPtr->sendCreateChild(*itAxis);
-//         CAxis::get(*itAxis)->sendAllAttributesToServer();
-//       }
-//     }
-//
-//     // Create all reference domains on server side
-//     StdString domDefRoot("domain_definition");
-//     CDomainGroup* domPtr = CDomainGroup::get(domDefRoot);
-//     itE = domainIds.end();
-//     for (itDom = domainIds.begin(); itDom != itE; ++itDom)
-//     {
-//       if (!itDom->empty()) {
-//          domPtr->sendCreateChild(*itDom);
-//          CDomain::get(*itDom)->sendAllAttributesToServer();
-//       }
-//     }
-//   }
+   void CContext::sendRefDomainsAxis()
+   {
+     std::set<StdString> domainIds;
+     std::set<StdString> axisIds;
+
+     // Find all reference domain and axis of all active fields
+     int numEnabledFiles = this->enabledFiles.size();
+     for (int i = 0; i < numEnabledFiles; ++i)
+     {
+       std::vector<CField*> enabledFields = this->enabledFiles[i]->getEnabledFields();
+       int numEnabledFields = enabledFields.size();
+       for (int j = 0; j < numEnabledFields; ++j)
+       {
+         const std::pair<StdString, StdString>& prDomAxisId = enabledFields[j]->getRefDomainAxisIds();
+         domainIds.insert(prDomAxisId.first);
+         axisIds.insert(prDomAxisId.second);
+       }
+     }
+
+     // Create all reference axis on server side
+     std::set<StdString>::iterator itDom, itAxis;
+     std::set<StdString>::const_iterator itE;
+
+     StdString axiDefRoot("axis_definition");
+     CAxisGroup* axisPtr = CAxisGroup::get(axiDefRoot);
+     itE = axisIds.end();
+     for (itAxis = axisIds.begin(); itAxis != itE; ++itAxis)
+     {
+       if (!itAxis->empty())
+       {
+         axisPtr->sendCreateChild(*itAxis);
+         CAxis::get(*itAxis)->sendAllAttributesToServer();
+       }
+     }
+
+     // Create all reference domains on server side
+     StdString domDefRoot("domain_definition");
+     CDomainGroup* domPtr = CDomainGroup::get(domDefRoot);
+     itE = domainIds.end();
+     for (itDom = domainIds.begin(); itDom != itE; ++itDom)
+     {
+       if (!itDom->empty()) {
+          domPtr->sendCreateChild(*itDom);
+          CDomain::get(*itDom)->sendAllAttributesToServer();
+       }
+     }
+   }
 
    //! Update calendar in each time step