Changeset 572 for XIOS/branchs/xios-1.0

Timestamp:

03/10/15 13:30:08 (9 years ago)

Author:

rlacroix

Message:

Fix: Make sure the grids are consistent when doing field operations.

Always treats internal grids as such to avoid errors when doing further operations.

File:

• XIOS/branchs/xios-1.0/src/node/field_impl.hpp (modified) (4 diffs)

XIOS/branchs/xios-1.0/src/node/field_impl.hpp

@@ -16 +16 @@
   void CField::setData(const CArray<double, N>& _data)
   {
-    if (hasInstantData) 
+    if (hasInstantData)
     {
-      grid->inputField(_data, instantData); 
-      for(list< pair<CField *,int> >::iterator it=fieldDependency.begin(); it!=fieldDependency.end(); ++it)  it->first->setSlot(it->second) ;
+      grid->inputField(_data, instantData);
+      for(list< pair<CField *,int> >::iterator it=fieldDependency.begin(); it!=fieldDependency.end(); ++it)  it->first->setSlot(it->second);
     }
-    
+
     if (!hasExpression)
     {
       const std::vector<CField*>& refField=getAllReference();
       std::vector<CField*>::const_iterator  it = refField.begin(), end = refField.end();
-     
-      for (; it != end; it++) (*it)->setData(_data) ;
-      if (hasOutputFile || hasFieldOut) updateData(_data) ;
+
+      for (; it != end; it++) (*it)->setData(_data);
+      if (hasOutputFile || hasFieldOut) updateData(_data);
     }
-     
   }
 
   void CField::setDataFromExpression(const CArray<double, 1>& _data)
   {
-    if (hasInstantData) 
+    if (hasInstantData)
     {
-      instantData=_data; 
-      for(list< pair<CField *,int> >::iterator it=fieldDependency.begin(); it!=fieldDependency.end(); ++it)  it->first->setSlot(it->second) ;
+      instantData=_data;
+      for(list< pair<CField *,int> >::iterator it=fieldDependency.begin(); it!=fieldDependency.end(); ++it)  it->first->setSlot(it->second);
     }
-    
+
     if (!hasExpression)
     {
       const std::vector<CField*>& refField=getAllReference();
       std::vector<CField*>::const_iterator  it = refField.begin(), end = refField.end();
-     
-      for (; it != end; it++) (*it)->setData(_data) ;
-      if (hasOutputFile || hasFieldOut) updateData(_data) ;
+
+      for (; it != end; it++) (*it)->setDataFromExpression(_data);
+      if (hasOutputFile || hasFieldOut) updateDataFromExpression(_data);
     }
-     
   }
 
    template <int N>
    bool CField::updateData(const CArray<double, N>& _data)
-   {        
+   {
       CContext* context=CContext::getCurrent();
       const CDate & currDate = context->getCalendar()->getCurrentDate();
       const CDate opeDate      = *last_operation + freq_operation;
-      const CDate writeDate    = *last_Write     + freq_write;       
-      bool doOperation, doWrite; 
+      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;
 
-      doOperation = (opeDate <= currDate) ;
+      doOperation = (opeDate <= currDate);
       if (isOnceOperation)
-        if (isFirstOperation) doOperation=true ;
-        else doOperation=false ;
+        if (isFirstOperation) doOperation=true;
+        else doOperation=false;
 
       if (doOperation)
@@ -76 +74 @@
             this->data.resize(this->grid->storeIndex_client.numElements());
          }
-            
-         CArray<double,1> input(data.numElements()) ;
-         this->grid->inputField(_data, input);          
+
+         CArray<double,1> input(data.numElements());
+         this->grid->inputField(_data, input);
          (*this->foperation)(input);
-         
+
          *last_operation = currDate;
-         info(50) << "(*last_operation = currDate) : " << *last_operation << " = " << currDate << std::endl; 
+         info(50) << "(*last_operation = currDate) : " << *last_operation << " = " << currDate << std::endl;
       }
 
-      doWrite = (writeDate < (currDate + freq_operation)) ;
+      doWrite = (writeDate < (currDate + freq_operation));
       if (isOnceOperation)
-      { 
-        if(isFirstOperation) 
+      {
+        if(isFirstOperation)
         {
-          doWrite=true ;
-          isFirstOperation=false ;
+          doWrite=true;
+          isFirstOperation=false;
         }
-        else doWrite=false ;
+        else doWrite=false;
       }
-      
+
       if (doWrite)
       {
@@ -103 +101 @@
          {
            info(50) << "(*last_Write = currDate) : " << *last_Write << " = " << currDate << std::endl;
-           CTimer::get("XIOS Send Data").resume() ;
-           sendUpdateData() ;
-           CTimer::get("XIOS Send Data").suspend() ;
+           CTimer::get("XIOS Send Data").resume();
+           sendUpdateData();
+           CTimer::get("XIOS Send Data").suspend();
          }
-         
+
          if (hasFieldOut)
          {
-           fieldOut->setDataFromExpression(data) ;
+           fieldOut->setDataFromExpression(data);
          }
-         return (true);        
+         return (true);
       }
 
       return (false);
    }
-   
+
    bool CField::updateDataFromExpression(const CArray<double, 1>& _data)
-   {        
+   {
       CContext* context=CContext::getCurrent();
       const CDate & currDate = context->getCalendar()->getCurrentDate();
       const CDate opeDate      = *last_operation + freq_operation;
-      const CDate writeDate    = *last_Write     + freq_write;       
-      bool doOperation, doWrite; 
+      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;
 
-      doOperation = (opeDate <= currDate) ;
+      doOperation = (opeDate <= currDate);
       if (isOnceOperation)
-        if (isFirstOperation) doOperation=true ;
-        else doOperation=false ;
+        if (isFirstOperation) doOperation=true;
+        else doOperation=false;
 
       if (doOperation)
@@ -141 +139 @@
             this->data.resize(this->grid->storeIndex_client.numElements());
          }
-            
+
         (*this->foperation)(_data);
-         
+
          *last_operation = currDate;
-         info(50) << "(*last_operation = currDate) : " << *last_operation << " = " << currDate << std::endl; 
+         info(50) << "(*last_operation = currDate) : " << *last_operation << " = " << currDate << std::endl;
       }
 
-      doWrite = (writeDate < (currDate + freq_operation)) ;
+      doWrite = (writeDate < (currDate + freq_operation));
       if (isOnceOperation)
-      { 
-        if(isFirstOperation) 
+      {
+        if(isFirstOperation)
         {
-          doWrite=true ;
-          isFirstOperation=false ;
+          doWrite=true;
+          isFirstOperation=false;
         }
-        else doWrite=false ;
+        else doWrite=false;
       }
-      
+
       if (doWrite)
       {
          this->foperation->final();
          *last_Write = writeDate;
-         info(50) << "(*last_Write = currDate) : " << *last_Write << " = " << currDate  << std::endl;
-         CTimer::get("XIOS Send Data").resume() ;
-         sendUpdateData() ;
-         CTimer::get("XIOS Send Data").suspend() ;
-         return (true);        
+         if (hasOutputFile)
+         {
+           info(50) << "(*last_Write = currDate) : " << *last_Write << " = " << currDate << std::endl;
+           CTimer::get("XIOS Send Data").resume();
+           sendUpdateData();
+           CTimer::get("XIOS Send Data").suspend();
+         }
+
+         if (hasFieldOut)
+         {
+           fieldOut->setDataFromExpression(data);
+         }
+         return (true);
       }