Changeset 952

Timestamp:

09/26/16 16:26:38 (8 years ago)

Author:

ymipsl

Message:

• Attribut record_offset accept now negative value.
• Field are not output in files until nstep > 0.

YM

Location:

XIOS/trunk/src

Files:

• io/nc4_data_output.cpp (modified) (1 diff)
• node/field.cpp (modified) (2 diffs)
• node/field.hpp (modified) (3 diffs)
• node/file.cpp (modified) (1 diff)

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -1908 +1908 @@
         CGrid* grid = field->grid;
 
+        if (field->getNStep()<1) return ;
+        
         if (!grid->doGridHaveDataToWrite())
           if (SuperClass::type == MULTI_FILE || !isCollective) return;

XIOS/trunk/src/node/field.cpp

@@ -434 +434 @@
    }
 
-   StdSize CField::getNStep(void) const
+   int CField::getNStep(void) const
    {
       return this->nstep;
@@ -451 +451 @@
    }
 
-   void CField::resetNStep(StdSize nstep /*= 0*/)
+   void CField::resetNStep(int nstep /*= 0*/)
    {
       this->nstep = nstep;

XIOS/trunk/src/node/field.hpp

@@ -81 +81 @@
 
       public:
-         StdSize getNStep(void) const;
+         int getNStep(void) const;
 
          template <int N> void getData(CArray<double, N>& _data) const;
@@ -90 +90 @@
          void setRelFile(CFile* _file);
          void incrementNStep(void);
-         void resetNStep(StdSize nstep = 0);
+         void resetNStep(int nstep = 0);
          void resetNStepMax();
 
@@ -189 +189 @@
 
          bool written; //<! Was the field written at least once
-         StdSize nstep, nstepMax;
+         int nstep, nstepMax;
          bool isEOF;
          CDate lastlast_Write_srv, last_Write_srv, last_operation_srv;

XIOS/trunk/src/node/file.cpp

@@ -243 +243 @@
       allDomainEmpty = true;
 
-      if (!record_offset.isEmpty() && record_offset < 0)
-        ERROR("void CFile::initFile(void)",
-              "Invalid 'record_offset', this attribute cannot be negative.");
-      const size_t recordOffset = record_offset.isEmpty() ? 0 : record_offset;
+//      if (!record_offset.isEmpty() && record_offset < 0)
+//        ERROR("void CFile::initFile(void)",
+//              "Invalid 'record_offset', this attribute cannot be negative.");
+      const int recordOffset = record_offset.isEmpty() ? 0 : record_offset;
 
       set<CAxis*> setAxis;