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

Timestamp:

08/24/15 14:53:17 (9 years ago)

Author:

mhnguyen

Message:

Changing some domain attributes

+) Longitude and latitude from now on can be 2 dimension array

Test
+) On Curie
+) test_client, test_complete pass and are correct

File:

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

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -83 +83 @@
          StdString dimXid, dimYid ;
 
-         bool isRegularDomain = (domain->type == CDomain::type_attr::regular);
+         bool isRegularDomain = (domain->type == CDomain::type_attr::rectilinear);
          switch (domain->type)
          {
@@ -90 +90 @@
              dimYid     = StdString("y").append(appendDomid);
              break ;
-           case CDomain::type_attr::regular :
+           case CDomain::type_attr::rectilinear :
              dimXid     = StdString("lon").append(appendDomid);
              dimYid     = StdString("lat").append(appendDomid);
@@ -130 +130 @@
                      latid = StdString("nav_lat").append(appendDomid);
                      break ;
-                   case CDomain::type_attr::regular :
+                   case CDomain::type_attr::rectilinear :
                      lonid = StdString("lon").append(appendDomid);
                      latid = StdString("lat").append(appendDomid);
@@ -171 +171 @@
                      SuperClassWriter::addVariable(lonid, NC_FLOAT, dim0);
                      break ;
-                    case CDomain::type_attr::regular :
+                    case CDomain::type_attr::rectilinear :
                       SuperClassWriter::addVariable(latid, NC_FLOAT, dim0);
                       SuperClassWriter::addVariable(lonid, NC_FLOAT, dim1);
@@ -227 +227 @@
                      SuperClassWriter::writeData(domain->lonvalue_srv, lonid, isCollective, 0);
                      break;
-                   case CDomain::type_attr::regular :
+                   case CDomain::type_attr::rectilinear :
                      CArray<double,1> lat = domain->latvalue_srv(Range(fromStart,toEnd,domain->zoom_ni_srv)) ;
                      SuperClassWriter::writeData(CArray<double,1>(lat.copy()), latid, isCollective, 0);
@@ -266 +266 @@
                      break;
 
-                   case CDomain::type_attr::regular :
+                   case CDomain::type_attr::rectilinear :
                      dim0.push_back(dimYid);
                      dim1.push_back(dimXid);
@@ -331 +331 @@
                      break;
                    }
-                   case CDomain::type_attr::regular :
+                   case CDomain::type_attr::rectilinear :
                    {
                      std::vector<StdSize> start(1) ;
@@ -772 +772 @@
                  dimCoordList.push_back(StdString("nav_lat").append(appendDomid));
                  break ;
-               case CDomain::type_attr::regular :
+               case CDomain::type_attr::rectilinear :
                  dimXid     = StdString("lon").append(appendDomid);
                  dimIdList.push_back(dimXid);