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

Timestamp:

07/05/16 15:59:02 (8 years ago)

Author:

mhnguyen

Message:

Adding a new type of element into grid: Scalar

+) Add a new node Scalar for xml
+) Make some change on writing scalar value
+) Reorganize some codes
+) Remove some redundant codes

Test
+) On Curie
+) All tests pass

File:

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

XIOS/trunk/src/node/context.cpp

@@ -1027 +1027 @@
        CGrid::get(*it)->sendAllDomains();
        CGrid::get(*it)->sendAllAxis();
+       CGrid::get(*it)->sendAllScalars();
      }
    }
@@ -1034 +1035 @@
    void CContext::sendRefDomainsAxis()
    {
-     std::set<StdString> domainIds;
-     std::set<StdString> axisIds;
+     std::set<StdString> domainIds, axisIds, scalarIds;
 
      // Find all reference domain and axis of all active fields
@@ -1045 +1045 @@
        for (int j = 0; j < numEnabledFields; ++j)
        {
-         const std::pair<StdString, StdString>& prDomAxisId = enabledFields[j]->getRefDomainAxisIds();
-         if ("" != prDomAxisId.first) domainIds.insert(prDomAxisId.first);
-         if ("" != prDomAxisId.second) axisIds.insert(prDomAxisId.second);
+         const std::vector<StdString>& prDomAxisScalarId = enabledFields[j]->getRefDomainAxisIds();
+         if ("" != prDomAxisScalarId[0]) domainIds.insert(prDomAxisScalarId[0]);
+         if ("" != prDomAxisScalarId[1]) axisIds.insert(prDomAxisScalarId[1]);
+         if ("" != prDomAxisScalarId[2]) scalarIds.insert(prDomAxisScalarId[2]);
        }
      }
 
      // Create all reference axis on server side
-     std::set<StdString>::iterator itDom, itAxis;
+     std::set<StdString>::iterator itDom, itAxis, itScalar;
      std::set<StdString>::const_iterator itE;
+
+     StdString scalarDefRoot("scalar_definition");
+     CScalarGroup* scalarPtr = CScalarGroup::get(scalarDefRoot);
+     itE = scalarIds.end();
+     for (itScalar = scalarIds.begin(); itScalar != itE; ++itScalar)
+     {
+       if (!itScalar->empty())
+       {
+         scalarPtr->sendCreateChild(*itScalar);
+         CScalar::get(*itScalar)->sendAllAttributesToServer();
+       }
+     }
 
      StdString axiDefRoot("axis_definition");