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

Timestamp:

01/20/14 11:16:48 (10 years ago)

Author:

ymipsl

Message:

New functionnalities : expression may combine fields after temporal operation (averaging, min, max ...) using the operator @

YM

File:

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

XIOS/trunk/src/node/field_impl.hpp

@@ -28 +28 @@
      
       for (; it != end; it++) (*it)->setData(_data) ;
-      if (hasOutputFile) updateData(_data) ;
+      if (hasOutputFile || hasFieldOut) updateData(_data) ;
     }
      
   }
 
+  void CField::setDataFromExpression(const CArray<double, 1>& _data)
+  {
+    if (hasInstantData) 
+    {
+      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) ;
+    }
+     
+  }
 
    template <int N>
@@ -82 +100 @@
          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() ;
+         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);        
       }