Changeset 612 for XIOS/branchs/xios-1.0/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/branchs/xios-1.0/src/output/nc4_data_output.cpp (modified) (1 diff)

XIOS/branchs/xios-1.0/src/output/nc4_data_output.cpp

@@ -794 +794 @@
            if (wtime)
            {
-              CDuration duration ;
-
-              duration=CDuration::FromString(field->freq_op) ;
-              duration.solveTimeStep(*(context->calendar));
-              SuperClassWriter::addAttribute("interval_operation", duration.toString(), &fieldid);
-
-              duration=CDuration::FromString(field->getRelFile()->output_freq) ;
-              duration.solveTimeStep(*(context->calendar));
-              SuperClassWriter::addAttribute("interval_write", duration.toString(), &fieldid);
+              CDuration duration = CDuration::FromString(field->freq_op);
+              duration.solveTimeStep(*context->calendar);
+              StdString freqOpStr = duration.toStringUDUnits();
+              SuperClassWriter::addAttribute("interval_operation", freqOpStr, &fieldid);
+
+              duration = CDuration::FromString(field->getRelFile()->output_freq);
+              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);
            }