Changeset 802 for XIOS/trunk/src/io/nc4_data_output.cpp

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.

File:

• XIOS/trunk/src/io/nc4_data_output.cpp (modified) (10 diffs)

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";