Changeset 878 for XIOS/trunk/src/io/onetcdf4.cpp

Timestamp:

07/01/16 16:55:33 (8 years ago)

Author:

oabramkina

Message:

Sequential version for UGRID norms. File attribute "convention" has been added with two possible values "CF" and "UGRID". The default value is "CF".

File:

• XIOS/trunk/src/io/onetcdf4.cpp (modified) (6 diffs)

XIOS/trunk/src/io/onetcdf4.cpp

@@ -13 +13 @@
 
       CONetCDF4::CONetCDF4(const StdString& filename, bool append, bool useClassicFormat,
+                                                        bool useCFConvention,
                            const MPI_Comm* comm, bool multifile, const StdString& timeCounterName)
         : path()
         , wmpi(false)
         , useClassicFormat(useClassicFormat)
-      {
-         this->initialize(filename, append, useClassicFormat, comm, multifile, timeCounterName);
+        , useCFConvention(useCFConvention)
+      {
+         this->initialize(filename, append, useClassicFormat, useCFConvention, comm, multifile, timeCounterName);
       }
 
@@ -29 +31 @@
       ///--------------------------------------------------------------
 
-      void CONetCDF4::initialize(const StdString& filename, bool append, bool useClassicFormat,
+      void CONetCDF4::initialize(const StdString& filename, bool append, bool useClassicFormat, bool useCFConvention, 
                                  const MPI_Comm* comm, bool multifile, const StdString& timeCounterName)
       {
          this->useClassicFormat = useClassicFormat;
+         this->useCFConvention = useCFConvention;
 
          int mode = useClassicFormat ? 0 : NC_NETCDF4;
@@ -284 +287 @@
          std::vector<StdSize> dimsizes;
          int dimSize = dim.size();
+         
          StdSize size;
          StdSize totalSize;
@@ -292 +296 @@
          std::vector<StdString>::const_iterator it = dim.begin(), end = dim.end();
 
-         for (; it != end; it++)
+         for (int idx = 0; it != end; it++, ++idx)
          {
             const StdString& dimid = *it;
@@ -314 +318 @@
               if (totalSize >= maxSize) *it = 1;
             }
-
             int storageType = (0 == dimSize) ? NC_CONTIGUOUS : NC_CHUNKED;
             CNetCdfInterface::defVarChunking(grpid, varid, storageType, &dimsizes[0]);
@@ -570 +573 @@
       }
 
+      bool CONetCDF4::dimExist(const StdString& dimname)
+      {
+         int grpid = this->getCurrentGroup();
+         return CNetCdfInterface::isDimExisted(grpid, dimname);
+      }
+
       void CONetCDF4::sync(void)
       {