Changeset 444

Timestamp:

06/19/13 10:04:28 (11 years ago)

Author:

ymipsl

Message:

suppress time axis writing for "once" operation

YM

File:

• XIOS/trunk/src/output/nc4_data_output.cpp (modified) (6 diffs)

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -571 +571 @@
              
          CArray<double,1> time_data(1) ;
-         
-         if (field->operation.getValue()=="instant") time_data(0) = Time(*field->last_Write_srv)
+        
+        bool wtime   = !(!field->operation.isEmpty() &&
+                         ( field->operation.getValue().compare("once") == 0));
+                                 
+        if (wtime)
+        {
+          if (field->operation.getValue()=="instant") time_data(0) = Time(*field->last_Write_srv)
                                                                       -Time(context->calendar->getTimeOrigin());
-         else time_data(0) = (Time(*field->last_Write_srv)+Time(*field->lastlast_Write_srv))/2
-                               -Time(context->calendar->getTimeOrigin());
+          else time_data(0) = (Time(*field->last_Write_srv)+Time(*field->lastlast_Write_srv))/2
+                                -Time(context->calendar->getTimeOrigin());
+         }
          
          
@@ -593 +599 @@
               {
                  SuperClassWriter::writeData(field_data3D, fieldid, isCollective, field->getNStep()-1);
-                 SuperClassWriter::writeData(time_data, oss.str(), isCollective, field->getNStep()-1);
+                 if (wtime) SuperClassWriter::writeData(time_data, oss.str(), isCollective, field->getNStep()-1);
                  break ;
               }
@@ -612 +618 @@
                  }
                  SuperClassWriter::writeData(field_data3D, fieldid, isCollective, field->getNStep()-1,&start,&count );
-                 SuperClassWriter::writeTimeAxisData(time_data, oss.str(), isCollective, field->getNStep()-1,isRoot );
+                 if (wtime) SuperClassWriter::writeTimeAxisData(time_data, oss.str(), isCollective, field->getNStep()-1,isRoot );
                  break;
               }
@@ -628 +634 @@
               {
                 SuperClassWriter::writeData(field_data2D, fieldid, isCollective, field->getNStep()-1);
-                SuperClassWriter::writeData(time_data, oss.str(), isCollective, field->getNStep()-1);
+                if (wtime) SuperClassWriter::writeData(time_data, oss.str(), isCollective, field->getNStep()-1);
                 break;
               }
@@ -647 +653 @@
 
                  SuperClassWriter::writeData(field_data2D, fieldid, isCollective, field->getNStep()-1,&start,&count);
-                 SuperClassWriter::writeTimeAxisData(time_data, oss.str(), isCollective, field->getNStep()-1,isRoot);
+                 if (wtime) SuperClassWriter::writeTimeAxisData(time_data, oss.str(), isCollective, field->getNStep()-1,isRoot);
                  break; 
               
@@ -662 +668 @@
       {
          StdOStringStream oss;
+         
+         if (field->operation.getValue().compare("once") == 0) return ;
+                         
          oss << "time_" << field->operation.getValue()
              << "_" << field->getRelFile()->output_freq.getValue();