Changeset 1415

Timestamp:

01/31/18 14:23:58 (7 years ago)

Author:

ymipsl

Message:

2 fixs :

• for curvilinear grids, associated coordinates are wrong if using default lon_name et lat_name value
• add domain_id 2 times for boundaries name

YM

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_output.cpp (modified) (9 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_output.cpp

@@ -115 +115 @@
              else latName = domain->lat_name;
              
-             dimXid     = lonName.append(appendDomid);
-             dimYid     = latName.append(appendDomid);
+             dimXid     = lonName+appendDomid;
+             dimYid     = latName+appendDomid;
              break;
          }
@@ -212 +212 @@
                    case CDomain::type_attr::curvilinear :
                      dim0.push_back(dimYid); dim0.push_back(dimXid);
-                     lonid = lonName.append(appendDomid);
-                     latid = latName.append(appendDomid);
+                     lonid = lonName+appendDomid;
+                     latid = latName+appendDomid;
                      break ;
                    case CDomain::type_attr::rectilinear :
-                     lonid = lonName.append(appendDomid);
-                     latid = latName.append(appendDomid);
+                     lonid = lonName+appendDomid;
+                     latid = latName+appendDomid;
                      dim0.push_back(dimYid);
                      dim1.push_back(dimXid);
@@ -355 +355 @@
                      case CDomain::type_attr::curvilinear :
                        dim0.push_back(dimYid); dim0.push_back(dimXid);
-                       lonid = lonName.append(appendDomid);
-                       latid = latName.append(appendDomid);
+                       lonid = lonName+appendDomid;
+                       latid = latName+appendDomid;
                        SuperClassWriter::addVariable(latid, typePrec, dim0);
                        SuperClassWriter::addVariable(lonid, typePrec, dim0);
@@ -364 +364 @@
                        dim0.push_back(dimYid);
                        dim1.push_back(dimXid);
-                       lonid = lonName.append(appendDomid);
-                       latid = latName.append(appendDomid);
+                       lonid = lonName+appendDomid;
+                       latid = latName+appendDomid;
                        SuperClassWriter::addVariable(latid, typePrec, dim0);
                        SuperClassWriter::addVariable(lonid, typePrec, dim1);
@@ -1042 +1042 @@
                  SuperClassWriter::addDimension(dimXid, domain->zoom_ni);
 
-                 lonid = lonName.append(appendDomid);
-                 latid = latName.append(appendDomid);
+                 lonid = lonName+appendDomid;
+                 latid = latName+appendDomid;
                  bounds_lonid = "bounds_"+lonName+appendDomid;
                  bounds_latid = "bounds_"+latName+appendDomid;
@@ -1096 +1096 @@
               case (ONE_FILE) :
               {
-                 lonid = lonName.append(appendDomid);
-                 latid = latName.append(appendDomid);
+                 lonid = lonName+appendDomid;
+                 latid = latName+appendDomid;
                  bounds_lonid = "bounds_"+lonName+appendDomid;
                  bounds_latid = "bounds_"+latName+appendDomid;
@@ -1730 +1730 @@
             StdString lonName,latName ;
 
-            if (domain->lon_name.isEmpty()) lonName = "lon";
+            if (domain->lon_name.isEmpty())
+            { 
+              if (domain->type==CDomain::type_attr::curvilinear) lonName = "nav_lon";
+              else lonName = "lon";
+            }
             else lonName = domain->lon_name;
 
-            if (domain->lat_name.isEmpty()) latName = "lat";
+            if (domain->lat_name.isEmpty())
+            {
+              if (domain->type==CDomain::type_attr::curvilinear) latName = "nav_lat";
+              else latName = "lat";
+            }
             else latName = domain->lat_name;
         
@@ -1752 +1760 @@
                   dimIdList.push_back(dimYid);
                 }
-                dimCoordList.push_back(lonName.append(appendDomId));
-                dimCoordList.push_back(latName.append(appendDomId));
+                dimCoordList.push_back(lonName+appendDomId);
+                dimCoordList.push_back(latName+appendDomId);
               break ;
               case CDomain::type_attr::rectilinear:
                 if (!compressedOutput || !domain->isCompressible())
                 {
-                  dimXid     = lonName.append(appendDomId);
+                  dimXid     = lonName+appendDomId;
                   dimIdList.push_back(dimXid);
-                  dimYid     = latName.append(appendDomId);
+                  dimYid     = latName+appendDomId;
                   dimIdList.push_back(dimYid);
                 }
@@ -1770 +1778 @@
                   dimXid     = StdString("cell").append(appendDomId);
                   dimIdList.push_back(dimXid);
-                  dimCoordList.push_back(lonName.append(appendDomId));
-                  dimCoordList.push_back(latName.append(appendDomId));
+                  dimCoordList.push_back(lonName+appendDomId);
+                  dimCoordList.push_back(latName+appendDomId);
                 }
                 else