Changeset 857

Timestamp:

06/03/16 17:47:02 (8 years ago)

Author:

ymipsl

Message:

Bug fix four output scalir variable without time records.

YM+MHN

Location:

XIOS/trunk/src

Files:

• io/onetcdf4.cpp (modified) (3 diffs)
• node/grid.cpp (modified) (1 diff)

XIOS/trunk/src/io/onetcdf4.cpp

@@ -283 +283 @@
          std::vector<int> dimids;
          std::vector<StdSize> dimsizes;
+         int dimSize = dim.size();
          StdSize size;
          StdSize totalSize;
@@ -314 +315 @@
             }
 
-            CNetCdfInterface::defVarChunking(grpid, varid, NC_CHUNKED, &dimsizes[0]);
+            int storageType = (0 == dimSize) ? NC_CONTIGUOUS : NC_CHUNKED;
+            CNetCdfInterface::defVarChunking(grpid, varid, storageType, &dimsizes[0]);
             CNetCdfInterface::defVarFill(grpid, varid, true, NULL);
          }
@@ -441 +443 @@
       {
          std::vector<std::size_t> sizes  = this->getDimensions(name);
-         std::vector<std::string> iddims = this->getDimensionsIdList (&name);
-         std::vector<std::size_t>::const_iterator
-            it  = sizes.begin(), end = sizes.end();
-         int i = 0;
-
-         if (iddims.begin()->compare(timeCounterName) == 0)
-         {
-            sstart.push_back(record);
+         if (sizes.size()==0) 
+         {
+            array_size=1 ;
+            sstart.push_back(0);
             scount.push_back(1);
-            if ((start == NULL) &&
-                (count == NULL)) i++;
-            it++;
-         }
-
-         for (;it != end; it++)
-         {
-            if ((start != NULL) && (count != NULL))
-            {
-               sstart.push_back((*start)[i]);
-               scount.push_back((*count)[i]);
-               array_size *= (*count)[i];
-               i++;
-            }
-            else
-            {
-               sstart.push_back(0);
-               scount.push_back(sizes[i]);
-               array_size *= sizes[i];
-               i++;
-            }
-         }
-
-      }
+         }
+         else
+         {
+           std::vector<std::string> iddims = this->getDimensionsIdList (&name);
+           std::vector<std::size_t>::const_iterator
+           it  = sizes.begin(), end = sizes.end();
+           int i = 0;
+
+           if (iddims.begin()->compare(timeCounterName) == 0)
+           {
+             sstart.push_back(record);
+             scount.push_back(1);
+              if ((start == NULL) &&
+                  (count == NULL)) i++;
+              it++;
+           }
+
+           for (;it != end; it++)
+           {
+              if ((start != NULL) && (count != NULL))
+              {
+                 sstart.push_back((*start)[i]);
+                 scount.push_back((*count)[i]);
+                 array_size *= (*count)[i];
+                 i++;
+              }
+              else
+              {
+                 sstart.push_back(0);
+                 scount.push_back(sizes[i]);
+                 array_size *= sizes[i];
+                 i++;
+              }
+           }
+
+         }
+      }
+
 
       template <>

XIOS/trunk/src/node/grid.cpp

@@ -693 +693 @@
 
     storeIndex_client.resize(1);
-    storeIndex_client[0] = 0;
+    storeIndex_client(0) = 0;
     if (0 == client->clientRank)
     {