Changeset 692 for XIOS/trunk/src/io

Timestamp:

09/16/15 16:26:32 (9 years ago)

Author:

rlacroix

Message:

Add a new file attribute to give our users more control on the time counter.

The time_counter attribute can take one of the following values:

• centered: use centered times for the time counter (previous behavior, used by default)
• instant: use instant times for the time counter
• record: use record indexes for the time counter
• none: disable the output of the time counter completely.

File:

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

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -1409 +1409 @@
 
          CArray<double,1> time_data(1) ;
+         CArray<double,1> time_data_bound(2);
          CArray<double,1> time_counter(1) ;
          CArray<double,1> time_counter_bound(2);
-         CArray<double,1> time_data_bound(2);
 
         bool wtime   = !(!field->operation.isEmpty() && (field->getOperationTimeType() == func::CFunctor::once));
@@ -1417 +1417 @@
         if (wtime)
         {
-          time_counter(0)= (Time(field->last_Write_srv) + Time(field->lastlast_Write_srv)) / 2;
+          Time lastWrite = field->last_Write_srv;
+          Time lastLastWrite = field->lastlast_Write_srv;
+
           if (field->getOperationTimeType() == func::CFunctor::instant)
-            time_data(0) = Time(field->last_Write_srv);
-          else if (field->getOperationTimeType() == func::CFunctor::centered) time_data(0) = time_counter(0);
-
-          time_counter_bound(0) = Time(field->lastlast_Write_srv);
-          time_counter_bound(1) = Time(field->last_Write_srv);
+            time_data(0) = lastWrite;
+          else if (field->getOperationTimeType() == func::CFunctor::centered)
+            time_data(0) = (lastWrite + lastLastWrite) / 2;
+
           if (field->getOperationTimeType() == func::CFunctor::instant)
-            time_data_bound(0) = time_data_bound(1) = Time(field->last_Write_srv);
+            time_data_bound(0) = time_data_bound(1) = lastWrite;
           else if (field->getOperationTimeType() == func::CFunctor::centered)
           {
-            time_data_bound(0) = time_counter_bound(0);
-            time_data_bound(1) = time_counter_bound(1);
+            time_data_bound(0) = lastLastWrite;
+            time_data_bound(1) = lastWrite;
           }
-         }
+
+          if (field->file->time_counter == CFile::time_counter_attr::instant)
+            time_counter(0) = lastWrite;
+          else if (field->file->time_counter == CFile::time_counter_attr::centered)
+            time_counter(0) = (lastWrite + lastLastWrite) / 2;
+          else if (field->file->time_counter == CFile::time_counter_attr::record)
+            time_counter(0) = field->getNStep() - 1;
+
+
+          if (field->file->time_counter == CFile::time_counter_attr::instant)
+            time_counter_bound(0) = time_counter_bound(1) = lastWrite;
+          else if (field->file->time_counter == CFile::time_counter_attr::centered)
+          {
+            time_counter_bound(0) = lastLastWrite;
+            time_counter_bound(1) = lastWrite;
+          }
+          else if (field->file->time_counter == CFile::time_counter_attr::record)
+            time_counter_bound(0) = time_counter_bound(1) = field->getNStep() - 1;
+        }
 
          bool isRoot ;
@@ -1468 +1487 @@
               case (MULTI_FILE) :
               {
-                 SuperClassWriter::writeData(fieldData, fieldid, isCollective, field->getNStep()-1);
+                 SuperClassWriter::writeData(fieldData, fieldid, isCollective, field->getNStep() - 1);
                  if (wtime)
                  {
-                   SuperClassWriter::writeData(time_data, timeAxisId, isCollective, field->getNStep()-1);
-                   SuperClassWriter::writeData(time_counter, string("time_counter"), isCollective, field->getNStep()-1);
-                   SuperClassWriter::writeData(time_counter_bound, timeBoundId, isCollective, field->getNStep()-1);
-                   SuperClassWriter::writeData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep()-1);
+                   SuperClassWriter::writeData(time_data, timeAxisId, isCollective, field->getNStep() - 1);
+                   SuperClassWriter::writeData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1);
+                   if (field->file->time_counter != CFile::time_counter_attr::none)
+                   {
+                     SuperClassWriter::writeData(time_counter, string("time_counter"), isCollective, field->getNStep() - 1);
+                     if (field->file->time_counter != CFile::time_counter_attr::record)
+                       SuperClassWriter::writeData(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1);
+                   }
                  }
                  break ;
@@ -1566 +1589 @@
                 if (wtime)
                 {
-                  SuperClassWriter::writeTimeAxisData(time_data, timeAxisId, isCollective, field->getNStep() - 1, isRoot);
-                  SuperClassWriter::writeTimeAxisData(time_counter, string("time_counter"), isCollective, field->getNStep() - 1, isRoot);
-                  SuperClassWriter::writeTimeAxisData(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1, isRoot);
-                  SuperClassWriter::writeTimeAxisData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1, isRoot);
+                   SuperClassWriter::writeTimeAxisData(time_data, timeAxisId, isCollective, field->getNStep() - 1, isRoot);
+                   SuperClassWriter::writeTimeAxisData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1, isRoot);
+                   if (field->file->time_counter != CFile::time_counter_attr::none)
+                   {
+                     SuperClassWriter::writeTimeAxisData(time_counter, string("time_counter"), 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);
+                   }
                 }
 
@@ -1645 +1672 @@
            }
 
-           // Adding time_counter
-           axisid = "time_counter" ;
-           axisBoundId = "time_counter_bounds" ;
-           dims.clear() ;
-           dims.push_back(timeid);
-           if (!SuperClassWriter::varExist(axisid))
+           if (field->file->time_counter != CFile::time_counter_attr::none)
            {
-              SuperClassWriter::addVariable(axisid, NC_DOUBLE, dims);
-              SuperClassWriter::addAttribute("axis", string("T"), &axisid);
-              CDate timeOrigin=cal->getTimeOrigin() ;
-              StdString strTimeOrigin=timeOrigin.toString() ;
-
-              this->writeTimeAxisAttributes
-                 (axisid, cal->getType(),
-                  StdString("seconds since ").append(strTimeOrigin),
-                  strTimeOrigin, axisBoundId);
-           }
-
-           // Adding time_counter_bound dimension
-           if (!SuperClassWriter::varExist(axisBoundId))
-           {
-              dims.clear();
-              dims.push_back(timeid);
-              dims.push_back(timeBoundId);
-              SuperClassWriter::addVariable(axisBoundId, NC_DOUBLE, dims);
+             // Adding time_counter
+             axisid = "time_counter";
+             axisBoundId = "time_counter_bounds";
+             dims.clear();
+             dims.push_back(timeid);
+             if (!SuperClassWriter::varExist(axisid))
+             {
+                SuperClassWriter::addVariable(axisid, NC_DOUBLE, dims);
+                SuperClassWriter::addAttribute("axis", string("T"), &axisid);
+
+                if (field->file->time_counter != CFile::time_counter_attr::record)
+                {
+                  CDate timeOrigin = cal->getTimeOrigin();
+                  StdString strTimeOrigin = timeOrigin.toString();
+
+                  this->writeTimeAxisAttributes(axisid, cal->getType(),
+                                                StdString("seconds since ").append(strTimeOrigin),
+                                                strTimeOrigin, axisBoundId);
+                }
+             }
+
+             // Adding time_counter_bound dimension
+             if (field->file->time_counter != CFile::time_counter_attr::record)
+             {
+                if (!SuperClassWriter::varExist(axisBoundId))
+                {
+                  dims.clear();
+                  dims.push_back(timeid);
+                  dims.push_back(timeBoundId);
+                  SuperClassWriter::addVariable(axisBoundId, NC_DOUBLE, dims);
+                }
+             }
            }
          }