Changeset 540 for XIOS/trunk/src/output/nc4_data_output.cpp

Timestamp:

12/16/14 12:55:53 (9 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/output/nc4_data_output.cpp (modified) (3 diffs)

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -489 +489 @@
          std::vector<StdString> dims;
          StdString axisid = (!axis->name.isEmpty())
-                           ? axis->name.getValue() : axis->getId();
+                             ? axis->name.getValue() : axis->getId();
          try
          {
@@ -504 +504 @@
 
                  SuperClassWriter::addAttribute("axis", StdString("Z"), &axisid);
+
+                 if (!axis->name.isEmpty())
+                    SuperClassWriter::addAttribute
+                       ("name", axis->name.getValue(), &axisid);
 
                  if (!axis->standard_name.isEmpty())
@@ -644 +648 @@
          }
 
-         if (!grid->axis_ref.isEmpty())
-         {
-            CAxis* axis = grid->axis ;
-            StdString axisid = (!axis->name.isEmpty()) ? axis->name.getValue() : axis->getId();
-            dims.push_back(axisid);
-            coodinates.push_back(axisid);
+         std::vector<StdString> axisList = grid->getAxisList();
+         if (!axisList.empty())
+         {
+           std::vector<StdString>::const_iterator itAxis = axisList.begin(), iteAxis = axisList.end();
+           for (; itAxis != iteAxis; ++itAxis)
+           {
+             CAxis* axis = CAxis::get(*itAxis);
+             StdString axisid = (!axis->name.isEmpty())
+                                ? axis->name.getValue() : axis->getId();
+
+             dims.push_back(axisid);
+             coodinates.push_back(axisid);
+           }
          }