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

Timestamp:

02/03/14 14:16:20 (10 years ago)

Author:

ymipsl

Message:

Enhancement : user defined global and field attribute can be output in the netcdfcf file.
A variable child element inclosed into a file element will be output as a global file attribute.
A variable child element inclosed into a field element will be output as a field attribute.

+ variable fortran interface added

YM

File:

• XIOS/trunk/src/node/field.cpp (modified) (6 diffs)

XIOS/trunk/src/node/field.cpp

@@ -27 +27 @@
       , active(false) , hasOutputFile(false),hasFieldOut(false), slotUpdateDate(NULL)
       , processed(false)
-      { /* Ne rien faire de plus */ }
+      { setVirtualVariableGroup() ; }
 
    CField::CField(const StdString & id)
@@ -39 +39 @@
       , active(false), hasOutputFile(false), hasFieldOut(false), slotUpdateDate(NULL)
       , processed(false)
-   { /* Ne rien faire de plus */ }
+   { setVirtualVariableGroup() ; }
 
    CField::~CField(void)
@@ -51 +51 @@
    }
 
+
+  //----------------------------------------------------------------
+
+   void CField::setVirtualVariableGroup(CVariableGroup* newVVariableGroup)
+   { 
+      this->vVariableGroup = newVVariableGroup; 
+   }
+ 
+   void CField::setVirtualVariableGroup(void)
+   {
+      this->setVirtualVariableGroup(CVariableGroup::create());
+   }
+  
+   CVariableGroup* CField::getVirtualVariableGroup(void) const
+   {
+      return (this->vVariableGroup);
+   }
+
+ 
+   std::vector<CVariable*> CField::getAllVariables(void) const
+   {
+      return (this->vVariableGroup->getAllChildren());
+   }
+   
+   void CField::solveDescInheritance(bool apply, const CAttributeMap * const parent)
+   {
+      SuperClassAttribute::setAttributes(parent,apply);
+      this->getVirtualVariableGroup()->solveDescInheritance(apply, NULL);
+   }
+   //----------------------------------------------------------------
    //----------------------------------------------------------------
 
@@ -93 +123 @@
           return true ;
           break ;
+
+            case EVENT_ID_ADD_VARIABLE :
+             recvAddVariable(event) ;
+             return true ;
+             break ;
+         
+           case EVENT_ID_ADD_VARIABLE_GROUP :
+             recvAddVariableGroup(event) ;
+             return true ;
+             break ; 
  
         default :
@@ -658 +698 @@
       SuperClass::parse(node);
       node.getContent(this->content) ;
+      if (node.goToChildElement())
+      {
+        do
+        {
+          if (node.getElementName()=="variable" || node.getElementName()=="variable_group") this->getVirtualVariableGroup()->parseChild(node);
+        } while (node.goToNextElement()) ;
+        node.goToParentElement();
+      }
+
     }
     
@@ -782 +831 @@
     }
   }
+
+
+
+   CVariable* CField::addVariable(const string& id)
+   {
+     return vVariableGroup->createChild(id) ;
+   }
+
+   CVariableGroup* CField::addVariableGroup(const string& id)
+   {
+     return vVariableGroup->createChildGroup(id) ;
+   }
+
+
+   void CField::sendAddVariable(const string& id)
+   {
+    CContext* context=CContext::getCurrent() ;
+    
+    if (! context->hasServer )
+    {
+       CContextClient* client=context->client ;
+
+       CEventClient event(this->getType(),EVENT_ID_ADD_VARIABLE) ;   
+       if (client->isServerLeader())
+       {
+         CMessage msg ;
+         msg<<this->getId() ;
+         msg<<id ;
+         event.push(client->getServerLeader(),1,msg) ;
+         client->sendEvent(event) ;
+       }
+       else client->sendEvent(event) ;
+    }
+      
+   }
+ 
+   
+   void CField::sendAddVariableGroup(const string& id)
+   {
+    CContext* context=CContext::getCurrent() ;
+    if (! context->hasServer )
+    {
+       CContextClient* client=context->client ;
+
+       CEventClient event(this->getType(),EVENT_ID_ADD_VARIABLE_GROUP) ;   
+       if (client->isServerLeader())
+       {
+         CMessage msg ;
+         msg<<this->getId() ;
+         msg<<id ;
+         event.push(client->getServerLeader(),1,msg) ;
+         client->sendEvent(event) ;
+       }
+       else client->sendEvent(event) ;
+    }
+      
+   }
+   
+   void CField::recvAddVariable(CEventServer& event)
+   {
+      
+      CBufferIn* buffer=event.subEvents.begin()->buffer;
+      string id;
+      *buffer>>id ;
+      get(id)->recvAddVariable(*buffer) ;
+   }
+   
+   
+   void CField::recvAddVariable(CBufferIn& buffer)
+   {
+      string id ;
+      buffer>>id ;
+      addVariable(id) ;
+   }
+
+   void CField::recvAddVariableGroup(CEventServer& event)
+   {
+      
+      CBufferIn* buffer=event.subEvents.begin()->buffer;
+      string id;
+      *buffer>>id ;
+      get(id)->recvAddVariableGroup(*buffer) ;
+   }
+   
+   
+   void CField::recvAddVariableGroup(CBufferIn& buffer)
+   {
+      string id ;
+      buffer>>id ;
+      addVariableGroup(id) ;
+   }
+
+
+
   
 } // namespace xios