Changeset 887 for XIOS/trunk/src/io/nc4_data_input.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/io/nc4_data_input.cpp (modified) (6 diffs)

XIOS/trunk/src/io/nc4_data_input.cpp

@@ -82 +82 @@
         std::vector<StdSize> start, count;
 
-        CArray<bool,1> axisDomainOrder = grid->axis_domain_order;
+        CArray<int,1> axisDomainOrder = grid->axis_domain_order;
         std::vector<StdString> domainList = grid->getDomainList();
         std::vector<StdString> axisList   = grid->getAxisList();
@@ -94 +94 @@
         for (int i = numElement - 1; i >= 0; --i)
         {
-          if (axisDomainOrder(i))
+          if (2 == axisDomainOrder(i))
           {
             CDomain* domain = CDomain::get(domainList[idxDomain]);
@@ -108 +108 @@
             --idxDomain;
           }
-          else
+          else if (1 == axisDomainOrder(i))
           {
             start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]);
@@ -173 +173 @@
 
     // Now process domain and axis
-    CArray<bool,1> axisDomainOrder = grid->axis_domain_order;
+    CArray<int,1> axisDomainOrder = grid->axis_domain_order;
     int numElement = domainP.size() + axisP.size();
     int elementPosition = 0;
@@ -181 +181 @@
     for (int i = 0; i < numElement; ++i)
     {
-      if(axisDomainOrder(i))
+      if(2 == axisDomainOrder(i))
       {
         if (readAttributeValues)
@@ -197 +197 @@
         else elementPosition += 2;
       }
-      else
+      else if (1 == axisDomainOrder(i))
       {
         if (readAttributeValues)