Changeset 617 for XIOS/branchs/xios-1.0

Timestamp:

06/11/15 15:25:47 (9 years ago)

Author:

rlacroix

Message:

Output bounds for regular and curvilinear domains.

It was done only for unstructured domains.

File:

• XIOS/branchs/xios-1.0/src/output/nc4_data_output.cpp (modified) (8 diffs)

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

@@ -94 +94 @@
              break;
          }
+
+         StdString dimVertId = StdString("nvertex").append(appendDomid);
 
          string lonid,latid,bounds_lonid,bounds_latid ;
@@ -135 +137 @@
                  }
 
+                 bounds_lonid = StdString("bounds_lon").append(appendDomid);
+                 bounds_latid = StdString("bounds_lat").append(appendDomid);
+
                  SuperClassWriter::addDimension(dimXid, domain->zoom_ni_srv);
                  SuperClassWriter::addDimension(dimYid, domain->zoom_nj_srv);
+
+                 if (domain->hasBounds)
+                   SuperClassWriter::addDimension(dimVertId, domain->nvertex);
 
                  if (server->intraCommSize > 1)
@@ -168 +176 @@
                  this->writeAxisAttributes(lonid, isRegularDomain ? "X" : "", "longitude", "Longitude", "degrees_east", domid);
                  this->writeAxisAttributes(latid, isRegularDomain ? "Y" : "", "latitude", "Latitude", "degrees_north", domid);
+
+                 if (domain->hasBounds)
+                 {
+                   SuperClassWriter::addAttribute("bounds", bounds_lonid, &lonid);
+                   SuperClassWriter::addAttribute("bounds", bounds_latid, &latid);
+
+                   dim0.clear();
+                   dim0.push_back(dimYid);
+                   dim0.push_back(dimXid);
+                   dim0.push_back(dimVertId);
+                   SuperClassWriter::addVariable(bounds_lonid, NC_FLOAT, dim0);
+                   SuperClassWriter::addVariable(bounds_latid, NC_FLOAT, dim0);
+                 }
 
                  dim0.clear();
@@ -211 +232 @@
                  }
 
+                 if (domain->hasBounds)
+                 {
+                   SuperClassWriter::writeData(domain->bounds_lon_srv, bounds_lonid, isCollective, 0);
+                   SuperClassWriter::writeData(domain->bounds_lat_srv, bounds_latid, isCollective, 0);
+                 }
+
                  if (domain->hasArea)
                    SuperClassWriter::writeData(domain->area_srv, areaId, isCollective, 0);
@@ -222 +249 @@
                  SuperClassWriter::addDimension(dimXid, domain->zoom_ni.getValue());
                  SuperClassWriter::addDimension(dimYid, domain->zoom_nj.getValue());
+
+                 if (domain->hasBounds)
+                   SuperClassWriter::addDimension(dimVertId, domain->nvertex);
 
                  switch (domain->type)
@@ -243 +273 @@
                  }
 
+                 bounds_lonid = StdString("bounds_lon").append(appendDomid);
+                 bounds_latid = StdString("bounds_lat").append(appendDomid);
+
                  if (domain->hasArea)
                  {
@@ -257 +290 @@
                  this->writeAxisAttributes
                     (latid, isRegularDomain ? "Y" : "", "latitude", "Latitude", "degrees_north", domid);
+
+                 if (domain->hasBounds)
+                 {
+                   SuperClassWriter::addAttribute("bounds", bounds_lonid, &lonid);
+                   SuperClassWriter::addAttribute("bounds", bounds_latid, &latid);
+
+                   dim0.clear();
+                   dim0.push_back(dimYid);
+                   dim0.push_back(dimXid);
+                   dim0.push_back(dimVertId);
+                   SuperClassWriter::addVariable(bounds_lonid, NC_FLOAT, dim0);
+                   SuperClassWriter::addVariable(bounds_latid, NC_FLOAT, dim0);
+                 }
 
                  SuperClassWriter::definition_end();
@@ -305 +351 @@
                      break;
                    }
+                 }
+
+                 if (domain->hasBounds)
+                 {
+                   std::vector<StdSize> start(3);
+                   std::vector<StdSize> count(3);
+                   if (domain->isEmpty())
+                   {
+                     start[2] = start[1] = start[0] = 0;
+                     count[2] = count[1] = count[0] = 0;
+                   }
+                   else
+                   {
+                     start[2] = 0;
+                     start[1] = domain->zoom_ibegin_srv - domain->zoom_ibegin.getValue();
+                     start[0] = domain->zoom_jbegin_srv - domain->zoom_jbegin.getValue();
+                     count[2] = domain->nvertex;
+                     count[1] = domain->zoom_ni_srv;
+                     count[0] = domain->zoom_nj_srv;
+                   }
+
+                   SuperClassWriter::writeData(domain->bounds_lon_srv, bounds_lonid, isCollective, 0, &start, &count);
+                   SuperClassWriter::writeData(domain->bounds_lat_srv, bounds_latid, isCollective, 0, &start, &count);
                  }