Changeset 540 for XIOS/trunk/src/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/data_output.cpp (modified) (4 diffs)

XIOS/trunk/src/data_output.cpp

@@ -16 +16 @@
       void CDataOutput::writeGrid(CGrid* grid)
       {
-         if (grid->domain_ref.isEmpty())
-            ERROR("CDataOutput::writeGrid(grid)",
-                   << " domain is not defined !");
-
-         if (grid->axis_ref.isEmpty())
-         {
-            this->writeGrid(CDomain::get(grid->domain_ref.getValue()));
-         }
-         else
-         {
-            this->writeGrid(CDomain::get(grid->domain_ref.getValue()),
-                            CAxis::get(grid->axis_ref.getValue()));
-         }
+//         if (grid->domain_ref.isEmpty())
+//            ERROR("CDataOutput::writeGrid(grid)",
+//                   << " domain is not defined !");
+//
+//         if (grid->axis_ref.isEmpty())
+//         {
+//            this->writeGrid(CDomain::get(grid->domain_ref.getValue()));
+//         }
+//         else
+//         {
+//            this->writeGrid(CDomain::get(grid->domain_ref.getValue()),
+//                            CAxis::get(grid->axis_ref.getValue()));
+//         }
+//        this->writeGrid(grid->domain, grid->axis);
+        this->writeGrid(grid->getDomains(), grid->getAxis());
       }
 
@@ -61 +63 @@
       }
 
+      void CDataOutput::writeGrid(std::vector<CDomain*> domains, std::vector<CAxis*> axis)
+      {
+        int domSize = domains.size();
+        int aSize = axis.size();
+        for (int i = 0; i < domSize; ++i) this->writeDomain_(domains[i]);
+        for (int i = 0; i < aSize; ++i) this->writeAxis_(axis[i]);
+      }
+
       //----------------------------------------------------------------
 
@@ -79 +89 @@
          CContext* context = CContext::getCurrent() ;
          boost::shared_ptr<CCalendar> calendar = context->getCalendar();
-         
+
          this->writeField_(field);
          this->writeTimeAxis_(field, calendar);
@@ -90 +100 @@
          this->writeGrid(field->getRelGrid());
       }
-      
+
       //----------------------------------------------------------------
-      
+
       void CDataOutput::writeFieldData(CField* field)
       {
-         CGrid* grid = CGrid::get(field->grid_ref.getValue());
-         CDomain* domain = CDomain::get(grid->domain_ref.getValue());
+//         CGrid* grid = CGrid::get(field->grid_ref.getValue());
+//         CDomain* domain = CDomain::get(grid->domain_ref.getValue());
          this->writeFieldData_(field);
       }
-      
+
       ///----------------------------------------------------------------