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

Timestamp:

06/10/15 15:11:22 (9 years ago)

Author:

rlacroix

Message:

Improve CF compliance: Write the "cell_methods" metadata.

Also try to use the time units defined by the UDUnits specification.

File:

• XIOS/trunk/src/output/nc4_data_output.cpp (modified) (2 diffs)

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -816 +816 @@
            {
               CDuration duration = field->freq_op.getValue();
-              duration.solveTimeStep(*(context->calendar));
-              SuperClassWriter::addAttribute("interval_operation", duration.toString(), &fieldid);
+              duration.solveTimeStep(*context->calendar);
+              StdString freqOpStr = duration.toStringUDUnits();
+              SuperClassWriter::addAttribute("interval_operation", freqOpStr, &fieldid);
 
               duration = field->getRelFile()->output_freq.getValue();
-              duration.solveTimeStep(*(context->calendar));
-              SuperClassWriter::addAttribute("interval_write", duration.toString(), &fieldid);
+              duration.solveTimeStep(*context->calendar);
+              SuperClassWriter::addAttribute("interval_write", duration.toStringUDUnits(), &fieldid);
+
+              StdString cellMethods = coodinates.front() + ": ";
+              if (field->operation.getValue() == "instant") cellMethods += "point";
+              else if (field->operation.getValue() == "average") cellMethods += "mean";
+              else if (field->operation.getValue() == "accumulate") cellMethods += "sum";
+              else cellMethods += field->operation;
+              cellMethods += " (interval: " + freqOpStr + ")";
+              SuperClassWriter::addAttribute("cell_methods", cellMethods, &fieldid);
            }
 
@@ -1025 +1034 @@
 //              CDuration duration = field->freq_op.getValue();
 //              duration.solveTimeStep(*(context->calendar));
-//              SuperClassWriter::addAttribute("interval_operation", duration.toString(), &fieldid);
+//              SuperClassWriter::addAttribute("interval_operation", duration.toStringUDUnits(), &fieldid);
 //
 //              duration = field->getRelFile()->output_freq.getValue();
 //              duration.solveTimeStep(*(context->calendar));
-//              SuperClassWriter::addAttribute("interval_write", duration.toString(), &fieldid);
+//              SuperClassWriter::addAttribute("interval_write", duration.toStringUDUnits(), &fieldid);
 //           }
 //