Changeset 436

Timestamp:

06/06/13 17:31:28 (12 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

Location:

XIOS/trunk/src

Files:

• duration.cpp (modified) (2 diffs)
• duration.hpp (modified) (1 diff)
• node/field.cpp (modified) (3 diffs)
• node/field.hpp (modified) (1 diff)
• node/field_impl.hpp (modified) (2 diffs)

XIOS/trunk/src/duration.cpp

@@ -34 +34 @@
          if(duration.hour   != 0.0) { testValue = false; sout << duration.hour   << "h " ; }
          if(duration.minute != 0.0) { testValue = false; sout << duration.minute << "mi "; }
-         if(duration.second != 0.0 || testValue)       { sout << duration.second << "s " ; }
+         if(duration.second != 0.0) { testValue = false; sout << duration.second << "s " ; }
          if(duration.timestep != 0.0 || testValue)       { sout << duration.timestep << "ts " ; }
 
@@ -106 +106 @@
 
       //-----------------------------------------------------------------
-
+      CDuration & CDuration::solveTimeStep(const CCalendar & c)
+      {
+        CDuration timeStep=c.getTimeStep() ;
+        second +=timeStep.second ; 
+        minute +=timeStep.minute ; 
+        hour +=timeStep.hour ; 
+        day +=timeStep.day ; 
+        month +=timeStep.month ; 
+        year +=timeStep.year ; 
+        timestep = 0 ;
+        return (*this);
+      }
+               
+        
       CDuration & CDuration::resolve(const CCalendar & c)
       {

XIOS/trunk/src/duration.hpp

@@ -28 +28 @@
             /// Traitement ///
             struct _duration & resolve(const CCalendar & calendar);
-
+            struct _duration & solveTimeStep(const CCalendar & c) ;
             /// Autres ///
             StdString toString(void) const;

XIOS/trunk/src/node/field.cpp

@@ -362 +362 @@
       StdString id = this->getBaseFieldReference()->getId();
       CContext* context = CContext::getCurrent();
-
-      if (operation.isEmpty() || freq_op.isEmpty() || this->file->output_freq.isEmpty())
+      
+      if (freq_op.isEmpty()) freq_op=string("1ts") ;
+      
+      if (operation.isEmpty()  || this->file->output_freq.isEmpty())
       {
          ERROR("CField::solveOperation(void)",
@@ -411 +413 @@
          const CDuration toffset = this->freq_operation - freq_offset_ - context->getCalendar()->getTimeStep(); 
          *this->last_operation   = *this->last_operation - toffset;  
-          
+      
+        if (operation.get()=="once") isOnceOperation=true ;
+        else isOnceOperation=false;
+        isFirstOperation=true;
+      
+        cout<<"Operation : "<<operation<<" isOnce "<<isOnceOperation<<endl;          
 #define DECLARE_FUNCTOR(MType, mtype)              \
    if  (operation.getValue().compare(#mtype) == 0) \
@@ -427 +434 @@
                << "The operation is not defined !");
       }
+      
+
    }
    

XIOS/trunk/src/node/field.hpp

@@ -149 +149 @@
          CArray<double, 1> data;
          map<int, CArray<double,1>* > data_srv ;
+         bool isOnceOperation ;
+         bool isFirstOperation ;
 
    }; // class CField

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();