Changeset 850

Timestamp:

05/11/16 16:11:10 (7 years ago)

Author:

ymipsl

Message:

Add cyclic file attribute. If cyclic=true, when last time record of a field is read in a file, it will cycle at the beginning instead of send a EOF signal to the clients.

YM

Location:

XIOS/trunk/src

Files:

• config/file_attribute.conf (modified) (1 diff)
• io/nc4_data_input.cpp (modified) (2 diffs)
• node/field.cpp (modified) (2 diffs)

XIOS/trunk/src/config/file_attribute.conf

@@ -19 +19 @@
 DECLARE_ATTRIBUTE(StdString, time_counter_name)
 DECLARE_ATTRIBUTE(int,       record_offset)
+DECLARE_ATTRIBUTE(bool,       cyclic)
 
 DECLARE_ATTRIBUTE(int,       compression_level)

XIOS/trunk/src/io/nc4_data_input.cpp

@@ -55 +55 @@
     {
       case MULTI_FILE:
-        SuperClassWriter::getData(fieldData, fieldId, isCollective, field->getNStep() - 1);
+        SuperClassWriter::getData(fieldData, fieldId, isCollective, (field->getNStep() - 1)%field->nstepMax );
         break;
       case ONE_FILE:
@@ -116 +116 @@
         }
 
-        SuperClassWriter::getData(fieldData, fieldId, isCollective, field->getNStep() - 1, &start, &count);
+        SuperClassWriter::getData(fieldData, fieldId, isCollective, (field->getNStep() - 1)%field->nstepMax, &start, &count);
         break;
       }

XIOS/trunk/src/node/field.cpp

@@ -284 +284 @@
 
     if (requestData)
+    {
+      cout<<"currentDate : "<<currentDate<<endl ;
+      cout<<"lastDataRequestedFromServer : "<<lastDataRequestedFromServer<<endl ;
+      cout<<"file->output_freq.getValue() : "<<file->output_freq.getValue()<<endl ;
+      cout<<"lastDataRequestedFromServer + file->output_freq.getValue() : "<<lastDataRequestedFromServer + file->output_freq.getValue()<<endl ;
+     
       sendReadDataRequest();
+    }
 
     return requestData;
@@ -335 +342 @@
 
         getRelFile()->checkFile();
-        this->incrementNStep();
-
         if (!nstepMax)
         {
           nstepMax = getRelFile()->getDataInput()->getFieldNbRecords(CField::get(this));
         }
-
-        if (getNStep() > nstepMax)
+        
+        this->incrementNStep();
+
+
+
+        if (getNStep() > nstepMax && (getRelFile()->cyclic.isEmpty() || !getRelFile()->cyclic) )
           return false;