Changeset 1021 for XIOS/dev/dev_olga/src/io/nc4_data_output.cpp

Timestamp:

01/10/17 14:36:29 (7 years ago)

Author:

oabramkina

Message:

Intermeadiate version for merging with new server functionalities.

File:

• XIOS/dev/dev_olga/src/io/nc4_data_output.cpp (modified) (4 diffs)

XIOS/dev/dev_olga/src/io/nc4_data_output.cpp

@@ -1675 +1675 @@
            for (vector<CVariable*>::iterator it = listVars.begin() ;it != listVars.end(); it++) writeAttribute_(*it, fieldid) ;
 
+           bool alreadyAddCellMethod = false;
+           StdString cellMethodsPrefix(""), cellMethodsSuffix("");
+           if (!field->cell_methods.isEmpty())
+           {
+             StdString cellMethodString = field->cell_methods;
+             if (field->cell_methods_mode.isEmpty() ||
+                 (CField::cell_methods_mode_attr::overwrite == field->cell_methods_mode))
+             {
+               SuperClassWriter::addAttribute("cell_methods", cellMethodString, &fieldid);
+               alreadyAddCellMethod = true;
+             }
+             else
+             {
+               switch (field->cell_methods_mode)
+               {
+               case (CField::cell_methods_mode_attr::prefix):
+                 cellMethodsPrefix = cellMethodString;
+                 cellMethodsPrefix += " ";
+                 break;
+               case (CField::cell_methods_mode_attr::suffix):
+                 cellMethodsSuffix = " ";
+                 cellMethodsSuffix += cellMethodString;
+                 break;
+               case (CField::cell_methods_mode_attr::none):
+                 break;
+               default:
+                 break;
+               }
+             }
+           }
+
 
            if (wtime)
@@ -1687 +1718 @@
               SuperClassWriter::addAttribute("interval_write", freqOut.toStringUDUnits(), &fieldid);
 
-              StdString cellMethods = "time: ";
+              StdString cellMethods(cellMethodsPrefix + "time: ");
               if (field->operation.getValue() == "instant") cellMethods += "point";
               else if (field->operation.getValue() == "average") cellMethods += "mean";
@@ -1694 +1725 @@
               if (freqOp.resolve(*context->calendar) != freqOut.resolve(*context->calendar))
                 cellMethods += " (interval: " + freqOpStr + ")";
-              SuperClassWriter::addAttribute("cell_methods", cellMethods, &fieldid);
+              cellMethods += cellMethodsSuffix;
+              if (!alreadyAddCellMethod)
+                SuperClassWriter::addAttribute("cell_methods", cellMethods, &fieldid);
            }
 
@@ -1928 +1961 @@
         if (!field->wasWritten())
         {
-          if (appendMode && field->file->record_offset.isEmpty())
+          if (appendMode && field->file->record_offset.isEmpty() &&
+               field->getOperationTimeType() != func::CFunctor::once)
           {
             field->resetNStep(getRecordFromTime(field->last_Write_srv) + 1);