Changeset 436 for XIOS/trunk/src/node/field_impl.hpp

Timestamp:

06/06/13 17:31:28 (11 years ago)

Author:

ymipsl

Message:

bug fix :

• freq_op is now by default of 1 timestep (1ts)
• once operation is now working as required

YM

File:

• XIOS/trunk/src/node/field_impl.hpp (modified) (2 diffs)

XIOS/trunk/src/node/field_impl.hpp

@@ -28 +28 @@
       const CDate & currDate = context->getCalendar()->getCurrentDate();
       const CDate opeDate      = *last_operation + freq_operation;
-      const CDate writeDate    = *last_Write     + freq_write;       
+      const CDate writeDate    = *last_Write     + freq_write;
+      bool doOperation, doWrite; 
+         
 
    
       info(50) << "CField::updateData " << currDate <<  " : send data to " << this->getBaseFieldId() << std::endl;
       info(50) << "Next operation "  << opeDate<<std::endl;
-
-      if (opeDate <= currDate)
+      
+      doOperation = (opeDate <= currDate) ;
+      if (isOnceOperation)
+        if (isFirstOperation) doOperation=true ;
+        else doOperation=false ;
+      
+      if (doOperation)
       {
          if (this->data.numElements() != this->grid->storeIndex_client.numElements())
@@ -49 +56 @@
       }
       
-      if (writeDate < (currDate + freq_operation))
+      
+      doWrite = (writeDate < (currDate + freq_operation)) ;
+      if (isOnceOperation)
+      { 
+        if(isFirstOperation) 
+        {
+          doWrite=true ;
+          isFirstOperation=false ;
+        }
+        else doWrite=false ;
+      }
+      
+      if (doWrite)
       {
          this->foperation->final();