Changeset 541 for XIOS/trunk/src/node

Timestamp:

12/16/14 12:55:59 (9 years ago)

Author:

mhnguyen

Message:

Replacing some attribute files with new ones

Location:

XIOS/trunk/src/node

Files:

• context.cpp (modified) (2 diffs)
• field.cpp (modified) (4 diffs)

XIOS/trunk/src/node/context.cpp

@@ -356 +356 @@
      if (hasClient)
      {
-       std::cout << "Current context " << *this << std::endl;
+//       std::cout << "Current context " << *this << std::endl;
        // After xml is parsed, there are some more works with post processing
        postProcessing();
@@ -715 +715 @@
    {
       postProcessing();
-      std::cout << "server context " << *this << std::endl;
+//      std::cout << "server context " << *this << std::endl;
    }
 

XIOS/trunk/src/node/field.cpp

@@ -506 +506 @@
       CDomain* domain;
       CAxis* axis;
+      std::vector<CDomain*> vecDom;
+      std::vector<CAxis*> vecAxis;
+     std::vector<std::string> domList, axisList;
 
       if (!domain_ref.isEmpty())
       {
          if (CDomain::has(domain_ref.getValue()))
-            domain = CDomain::get(domain_ref.getValue()) ;
+         {
+           domain = CDomain::get(domain_ref.getValue()) ;
+           vecDom.push_back(domain);
+         }
          else
             ERROR("CField::solveGridReference(void)",
@@ -520 +526 @@
       {
          if (CAxis::has(axis_ref.getValue()))
-            axis = CAxis::get(axis_ref.getValue()) ;
+         {
+           axis = CAxis::get(axis_ref.getValue()) ;
+           vecAxis.push_back(axis);
+         }
          else
             ERROR("CField::solveGridReference(void)",
@@ -530 +539 @@
       {
          if (CGrid::has(grid_ref.getValue()))
-            this->grid = CGrid::get(grid_ref.getValue()) ;
+         {
+           this->grid = CGrid::get(grid_ref.getValue()) ;
+           domList = grid->getDomainList();
+           axisList = grid->getAxisList();
+         }
          else
             ERROR("CField::solveGridReference(void)",
@@ -562 +575 @@
 //     CArray<std::string,1> axisListTmp = grid->axisList.getValue();
 
-     std::vector<std::string> domList, axisList;
-     if (0 != grid)
-     {
-       domList = grid->getDomainList();
-       axisList = grid->getAxisList();
-     }
-
      if (domList.empty() && axisList.empty())
      {
-       std::vector<CDomain*> vecDom;
-       if (0 != domain) vecDom.push_back(domain);
-       std::vector<CAxis*> vecAxis;
-       if (0 != axis) vecAxis.push_back(axis);
        this->grid = CGrid::createGrid(vecDom, vecAxis);
      }