Changeset 614 for XIOS/branchs

Timestamp:

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

Author:

rlacroix

Message:

Improve CF compliance: Minor tweaks and improvements.

• Bump the CF version to 1.5.
• Use the same bounds dimension for all axis, including time axis.
• Add a standard_name attribute for cell area variables.
• Set the interval part of cell_methods attribute only when the write interval and the operation interval are different.

Location:

XIOS/branchs/xios-1.0/src

Files:

• calendar_util.cpp (modified) (1 diff)
• calendar_util.hpp (modified) (1 diff)
• output/nc4_data_output.cpp (modified) (9 diffs)

XIOS/branchs/xios-1.0/src/calendar_util.cpp

@@ -126 +126 @@
 
       //-----------------------------------------------------------------
+
+    bool operator==(const CDuration& ddr, const CDuration& dr)
+    {
+      return ((ddr.year == dr.year) && (ddr.month  == dr.month)  && (dr.day    == ddr.day) &&
+              (ddr.hour == dr.hour) && (ddr.minute == dr.minute) && (dr.second == ddr.second) &&
+              (ddr.timestep == dr.timestep));
+    }
+
+    bool operator!=(const CDuration& ddr, const CDuration& dr)
+    {
+      return !(ddr == dr);
+    }
 
       /// Les opérateurs de comparaison. (Non testés pour le moment)

XIOS/branchs/xios-1.0/src/calendar_util.hpp

@@ -23 +23 @@
 
       /// Les opérateurs de comparaison. (Non testés pour le moment)
+      bool operator==(const CDuration& ddr, const CDuration& dr);
+      bool operator!=(const CDuration& ddr, const CDuration& dr);
+
       bool operator==(const CDate& dt0, const CDate& dt1);
       bool operator< (const CDate& dt0, const CDate& dt1);

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

@@ -214 +214 @@
                  {
                    SuperClassWriter::addVariable(areaId, NC_FLOAT, dim0);
+                   SuperClassWriter::addAttribute("standard_name", StdString("cell_area"), &areaId);
                    SuperClassWriter::addAttribute("units", StdString("m2"), &areaId);
                  }
@@ -270 +271 @@
                    dim0.push_back(dimYid); dim0.push_back(dimXid);
                    SuperClassWriter::addVariable(areaId, NC_FLOAT, dim0);
+                   SuperClassWriter::addAttribute("standard_name", StdString("cell_area"), &areaId);
                    SuperClassWriter::addAttribute("units", StdString("m2"), &areaId);
                    dim0.clear();
@@ -433 +435 @@
                  {
                    SuperClassWriter::addVariable(areaId, NC_FLOAT, dim0);
+                   SuperClassWriter::addAttribute("standard_name", StdString("cell_area"), &areaId);
                    SuperClassWriter::addAttribute("units", StdString("m2"), &areaId);
                  }
@@ -484 +487 @@
                    dim0.push_back(dimXid);
                    SuperClassWriter::addVariable(areaId, NC_FLOAT, dim0);
+                   SuperClassWriter::addAttribute("standard_name", StdString("cell_area"), &areaId);
                    SuperClassWriter::addAttribute("units", StdString("m2"), &areaId);
                  }
@@ -639 +643 @@
        try
        {
-        SuperClassWriter::addDimension("time_counter");
-        SuperClassWriter::addDimension("time_bounds", 2);
+         SuperClassWriter::addDimension("time_counter");
        }
        catch (CNetCdfException& e)
        {
-         StdString msg("On writing time dimension : time_couter, time_bounds \n");
+         StdString msg("On writing time dimension : time_couter\n");
          msg.append("In the context : ");
          CContext* context = CContext::getCurrent() ;
@@ -797 +800 @@
            if (wtime)
            {
-              CDuration duration = CDuration::FromString(field->freq_op);
-              duration.solveTimeStep(*context->calendar);
-              StdString freqOpStr = duration.toStringUDUnits();
+              CDuration freqOp = CDuration::FromString(field->freq_op);
+              freqOp.solveTimeStep(*context->calendar);
+              StdString freqOpStr = freqOp.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);
+              CDuration freqOut = CDuration::FromString(field->getRelFile()->output_freq);
+              freqOut.solveTimeStep(*context->calendar);
+              SuperClassWriter::addAttribute("interval_write", freqOut.toStringUDUnits(), &fieldid);
 
               StdString cellMethods = coodinates.front() + ": ";
@@ -811 +814 @@
               else if (field->operation.getValue() == "accumulate") cellMethods += "sum";
               else cellMethods += field->operation;
-              cellMethods += " (interval: " + freqOpStr + ")";
+              if (freqOp.resolve(*context->calendar) != freqOut.resolve(*context->calendar))
+                cellMethods += " (interval: " + freqOpStr + ")";
               SuperClassWriter::addAttribute("cell_methods", cellMethods, &fieldid);
            }
@@ -881 +885 @@
          {
            this->writeFileAttributes(filename, description,
-                                     StdString("CF-1.1"),
+                                     StdString("CF-1.5"),
                                      StdString("An IPSL model"),
                                      this->getTimeStamp());
 
-           if (file->nbAxis >= 1)
-             SuperClassWriter::addDimension("axis_nbounds", 2);
+           SuperClassWriter::addDimension("axis_nbounds", 2);
          }
          catch (CNetCdfException& e)
@@ -1208 +1211 @@
          StdString axisBoundId("time_centered_bounds");
          StdString timeid("time_counter");
-         StdString timeBoundId("time_bounds");
+         StdString timeBoundId("axis_nbounds");
 
          if (field->foperation->timeType() == func::CFunctor::instant)