Changeset 434

Timestamp:

06/03/13 16:46:17 (12 years ago)

Author:

ymipsl

Message:

bug fix : correct the name axis to be conform of CF convention when using a regular lon lat grid :
Axis must have the same name that dimension.

Done for horizontal axis

YM

File:

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

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -215 +215 @@
                }
                this->writeAxisAttributes
-                  (latid, "X", "longitude", "Longitude", "degrees_east", domid);
+                  (lonid, "X", "longitude", "Longitude", "degrees_east", domid);
                this->writeAxisAttributes
-                  (lonid, "Y", "latitude", "Latitude", "degrees_north", domid);
+                  (latid, "Y", "latitude", "Latitude", "degrees_north", domid);
 
 
@@ -354 +354 @@
                              ? domain->name.getValue() : domain->getId();
          StdString appendDomid  = (singleDomain) ? "" : "_"+domid ;
-
-         StdString dimXid     = StdString("x").append(appendDomid);
-         StdString dimYid     = StdString("y").append(appendDomid);
-/*
+ 
+         bool isCurvilinear = domain->isCurvilinear ; 
+         
+         StdString dimXid,dimYid ;
+        
+         if (isCurvilinear)
+         {
+           dimXid     = StdString("x").append(appendDomid);
+           dimYid     = StdString("y").append(appendDomid);
+         }
+         else
+         {
+           dimXid     = StdString("lon").append(appendDomid);
+           dimYid     = StdString("lat").append(appendDomid);
+         }
+         
+/* 
          StdString lonid_loc = (server->intraCommSize > 1)
                              ? StdString("lon").append(appendDomid).append("_local")
@@ -370 +383 @@
 //         unsigned int ssize = domain->zoom_ni_loc.getValue() * domain->zoom_nj_loc.getValue();
 //         bool isCurvilinear = (domain->lonvalue.getValue()->size() == ssize);
-          bool isCurvilinear = domain->isCurvilinear ; 
+//          bool isCurvilinear = domain->isCurvilinear ; 
           
          nc_type type = (!field->prec.isEmpty() &&