Changeset 472 for XIOS/trunk/src/interface/c/icxml_tree.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/interface/c/icxml_tree.cpp (modified) (4 diffs)

XIOS/trunk/src/interface/c/icxml_tree.cpp

@@ -20 +20 @@
 #include "axis.hpp"
 #include "domain.hpp"
+#include "variable.hpp"
 
 extern "C"
@@ -43 +44 @@
    typedef xios::CAxis      * XAxisPtr;
    typedef xios::CAxisGroup * XAxisGroupPtr;
-   
+ 
+   typedef xios::CVariable      *  XVariablePtr;
+   typedef xios::CVariableGroup *  XVariableGroupPtr;
+  
    // ----------------------- Ajout d'enfant à un parent -----------------------
    
@@ -155 +159 @@
    }
 
+   void cxios_xml_tree_add_variabletofile
+      (XFilePtr parent_, XVariablePtr * child_, const char * child_id, int child_id_size)
+   {
+      std::string child_id_str;
+      CTimer::get("XIOS").resume() ;
+ 
+      if (cstr2string(child_id, child_id_size, child_id_str))
+      {
+         *child_ = parent_->addVariable(child_id_str);
+         parent_->sendAddVariable(child_id_str) ;
+      }
+      else
+      {
+         *child_ = parent_->addVariable();
+         parent_->sendAddVariable() ;
+      }
+      CTimer::get("XIOS").suspend() ;
+   }
+   
+    void cxios_xml_tree_add_variabletofield
+      (XFieldPtr parent_, XVariablePtr * child_, const char * child_id, int child_id_size)
+   {
+      std::string child_id_str;
+      CTimer::get("XIOS").resume() ;
+ 
+      if (cstr2string(child_id, child_id_size, child_id_str))
+      {
+         *child_ = parent_->addVariable(child_id_str);
+         parent_->sendAddVariable(child_id_str) ;
+      }
+      else
+      {
+         *child_ = parent_->addVariable();
+         parent_->sendAddVariable() ;
+      }
+      CTimer::get("XIOS").suspend() ;
+   }  
    // ----------------------- Ajout de groupe à un parent ----------------------
 
@@ -264 +305 @@
       CTimer::get("XIOS").suspend() ;
    }
+   
+   void cxios_xml_tree_add_variablegrouptofile
+      (XFilePtr parent_, XVariableGroupPtr * child_, const char * child_id, int child_id_size)
+   {
+      std::string child_id_str; 
+      CTimer::get("XIOS").resume() ;
+      if (cstr2string(child_id, child_id_size, child_id_str))
+      {
+         *child_ = parent_->addVariableGroup(child_id_str);
+         parent_->sendAddVariableGroup(child_id_str) ;
+      }
+      else
+      {
+         *child_ = parent_->addVariableGroup();
+         parent_->sendAddVariableGroup() ;
+      }
+      CTimer::get("XIOS").suspend() ;
+   }
+   
+   void cxios_xml_tree_add_variablegrouptofield
+      (XFieldPtr parent_, XVariableGroupPtr * child_, const char * child_id, int child_id_size)
+   {
+      std::string child_id_str; 
+      CTimer::get("XIOS").resume() ;
+      if (cstr2string(child_id, child_id_size, child_id_str))
+      {
+         *child_ = parent_->addVariableGroup(child_id_str);
+         parent_->sendAddVariableGroup(child_id_str) ;
+      }
+      else
+      {
+         *child_ = parent_->addVariableGroup();
+         parent_->sendAddVariableGroup() ;
+      }
+      CTimer::get("XIOS").suspend() ;
+   }