Changeset 802 for XIOS/trunk/src/io

Timestamp:

11/30/15 16:21:33 (8 years ago)

Author:

rlacroix

Message:

Add a new file attribute time_counter_name.

Users can now modify the name of the time counter dimension and axis name.

Location:

XIOS/trunk/src/io

Files:

• inetcdf4.cpp (modified) (4 diffs)
• inetcdf4.hpp (modified) (3 diffs)
• nc4_data_input.cpp (modified) (1 diff)
• nc4_data_input.hpp (modified) (1 diff)
• nc4_data_output.cpp (modified) (10 diffs)
• nc4_data_output.hpp (modified) (1 diff)
• onetcdf4.cpp (modified) (4 diffs)
• onetcdf4.hpp (modified) (4 diffs)

XIOS/trunk/src/io/inetcdf4.cpp

@@ -7 +7 @@
 namespace xios
 {
-  CINetCDF4::CINetCDF4(const StdString& filename, const MPI_Comm* comm /*= NULL*/, bool multifile /*= true*/)
+  CINetCDF4::CINetCDF4(const StdString& filename, const MPI_Comm* comm /*= NULL*/, bool multifile /*= true*/, const StdString& timeCounterName /*= "time_counter"*/)
   {
     // Don't use parallel mode if there is only one process
@@ -25 +25 @@
     else
       CNetCdfInterface::open(filename, NC_NOWRITE, this->ncidp);
+
+    this->timeCounterName = timeCounterName;
   }
 
@@ -359 +361 @@
   bool CINetCDF4::hasTemporalDim(const CVarPath* const path)
   {
-    return (this->getUnlimitedDimension(path) != -1);
+    std::list<StdString> dims = this->getDimensionsList(NULL, path);
+    return (std::find(dims.begin(), dims.end(), timeCounterName) != dims.end());
   }
 
@@ -563 +566 @@
   bool CINetCDF4::isTemporal(const StdString& name, const CVarPath* const path)
   {
-    if (!this->hasTemporalDim(path)) return false;
-    std::map<StdString, StdSize> dims = this->getDimensions(&name, path);
-    return (dims.find(this->getUnlimitedDimensionName(path)) != dims.end());
+    std::list<StdString> dims = this->getDimensionsList(&name, path);
+    return (std::find(dims.begin(), dims.end(), timeCounterName) != dims.end());
   }
 

XIOS/trunk/src/io/inetcdf4.hpp

@@ -22 +22 @@
     public:
       /// Constructors ///
-      CINetCDF4(const StdString& filename, const MPI_Comm* comm = NULL, bool multifile = true);
+      CINetCDF4(const StdString& filename, const MPI_Comm* comm = NULL, bool multifile = true,
+                const StdString& timeCounterName = "time_counter");
       CINetCDF4(const CINetCDF4& inetcdf4);       // Not implemented.
       CINetCDF4(const CINetCDF4* const inetcdf4); // Not implemented.
@@ -41 +42 @@
 
       StdString getUnlimitedDimensionName(const CVarPath* const path = NULL);
+
+      const StdString& getTimeCounterName(void) const { return timeCounterName; };
 
       StdString getCoordinatesId(const StdString& name, const CVarPath* const path = NULL);
@@ -155 +158 @@
       int ncidp; //< Id of the NetCDF file
       bool mpi;  //< Whether parallel file access is used
+      StdString timeCounterName;
   }; // class CINetCDF4
 } // namespace xios

XIOS/trunk/src/io/nc4_data_input.cpp

@@ -9 +9 @@
 namespace xios
 {
-  CNc4DataInput::CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/)
+  CNc4DataInput::CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/, const StdString& timeCounterName /*= "time_counter"*/)
     : SuperClass()
-    , SuperClassWriter(filename, &comm_file, multifile)
+    , SuperClassWriter(filename, &comm_file, multifile, timeCounterName)
     , comm_file(comm_file)
     , filename(filename)

XIOS/trunk/src/io/nc4_data_input.hpp

@@ -22 +22 @@
 
     /// Constructors ///
-    CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective = true);
+    CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective = true,
+                  const StdString& timeCounterName = "time_counter");
     CNc4DataInput(const CNc4DataInput& dataInput);       // Not implemented.
     CNc4DataInput(const CNc4DataInput* const dataInput); // Not implemented.

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -22 +22 @@
             , filename(filename)
       {
-         StdString timeid = StdString("time_counter");
          SuperClass::type = MULTI_FILE;
       }
@@ -28 +27 @@
       CNc4DataOutput::CNc4DataOutput
          (const StdString & filename, bool exist, bool useClassicFormat,
-          MPI_Comm comm_file,bool multifile, bool isCollective)
+          MPI_Comm comm_file,bool multifile, bool isCollective, const StdString& timeCounterName)
             : SuperClass()
-            , SuperClassWriter(filename, exist, useClassicFormat, &comm_file, multifile)
+            , SuperClassWriter(filename, exist, useClassicFormat, &comm_file, multifile, timeCounterName)
             , comm_file(comm_file)
             , filename(filename)
             , isCollective(isCollective)
       {
-         StdString timeid = StdString("time_counter");
-
          SuperClass::type = (multifile) ? MULTI_FILE : ONE_FILE;
       }
@@ -952 +949 @@
        try
        {
-        SuperClassWriter::addDimension("time_counter");
+        SuperClassWriter::addDimension(getTimeCounterName());
        }
        catch (CNetCdfException& e)
@@ -982 +979 @@
          std::vector<StdString> axisList   = grid->getAxisList();
 
-         StdString timeid  = StdString("time_counter");
+         StdString timeid  = getTimeCounterName();
          StdString dimXid,dimYid;
          std::deque<StdString> dimIdList, dimCoordList;
@@ -1391 +1388 @@
         else if (field->getOperationTimeType() == func::CFunctor::centered) timeAxisId = "time_centered";
 
-        StdString timeBoundId("time_counter_bounds");
+        StdString timeBoundId = getTimeCounterName() + "_bounds";
 
         StdString timeAxisBoundId;
@@ -1492 +1489 @@
                    if (field->file->time_counter != CFile::time_counter_attr::none)
                    {
-                     SuperClassWriter::writeData(time_counter, string("time_counter"), isCollective, field->getNStep() - 1);
+                     SuperClassWriter::writeData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1);
                      if (field->file->time_counter != CFile::time_counter_attr::record)
                        SuperClassWriter::writeData(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1);
@@ -1619 +1616 @@
                    if (field->file->time_counter != CFile::time_counter_attr::none)
                    {
-                     SuperClassWriter::writeTimeAxisData(time_counter, string("time_counter"), isCollective, field->getNStep() - 1, isRoot);
+                     SuperClassWriter::writeTimeAxisData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1, isRoot);
                      if (field->file->time_counter != CFile::time_counter_attr::record)
                        SuperClassWriter::writeTimeAxisData(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1, isRoot);
@@ -1659 +1656 @@
          StdString axisid("time_centered") ;
          StdString axisBoundId("time_centered_bounds");
-         StdString timeid("time_counter");
+         StdString timeid(getTimeCounterName());
          StdString timeBoundId("axis_nbounds");
 
@@ -1701 +1698 @@
            {
              // Adding time_counter
-             axisid = "time_counter";
-             axisBoundId = "time_counter_bounds";
+             axisid = getTimeCounterName();
+             axisBoundId = getTimeCounterName() + "_bounds";
              dims.clear();
              dims.push_back(timeid);
@@ -1955 +1952 @@
         if (it == timeToRecordCache.end())
         {
-          StdString timeAxisBoundsId("time_counter_bounds");
+          StdString timeAxisBoundsId(getTimeCounterName() + "_bounds");
           if (!SuperClassWriter::varExist(timeAxisBoundsId))
             timeAxisBoundsId = "time_instant_bounds";

XIOS/trunk/src/io/nc4_data_output.hpp

@@ -26 +26 @@
             CNc4DataOutput
                (const StdString & filename, bool exist, bool useClassicFormat,
-                MPI_Comm comm_file, bool multifile, bool isCollective=true);
+                MPI_Comm comm_file, bool multifile, bool isCollective = true,
+                const StdString& timeCounterName = "time_counter");
 
             CNc4DataOutput(const CNc4DataOutput & dataoutput);       // Not implemented.

XIOS/trunk/src/io/onetcdf4.cpp

@@ -13 +13 @@
 
       CONetCDF4::CONetCDF4(const StdString& filename, bool append, bool useClassicFormat,
-                           const MPI_Comm* comm, bool multifile)
+                           const MPI_Comm* comm, bool multifile, const StdString& timeCounterName)
         : path()
         , wmpi(false)
         , useClassicFormat(useClassicFormat)
       {
-         this->initialize(filename, append, useClassicFormat, comm,multifile);
+         this->initialize(filename, append, useClassicFormat, comm, multifile, timeCounterName);
       }
 
@@ -30 +30 @@
 
       void CONetCDF4::initialize(const StdString& filename, bool append, bool useClassicFormat,
-                                 const MPI_Comm* comm, bool multifile)
+                                 const MPI_Comm* comm, bool multifile, const StdString& timeCounterName)
       {
          this->useClassicFormat = useClassicFormat;
@@ -74 +74 @@
          if (useClassicFormat)
             CNetCdfInterface::setFill(this->ncidp, false);
+
+         this->timeCounterName = timeCounterName;
       }
 
@@ -444 +446 @@
          int i = 0;
 
-         if (iddims.begin()->compare(this->getUnlimitedDimensionName()) == 0)
+         if (iddims.begin()->compare(timeCounterName) == 0)
          {
             sstart.push_back(record);

XIOS/trunk/src/io/onetcdf4.hpp

@@ -27 +27 @@
             /// Constructeurs ///
             CONetCDF4(const StdString& filename, bool append, bool useClassicFormat = false,
-                      const MPI_Comm* comm = NULL, bool multifile = true);
+                      const MPI_Comm* comm = NULL, bool multifile = true,
+                      const StdString& timeCounterName = "time_counter");
 
             CONetCDF4(const CONetCDF4& onetcdf4);       // Not implemented.
@@ -35 +36 @@
             /// Initialisation ///
             void initialize(const StdString& filename, bool append, bool useClassicFormat,
-                            const MPI_Comm* comm, bool multifile);
+                            const MPI_Comm* comm, bool multifile, const StdString& timeCounterName);
             void close(void);
             void sync(void);
@@ -93 +94 @@
             int       getUnlimitedDimension(void);
             StdString getUnlimitedDimensionName(void);
+            const StdString& getTimeCounterName(void) const { return timeCounterName; };
 
             void getTimeAxisBounds(CArray<double,2>& timeAxisBounds, const StdString& name, bool collective);
@@ -119 +121 @@
             bool wmpi;
             map<int,size_t> timeAxis;
+            StdString timeCounterName;
       }; // class CONetCDF4