Changeset 1044 for XIOS/trunk/src

Timestamp:

02/01/17 22:11:39 (7 years ago)

Author:

ymipsl

Message:

New file attribute : time_units : second/day

• In netcdf file switch between "seconds since " and "days since"
• Change time axis value conforming to the defined unit.

YM

Location:

XIOS/trunk/src

Files:

• config/file_attribute.conf (modified) (1 diff)
• io/nc4_data_output.cpp (modified) (7 diffs)
• io/nc4_data_output.hpp (modified) (1 diff)

XIOS/trunk/src/config/file_attribute.conf

@@ -19 +19 @@
 DECLARE_ENUM4(time_counter,  centered, instant, record, none)
 DECLARE_ATTRIBUTE(StdString, time_counter_name)
+DECLARE_ENUM2(time_units, seconds, days)
 DECLARE_ATTRIBUTE(int,       record_offset)
 DECLARE_ATTRIBUTE(bool,       cyclic)

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -1984 +1984 @@
               field->getOperationTimeType() != func::CFunctor::once)
           {
-            field->resetNStep(getRecordFromTime(field->last_Write_srv) + 1);
+                         double factorUnit;
+                         if (!field->file->time_units.isEmpty() && field->file->time_units==CFile::time_units_attr::days)
+                           factorUnit=context->getCalendar()->getDayLengthInSeconds() ; 
+                         else factorUnit=1 ;
+            field->resetNStep(getRecordFromTime(field->last_Write_srv,factorUnit) + 1);
           }
 
@@ -2047 +2051 @@
           else if (field->file->time_counter == CFile::time_counter_attr::record)
             time_counter_bound(0) = time_counter_bound(1) = field->getNStep() - 1;
+
+
+
+          if (!field->file->time_units.isEmpty() && field->file->time_units==CFile::time_units_attr::days)
+          {
+            double secByDay=context->getCalendar()->getDayLengthInSeconds() ;
+            time_data/=secByDay;
+            time_data_bound/=secByDay;
+            time_counter/=secByDay;
+            time_counter_bound/=secByDay;
+          }
         }
 
@@ -2271 +2286 @@
          StdString timeid(getTimeCounterName());
          StdString timeBoundId("axis_nbounds");
+
+         StdString strTimeUnits ;
+         if (!field->file->time_units.isEmpty() && field->file->time_units==CFile::time_units_attr::days) strTimeUnits="days since " ;
+         else  strTimeUnits="seconds since " ;
  
          if (field->getOperationTimeType() == func::CFunctor::instant)
@@ -2300 +2319 @@
               StdString strTimeOrigin=timeOrigin.toString() ;
               this->writeTimeAxisAttributes
-                 (axisid, cal->getType(),
-                  StdString("seconds since ").append(strTimeOrigin),
+                 (axisid, cal->getType(),strTimeUnits+strTimeOrigin,
                   strTimeOrigin, axisBoundId);
            }
@@ -2334 +2352 @@
 
                   this->writeTimeAxisAttributes(axisid, cal->getType(),
-                                                StdString("seconds since ").append(strTimeOrigin),
+                                                strTimeUnits+strTimeOrigin,
                                                 strTimeOrigin, axisBoundId);
                 }
@@ -2569 +2587 @@
       ///--------------------------------------------------------------
 
-      StdSize CNc4DataOutput::getRecordFromTime(Time time)
+      StdSize CNc4DataOutput::getRecordFromTime(Time time, double factorUnit)
       {
         std::map<Time, StdSize>::const_iterator it = timeToRecordCache.find(time);
@@ -2580 +2598 @@
           CArray<double,2> timeAxisBounds;
           SuperClassWriter::getTimeAxisBounds(timeAxisBounds, timeAxisBoundsId, isCollective);
-
+          timeAxisBounds*=factorUnit ;
+          
           StdSize record = 0;
           double dtime(time);

XIOS/trunk/src/io/nc4_data_output.hpp

@@ -96 +96 @@
                                      const StdString & nav_model);
 
-            StdSize getRecordFromTime(Time time);
+            StdSize getRecordFromTime(Time time, double factorUnit);
 
          private :