Changeset 460 for XIOS/trunk/src/node/field.cpp

Timestamp:

01/20/14 11:16:48 (11 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.cpp (modified) (7 diffs)

XIOS/trunk/src/node/field.cpp

@@ -25 +25 @@
       , last_Write(), last_operation()
       , foperation(), hasInstantData(false), hasExpression(false)
-      , active(false) , hasOutputFile(false), slotUpdateDate(NULL)
+      , active(false) , hasOutputFile(false),hasFieldOut(false), slotUpdateDate(NULL)
       , processed(false)
       { /* Ne rien faire de plus */ }
@@ -37 +37 @@
       , last_Write(), last_operation()
       , foperation(), hasExpression(false)
-      , active(false), hasOutputFile(false), slotUpdateDate(NULL)
+      , active(false), hasOutputFile(false), hasFieldOut(false), slotUpdateDate(NULL)
       , processed(false)
    { /* Ne rien faire de plus */ }
@@ -387 +387 @@
       using namespace func;
       
-      if (!hasOutputFile) return ;
+      if (!hasOutputFile && !hasFieldOut) return ;
       
       StdString id ;
@@ -418 +418 @@
       if (context->hasServer)
       {
-         this->freq_operation_srv =
-             CDuration::FromString(this->file->output_freq.getValue());
-         this->freq_write_srv     =
-             CDuration::FromString(this->file->output_freq.getValue());
+         if (hasOutputFile) 
+         {
+           this->freq_operation_srv =CDuration::FromString(this->file->output_freq.getValue());
+           this->freq_write_srv = CDuration::FromString(this->file->output_freq.getValue());
+         }
          this->lastlast_Write_srv     = boost::shared_ptr<CDate>
                         (new CDate(context->getCalendar()->getInitDate()));
@@ -431 +432 @@
 //             boost::shared_ptr<func::CFunctor>(new CInstant(this->data_srv));
              
-         const CDuration toffset = this->freq_operation_srv - freq_offset_ - context->getCalendar()->getTimeStep(); 
-         *this->last_operation_srv   = *this->last_operation_srv - toffset; 
+         if (hasOutputFile) 
+         {
+           const CDuration toffset = this->freq_operation_srv - freq_offset_ - context->getCalendar()->getTimeStep(); 
+           *this->last_operation_srv   = *this->last_operation_srv - toffset;
+         }
       }
       
@@ -438 +442 @@
 //      {                  
          this->freq_operation = CDuration::FromString(freq_op.getValue());
-         this->freq_write     = CDuration::FromString(this->file->output_freq.getValue());
+         if (hasOutputFile) this->freq_write     = CDuration::FromString(this->file->output_freq.getValue());
+         if (hasFieldOut) 
+         {
+           this->freq_write = CDuration::FromString(this->fieldOut->freq_op.getValue());
+         }
          this->last_Write     = boost::shared_ptr<CDate>
                         (new CDate(context->getCalendar()->getInitDate()));
@@ -665 +673 @@
       expression=CFieldNode::newNode(simpleExpr) ;
       delete simpleExpr ;
-      set<string> fieldIds ;
-      expression->getFieldIds(fieldIds) ;
-      for (set<string>::iterator it=fieldIds.begin() ; it!=fieldIds.end();++it) if (*it!="this") CField::get(*it)->processEnabledField() ;
-      
-      expression->reduce(this) ;
-
-      slots.resize(fieldIds.size()) ;
+      set<string> instantFieldIds ;
+      map<string,CField*> associatedInstantFieldIds ;
+      expression->getInstantFieldIds(instantFieldIds) ;
+      for (set<string>::iterator it=instantFieldIds.begin() ; it!=instantFieldIds.end();++it) 
+      {
+        if (*it!="this") 
+        {
+          if (CField::has(*it)) 
+          {
+            CField* field=CField::get(*it) ;
+            field->processEnabledField() ;
+            associatedInstantFieldIds[*it]=field ;
+          }
+          else  ERROR("void CField::buildExpression(void)",<<" Field "<<*it<<" does not exist") ;
+        }
+      }
+      
+      set<string> averageFieldIds ;
+      map<string,CField*> associatedAverageFieldIds ;
+
+      expression->getAverageFieldIds(averageFieldIds) ;
+      for (set<string>::iterator it=averageFieldIds.begin() ; it!=averageFieldIds.end();++it) 
+      {      
+        if (CField::has(*it)) 
+        {
+           CFieldGroup* root=CFieldGroup::get("field_definition") ;
+           CField* averageField=root->createChild() ;
+           CField* instantField=root->createChild() ;
+           averageField->field_ref=*it ;
+           averageField->hasFieldOut=true ;
+           averageField->fieldOut=instantField ;
+           instantField->freq_op=freq_op ;
+           averageField-> processEnabledField() ;
+           cout<<" outputfreq of averageField "<<  freq_op <<"  "<<instantField->freq_op<<"  "<< averageField->freq_write << endl ;
+           instantField->SuperClassAttribute::setAttributes(averageField, true);
+           instantField->field_ref.reset() ;
+           instantField->operation.reset() ;
+
+           instantField-> processEnabledField() ;
+           associatedAverageFieldIds[*it]=instantField  ;
+        }
+        else ERROR("void CField::buildExpression(void)",<<" Field "<<*it<<" does not exist") ;
+      }
+
+      expression->reduce(this,associatedInstantFieldIds,associatedAverageFieldIds) ;
+
+      slots.resize(instantFieldIds.size()+averageFieldIds.size()) ;
       resetSlots() ;
       int slotId=0 ;