Changeset 850 for XIOS/trunk/src/node

Timestamp:

05/11/16 16:11:10 (8 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

File:

• XIOS/trunk/src/node/field.cpp (modified) (2 diffs)

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;