Changeset 676 for XIOS/trunk/src/data_output.cpp

Timestamp:

08/25/15 16:52:45 (9 years ago)

Author:

rlacroix

Message:

Add support for indexed output.

If the new field attribute "indexed_output" is set to true and a mask is defined (either at grid, domain or axis level), the indexed data will be outputed instead of the full data with missing values.

See ​http://cfconventions.org/Data/cf-conventions/cf-conventions-1.5/build/cf-conventions.html#compression-by-gathering for more information.

File:

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

XIOS/trunk/src/data_output.cpp

@@ -14 +14 @@
       //----------------------------------------------------------------
 
-      void CDataOutput::writeGrid(CGrid* grid)
+      void CDataOutput::writeGrid(CGrid* grid, bool allowCompressedOutput /*= false*/)
       {
-//         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());
+
+        if (allowCompressedOutput)
+          writeGridCompressed_(grid);
       }
 
@@ -57 +46 @@
       //----------------------------------------------------------------
 
-      void CDataOutput::writeGrid(CDomain* domain,CAxis* axis)
+      void CDataOutput::writeGrid(CDomain* domain, CAxis* axis)
       {
          this->writeDomain_(domain);
@@ -98 +87 @@
       void CDataOutput::writeFieldGrid(CField* field)
       {
-         this->writeGrid(field->getRelGrid());
+         this->writeGrid(field->getRelGrid(),
+                         !field->indexed_output.isEmpty() && field->indexed_output);
       }