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

Timestamp:

12/16/14 12:55:53 (10 years ago)

Author:

mhnguyen

Message:

Reorganizing structure of grid

+) Grid doesn't have domain_ref and axis_ref anymore.
All domain and axis of a grid must be inside grid (These domain and axis can be defined or refer to others)
+) Grid contains list of domain and axis
+) Reorder some functions to make sure new functionlities work

Test
+) On Curie
+) Mode attached and detached
+) Only test_new_features
+) Passed

File:

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

XIOS/trunk/src/node/context.cpp

@@ -353 +353 @@
    void CContext::closeDefinition(void)
    {
+
      if (hasClient)
      {
+       std::cout << "Current context " << *this << std::endl;
        // After xml is parsed, there are some more works with post processing
        postProcessing();
@@ -378 +380 @@
        sendEnabledFields();
 
+      // At last, we have all info of domain and axis, then send them
+       sendRefDomainsAxis();
+
       // After that, send all grid (if any)
        sendRefGrid();
 
-      // At last, we have all info of domain and axis, then send them
-       sendRefDomainsAxis();
+
     }
 
@@ -508 +512 @@
      // Résolution des héritages par référence au niveau des fichiers.
       const vector<CFile*> allFiles=CFile::getAll() ;
+      const vector<CGrid*> allGrids= CGrid::getAll();
 
      //if (hasClient && !hasServer)
       if (hasClient)
+      {
         for (unsigned int i = 0; i < allFiles.size(); i++)
           allFiles[i]->solveFieldRefInheritance(apply);
+      }
+
+      unsigned int vecSize = allGrids.size();
+      unsigned int i = 0;
+      for (i = 0; i < vecSize; ++i)
+        allGrids[i]->solveDomainAxisRefInheritance(apply);
+
    }
 
@@ -702 +715 @@
    {
       postProcessing();
+      std::cout << "server context " << *this << std::endl;
    }
 
@@ -848 +862 @@
        gridPtr->sendCreateChild(*it);
        CGrid::get(*it)->sendAllAttributesToServer();
+       CGrid::get(*it)->sendAllDomains();
+       CGrid::get(*it)->sendAllAxis();
      }
    }
@@ -881 +897 @@
      for (itAxis = axisIds.begin(); itAxis != itE; ++itAxis)
      {
-       axisPtr->sendCreateChild(*itAxis);
-       CAxis::get(*itAxis)->sendAllAttributesToServer();
+       if (!itAxis->empty())
+       {
+         axisPtr->sendCreateChild(*itAxis);
+         CAxis::get(*itAxis)->sendAllAttributesToServer();
+       }
      }
 
@@ -891 +910 @@
      for (itDom = domainIds.begin(); itDom != itE; ++itDom)
      {
-       domPtr->sendCreateChild(*itDom);
-       CDomain::get(*itDom)->sendAllAttributesToServer();
+       if (!itDom->empty()) {
+          domPtr->sendCreateChild(*itDom);
+          CDomain::get(*itDom)->sendAllAttributesToServer();
+       }
      }
    }