Changeset 472 for XIOS/trunk/src/node/file.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/file.cpp (modified) (10 diffs)

XIOS/trunk/src/node/file.cpp

@@ -24 +24 @@
       : CObjectTemplate<CFile>(), CFileAttributes()
       , vFieldGroup(), data_out(), enabledFields(), fileComm(MPI_COMM_NULL)
-   { setVirtualFieldGroup() ;}
+   { 
+     setVirtualFieldGroup() ;
+     setVirtualVariableGroup() ;
+   }
 
    CFile::CFile(const StdString & id)
       : CObjectTemplate<CFile>(id), CFileAttributes()
       , vFieldGroup(), data_out(), enabledFields(), fileComm(MPI_COMM_NULL)
-   { setVirtualFieldGroup() ;}
+    { 
+      setVirtualFieldGroup() ;
+      setVirtualVariableGroup() ;
+    }
 
    CFile::~CFile(void)
@@ -52 +58 @@
    }
 
+   CVariableGroup* CFile::getVirtualVariableGroup(void) const
+   {
+      return (this->vVariableGroup);
+   }
+
    std::vector<CField*> CFile::getAllFields(void) const
    {
       return (this->vFieldGroup->getAllChildren());
+   }
+ 
+   std::vector<CVariable*> CFile::getAllVariables(void) const
+   {
+      return (this->vVariableGroup->getAllChildren());
    }
 
@@ -120 +136 @@
    }
 
+   void CFile::setVirtualVariableGroup(CVariableGroup* newVVariableGroup)
+   { 
+      this->vVariableGroup = newVVariableGroup; 
+   }
+
    //----------------------------------------------------------------
 
@@ -125 +146 @@
    {
       this->setVirtualFieldGroup(CFieldGroup::create());
+   }
+
+   void CFile::setVirtualVariableGroup(void)
+   {
+      this->setVirtualVariableGroup(CVariableGroup::create());
    }
 
@@ -313 +339 @@
          }
          
+         vector<CVariable*> listVars = getAllVariables() ;
+         for (vector<CVariable*>::iterator it = listVars.begin() ;it != listVars.end(); it++) this-> data_out-> writeAttribute(*it) ;
+         
          this->data_out->definition_end();
       }
@@ -333 +362 @@
    {
       SuperClass::parse(node);
-      if (node.goToChildElement() & this->hasId())
-      { // Si la définition du fichier intégre des champs et si le fichier est identifié.
-         node.goToParentElement();
-//         this->setVirtualFieldGroup(this->getId());
-         this->getVirtualFieldGroup()->parse(node, false);
-      }
+      
+      if (node.goToChildElement())
+      {
+        do
+        {
+           if (node.getElementName()=="field" || node.getElementName()=="field_group") this->getVirtualFieldGroup()->parseChild(node);
+           else if (node.getElementName()=="variable" || node.getElementName()=="variable_group") this->getVirtualVariableGroup()->parseChild(node);
+        } while (node.goToNextElement()) ;
+        node.goToParentElement();
+      }
+
    }
    //----------------------------------------------------------------
@@ -361 +395 @@
    {
       SuperClassAttribute::setAttributes(parent,apply);
-      this->getVirtualFieldGroup()->solveDescInheritance(apply, NULL);
+      this->getVirtualFieldGroup()->solveDescInheritance(apply, NULL); 
+      this->getVirtualVariableGroup()->solveDescInheritance(apply, NULL);
    }
 
@@ -422 +457 @@
    {
      return vFieldGroup->createChildGroup(id) ;
+   }
+ 
+   CVariable* CFile::addVariable(const string& id)
+   {
+     return vVariableGroup->createChild(id) ;
+   }
+
+   CVariableGroup* CFile::addVariableGroup(const string& id)
+   {
+     return vVariableGroup->createChildGroup(id) ;
    }
    
@@ -502 +547 @@
    }
    
+
+
+
+
+
+
+
+
+
+
+   void CFile::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 CFile::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 CFile::recvAddVariable(CEventServer& event)
+   {
+      
+      CBufferIn* buffer=event.subEvents.begin()->buffer;
+      string id;
+      *buffer>>id ;
+      get(id)->recvAddVariable(*buffer) ;
+   }
+   
+   
+   void CFile::recvAddVariable(CBufferIn& buffer)
+   {
+      string id ;
+      buffer>>id ;
+      addVariable(id) ;
+   }
+
+   void CFile::recvAddVariableGroup(CEventServer& event)
+   {
+      
+      CBufferIn* buffer=event.subEvents.begin()->buffer;
+      string id;
+      *buffer>>id ;
+      get(id)->recvAddVariableGroup(*buffer) ;
+   }
+   
+   
+   void CFile::recvAddVariableGroup(CBufferIn& buffer)
+   {
+      string id ;
+      buffer>>id ;
+      addVariableGroup(id) ;
+   }
+
+
+
+
 
    bool CFile::dispatchEvent(CEventServer& event)
@@ -519 +654 @@
              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 :
               ERROR("bool CFile::dispatchEvent(CEventServer& event)", <<"Unknown Event") ;