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

Timestamp:

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

Author:

rlacroix

Message:

Improve CF compliance: Add a new domain attribute "area".

Fixes ticket #68.

File:

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

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -99 +99 @@
 
          string lonid,latid,bounds_lonid,bounds_latid ;
+         string areaId = "area" + appendDomid;
 /*
          StdString lonid_loc = (server->intraCommSize > 1)
@@ -118 +119 @@
                  if (server->intraCommSize > 1)
                  {
-
   //                 SuperClassWriter::addDimension(lonid, domain->zoom_ni.getValue());
   //                 SuperClassWriter::addDimension(latid, domain->zoom_nj.getValue());
@@ -211 +211 @@
                  //SuperClassWriter::setDefaultValue(maskid, &dvm);
 
+                 if (domain->hasArea)
+                 {
+                   SuperClassWriter::addVariable(areaId, NC_FLOAT, dim0);
+                   SuperClassWriter::addAttribute("units", StdString("m2"), &areaId);
+                 }
+
                  SuperClassWriter::definition_end();
 
@@ -226 +232 @@
                      break;
                  }
+
+                 if (domain->hasArea)
+                   SuperClassWriter::writeData(domain->area_srv, areaId, isCollective, 0);
+
                  SuperClassWriter::definition_start();
 
@@ -234 +244 @@
                  SuperClassWriter::addDimension(dimXid, domain->zoom_ni.getValue());
                  SuperClassWriter::addDimension(dimYid, domain->zoom_nj.getValue());
-
 
                  switch (domain->type)
@@ -255 +264 @@
                      break;
                  }
+
+                 if (domain->hasArea)
+                 {
+                   dim0.clear();
+                   dim0.push_back(dimYid); dim0.push_back(dimXid);
+                   SuperClassWriter::addVariable(areaId, NC_FLOAT, dim0);
+                   SuperClassWriter::addAttribute("units", StdString("m2"), &areaId);
+                   dim0.clear();
+                 }
+
                  this->writeAxisAttributes
                     (lonid, "X", "longitude", "Longitude", "degrees_east", domid);
@@ -260 +279 @@
                     (latid, "Y", "latitude", "Latitude", "degrees_north", domid);
 
-
                  SuperClassWriter::definition_end();
+
                  switch (domain->type)
                  {
@@ -270 +289 @@
                      if (domain->isEmpty())
                      {
-                       start[0]=0 ; start [1]=0 ;
+                       start[0]=0 ; start[1]=0 ;
                        count[0]=0 ; count[1]=0 ;
                      }
@@ -308 +327 @@
                    }
                  }
+
+                 if (domain->hasArea)
+                 {
+                   std::vector<StdSize> start(2);
+                   std::vector<StdSize> count(2);
+
+                   if (domain->isEmpty())
+                   {
+                     start[0] = 0; start[1] = 0;
+                     count[0] = 0; count[1] = 0;
+                   }
+                   else
+                   {
+                     start[1] = domain->zoom_ibegin_srv - domain->zoom_ibegin.getValue();
+                     start[0] = domain->zoom_jbegin_srv - domain->zoom_jbegin.getValue();
+                     count[1] = domain->zoom_ni_srv;
+                     count[0] = domain->zoom_nj_srv;
+                   }
+
+                   SuperClassWriter::writeData(domain->area_srv, areaId, isCollective, 0, &start, &count);
+                 }
+
                  SuperClassWriter::definition_start();
                  break;
@@ -351 +392 @@
 
          string lonid,latid,bounds_lonid,bounds_latid ;
+         string areaId = "area" + appendDomid;
 
          try
@@ -387 +429 @@
                  dim0.push_back(dimXid);
 
+                 if (domain->hasArea)
+                 {
+                   SuperClassWriter::addVariable(areaId, NC_FLOAT, dim0);
+                   SuperClassWriter::addAttribute("units", StdString("m2"), &areaId);
+                 }
+
                  SuperClassWriter::definition_end();
 
@@ -397 +445 @@
                    SuperClassWriter::writeData(domain->bounds_lat_srv, bounds_latid, isCollective, 0);
                  }
+
+                 if (domain->hasArea)
+                   SuperClassWriter::writeData(domain->area_srv, areaId, isCollective, 0);
+
                  SuperClassWriter::definition_start();
                  break ;
@@ -426 +478 @@
                  }
 
+                 if (domain->hasArea)
+                 {
+                   dim0.clear();
+                   dim0.push_back(dimXid);
+                   SuperClassWriter::addVariable(areaId, NC_FLOAT, dim0);
+                   SuperClassWriter::addAttribute("units", StdString("m2"), &areaId);
+                 }
+
                  SuperClassWriter::definition_end();
 
@@ -456 +516 @@
                  }
 
+                 if (domain->hasArea)
+                   SuperClassWriter::writeData(domain->area_srv, areaId, isCollective, 0, &start, &count);
 
                  SuperClassWriter::definition_start();
@@ -607 +669 @@
          StdString dimXid,dimYid;
          std::deque<StdString> dimIdList, dimCoordList;
+         bool hasArea = false;
+         StdString cellMeasures = "area:";
 
          for (int i = 0; i < numElement; ++i)
@@ -639 +703 @@
                  break ;
             }
+            if (domain->hasArea)
+            {
+              hasArea = true;
+              cellMeasures += " area" + appendDomid;
+            }
             ++idxDomain;
            }
@@ -754 +823 @@
               SuperClassWriter::addAttribute("interval_write", duration.toString(), &fieldid);
            }
+
+           if (hasArea)
+             SuperClassWriter::addAttribute("cell_measures", cellMeasures, &fieldid);
 
            if (!field->default_value.isEmpty())