Changeset 981

Timestamp:

10/24/16 16:16:51 (7 years ago)

Author:

mhnguyen

Message:

Fortran interfaces:

+) Adding Fortran interfaces of transformation

Test
+) Only complilation on Curie

Location:

XIOS/trunk/src

Files:

• generate_fortran_interface.cpp (modified) (6 diffs)
• interface/c/icexpand_domain.cpp (copied) (copied from XIOS/trunk/src/interface/c/icreduce_axis_to_scalar.cpp) (3 diffs)
• interface/c/icextract_to_axis.cpp (moved) (moved from XIOS/trunk/src/interface/c/icreduce_axis_to_scalar.cpp) (3 diffs)
• interface/c/icextract_to_scalar.cpp (copied) (copied from XIOS/trunk/src/interface/c/icreduce_axis_to_scalar.cpp) (3 diffs)
• interface/c/icreduce_to_axis.cpp (copied) (copied from XIOS/trunk/src/interface/c/icreduce_axis_to_scalar.cpp) (3 diffs)
• interface/c/icreduce_to_scalar.cpp (copied) (copied from XIOS/trunk/src/interface/c/icreduce_axis_to_scalar.cpp) (3 diffs)
• interface/c/icxml_tree.cpp (modified) (6 diffs)
• interface/c_attr/icexpand_domain_attr.cpp (added)
• interface/c_attr/icextract_axis_to_scalar_attr.cpp (added)
• interface/c_attr/icextract_domain_to_axis_attr.cpp (added)
• interface/c_attr/icreduce_domain_to_axis_attr.cpp (added)
• interface/c_attr/icreduce_domain_to_scalar_attr.cpp (added)
• interface/fortran/expand_domain_interface.f90 (added)
• interface/fortran/extract_axis_to_scalar_interface.f90 (added)
• interface/fortran/extract_domain_to_axis_interface.f90 (added)
• interface/fortran/iexpand_domain.F90 (added)
• interface/fortran/iextract_axis_to_scalar.F90 (added)
• interface/fortran/iextract_domain_to_axis.F90 (added)
• interface/fortran/ireduce_domain_to_axis.F90 (added)
• interface/fortran/ireduce_domain_to_scalar.F90 (added)
• interface/fortran/ixios.F90 (modified) (4 diffs)
• interface/fortran/ixios_interfaces.F90 (modified) (10 diffs)
• interface/fortran/ixml_tree.F90 (modified) (9 diffs)
• interface/fortran/reduce_domain_to_axis_interface.f90 (added)
• interface/fortran/reduce_domain_to_scalar_interface.f90 (added)
• interface/fortran_attr/expand_domain_interface_attr.F90 (added)
• interface/fortran_attr/extract_axis_to_scalar_interface_attr.F90 (added)
• interface/fortran_attr/extract_domain_to_axis_interface_attr.F90 (added)
• interface/fortran_attr/iexpand_domain_attr.F90 (added)
• interface/fortran_attr/iextract_axis_to_scalar_attr.F90 (added)
• interface/fortran_attr/iextract_domain_to_axis_attr.F90 (added)
• interface/fortran_attr/ireduce_domain_to_axis_attr.F90 (added)
• interface/fortran_attr/ireduce_domain_to_scalar_attr.F90 (added)
• interface/fortran_attr/reduce_domain_to_axis_interface_attr.F90 (added)
• interface/fortran_attr/reduce_domain_to_scalar_interface_attr.F90 (added)

XIOS/trunk/src/generate_fortran_interface.cpp

@@ -34 +34 @@
   CGenerateRectilinearDomain genDomain;
   CComputeConnectivityDomain compConDomain;
+  CExpandDomain expandDomain;
 
   CInterpolateAxis interpolateAxis;
   CZoomAxis zoomAxis;
   CInverseAxis inverseAxis;
+  CReduceDomainToAxis reduceDomainToAxis;
+  CExtractDomainToAxis extractDomainToAxis;
 
   CReduceAxisToScalar reduceAxisToScalar;
+  CExtractAxisToScalar extractAxisToScalar;
+  CReduceDomainToScalar reduceDomainToScalar;
 
   ostringstream oss;
@@ -231 +236 @@
   file.close();
 
+  /*!
+    Domain transformations
+  */
   file.open((path+"zoom_domain_interface_attr.F90").c_str());
   zoomDomain.generateFortran2003Interface(file);
@@ -243 +251 @@
   file.close();
 
+  file.open((path+"interpolate_domain_interface_attr.F90").c_str());
+  interpolateDomain.generateFortran2003Interface(file);
+  file.close();
+
+  file.open((path+"icinterpolate_domain_attr.cpp").c_str());
+  interpolateDomain.generateCInterface(file);
+  file.close();
+
+  file.open((path+"iinterpolate_domain_attr.F90").c_str());
+  interpolateDomain.generateFortranInterface(file);
+  file.close();
+
+  file.open((path+"generate_rectilinear_domain_interface_attr.F90").c_str());
+  genDomain.generateFortran2003Interface(file);
+  file.close();
+
+  file.open((path+"icgenerate_rectilinear_domain_attr.cpp").c_str());
+  genDomain.generateCInterface(file);
+  file.close();
+
+  file.open((path+"igenerate_rectilinear_domain_attr.F90").c_str());
+  genDomain.generateFortranInterface(file);
+  file.close();
+
+  file.open((path+"compute_connectivity_domain_interface_attr.F90").c_str());
+  compConDomain.generateFortran2003Interface(file);
+  file.close();
+
+  file.open((path+"iccompute_connectivity_domain_attr.cpp").c_str());
+  compConDomain.generateCInterface(file);
+  file.close();
+
+  file.open((path+"icompute_connectivity_domain_attr.F90").c_str());
+  compConDomain.generateFortranInterface(file);
+  file.close();
+
+  file.open((path+"expand_domain_interface_attr.F90").c_str());
+  expandDomain.generateFortran2003Interface(file);
+  file.close();
+
+  file.open((path+"icexpand_domain_attr.cpp").c_str());
+  expandDomain.generateCInterface(file);
+  file.close();
+
+  file.open((path+"iexpand_domain_attr.F90").c_str());
+  expandDomain.generateFortranInterface(file);
+  file.close();
+  
+  /*!
+    Axis transformations
+  */
   file.open((path+"zoom_axis_interface_attr.F90").c_str());
   zoomAxis.generateFortran2003Interface(file);
@@ -267 +326 @@
   file.close();
 
-  file.open((path+"interpolate_domain_interface_attr.F90").c_str());
-  interpolateDomain.generateFortran2003Interface(file);
-  file.close();
-
-  file.open((path+"icinterpolate_domain_attr.cpp").c_str());
-  interpolateDomain.generateCInterface(file);
-  file.close();
-
-  file.open((path+"iinterpolate_domain_attr.F90").c_str());
-  interpolateDomain.generateFortranInterface(file);
-  file.close();
-
-  file.open((path+"generate_rectilinear_domain_interface_attr.F90").c_str());
-  genDomain.generateFortran2003Interface(file);
-  file.close();
-
-  file.open((path+"icgenerate_rectilinear_domain_attr.cpp").c_str());
-  genDomain.generateCInterface(file);
-  file.close();
-
-  file.open((path+"igenerate_rectilinear_domain_attr.F90").c_str());
-  genDomain.generateFortranInterface(file);
-  file.close();
-
-  file.open((path+"compute_connectivity_domain_interface_attr.F90").c_str());
-  compConDomain.generateFortran2003Interface(file);
-  file.close();
-
-  file.open((path+"iccompute_connectivity_domain_attr.cpp").c_str());
-  compConDomain.generateCInterface(file);
-  file.close();
-
-  file.open((path+"icompute_connectivity_domain_attr.F90").c_str());
-  compConDomain.generateFortranInterface(file);
-  file.close();
-
-
-
-
   file.open((path+"inverse_axis_interface_attr.F90").c_str());
   inverseAxis.generateFortran2003Interface(file);
@@ -318 +338 @@
   file.close();
 
+  file.open((path+"reduce_domain_to_axis_interface_attr.F90").c_str());
+  reduceDomainToAxis.generateFortran2003Interface(file);
+  file.close();
+
+  file.open((path+"icreduce_domain_to_axis_attr.cpp").c_str());
+  reduceDomainToAxis.generateCInterface(file);
+  file.close();
+
+  file.open((path+"ireduce_domain_to_axis_attr.F90").c_str());
+  reduceDomainToAxis.generateFortranInterface(file);
+  file.close();
+  
+  file.open((path+"extract_domain_to_axis_interface_attr.F90").c_str());
+  extractDomainToAxis.generateFortran2003Interface(file);
+  file.close();
+
+  file.open((path+"icextract_domain_to_axis_attr.cpp").c_str());
+  extractDomainToAxis.generateCInterface(file);
+  file.close();
+
+  file.open((path+"iextract_domain_to_axis_attr.F90").c_str());
+  extractDomainToAxis.generateFortranInterface(file);
+  file.close();
+
+
+  /*!
+    Scalar transformations
+  */
   file.open((path+"reduce_axis_to_scalar_interface_attr.F90").c_str());
   reduceAxisToScalar.generateFortran2003Interface(file);
@@ -330 +378 @@
   file.close();
 
+  file.open((path+"extract_axis_to_scalar_interface_attr.F90").c_str());
+  extractAxisToScalar.generateFortran2003Interface(file);
+  file.close();
+
+  file.open((path+"icextract_axis_to_scalar_attr.cpp").c_str());
+  extractAxisToScalar.generateCInterface(file);
+  file.close();
+
+  file.open((path+"iextract_axis_to_scalar_attr.F90").c_str());
+  extractAxisToScalar.generateFortranInterface(file);
+  file.close();
+
+  file.open((path+"reduce_domain_to_scalar_interface_attr.F90").c_str());
+  reduceDomainToScalar.generateFortran2003Interface(file);
+  file.close();
+
+  file.open((path+"icreduce_domain_to_scalar_attr.cpp").c_str());
+  reduceDomainToScalar.generateCInterface(file);
+  file.close();
+
+  file.open((path+"ireduce_domain_to_scalar_attr.F90").c_str());
+  reduceDomainToScalar.generateFortranInterface(file);
+  file.close();
+
   file.open((path+"context_interface_attr.F90").c_str());
   context->generateFortran2003Interface(file);

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

@@ -14 +14 @@
 #include "icutil.hpp"
 #include "timer.hpp"
-#include "reduce_axis_to_scalar.hpp"
+#include "expand_domain.hpp"
 
 extern "C"
@@ -22 +22 @@
    // ----------------------- Redéfinition de types ----------------------------
 
-   typedef xios::CReduceAxisToScalar      * XReduceAxisToScalarPtr;
+   typedef xios::CExpandDomain   * XExpandDomainPtr;
 
    // ------------------------ Création des handle -----------------------------
-   void cxios_reduce_axis_to_scalar_handle_create(XReduceAxisToScalarPtr * _ret, const char * _id, int _id_len)
+   void cxios_expand_domain_handle_create(XExpandDomainPtr * _ret, const char * _id, int _id_len)
    {
       std::string id;
       if (!cstr2string(_id, _id_len, id)) return;
       CTimer::get("XIOS").resume() ;
-      *_ret = xios::CReduceAxisToScalar::get(id);
+      *_ret = xios::CExpandDomain::get(id);
       CTimer::get("XIOS").suspend() ;
    }
 
    // -------------------- Vérification des identifiants -----------------------
-   void cxios_reduce_axis_to_scalar_valid_id(bool * _ret, const char * _id, int _id_len)
+   void cxios_expand_domain_valid_id(bool * _ret, const char * _id, int _id_len)
    {
       std::string id;
@@ -41 +41 @@
 
       CTimer::get("XIOS").resume() ;
-      *_ret = xios::CReduceAxisToScalar::has(id);
+      *_ret = xios::CExpandDomain::has(id);
       CTimer::get("XIOS").suspend() ;
    }

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

@@ -14 +14 @@
 #include "icutil.hpp"
 #include "timer.hpp"
-#include "reduce_axis_to_scalar.hpp"
+#include "extract_domain_to_axis.hpp"
 
 extern "C"
@@ -22 +22 @@
    // ----------------------- Redéfinition de types ----------------------------
 
-   typedef xios::CReduceAxisToScalar      * XReduceAxisToScalarPtr;
-
+   typedef xios::CExtractDomainToAxis      * XExtractDomainToAxisPtr;
+   
    // ------------------------ Création des handle -----------------------------
-   void cxios_reduce_axis_to_scalar_handle_create(XReduceAxisToScalarPtr * _ret, const char * _id, int _id_len)
+   void cxios_extract_domain_to_axis_handle_create(XExtractDomainToAxisPtr * _ret, const char * _id, int _id_len)
    {
       std::string id;
       if (!cstr2string(_id, _id_len, id)) return;
       CTimer::get("XIOS").resume() ;
-      *_ret = xios::CReduceAxisToScalar::get(id);
+      *_ret = xios::CExtractDomainToAxis::get(id);
       CTimer::get("XIOS").suspend() ;
    }
 
    // -------------------- Vérification des identifiants -----------------------
-   void cxios_reduce_axis_to_scalar_valid_id(bool * _ret, const char * _id, int _id_len)
+   void cxios_extract_domain_to_axis_valid_id(bool * _ret, const char * _id, int _id_len)
    {
       std::string id;
@@ -41 +41 @@
 
       CTimer::get("XIOS").resume() ;
-      *_ret = xios::CReduceAxisToScalar::has(id);
+      *_ret = xios::CExtractDomainToAxis::has(id);
       CTimer::get("XIOS").suspend() ;
    }
+
 } // extern "C"

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

@@ -14 +14 @@
 #include "icutil.hpp"
 #include "timer.hpp"
-#include "reduce_axis_to_scalar.hpp"
+#include "extract_axis_to_scalar.hpp"
 
 extern "C"
@@ -22 +22 @@
    // ----------------------- Redéfinition de types ----------------------------
 
-   typedef xios::CReduceAxisToScalar      * XReduceAxisToScalarPtr;
-
+   typedef xios::CExtractAxisToScalar      * XExtractAxisToScalarPtr;
+   
    // ------------------------ Création des handle -----------------------------
-   void cxios_reduce_axis_to_scalar_handle_create(XReduceAxisToScalarPtr * _ret, const char * _id, int _id_len)
+   void cxios_extract_axis_to_scalar_handle_create(XExtractAxisToScalarPtr * _ret, const char * _id, int _id_len)
    {
       std::string id;
       if (!cstr2string(_id, _id_len, id)) return;
       CTimer::get("XIOS").resume() ;
-      *_ret = xios::CReduceAxisToScalar::get(id);
+      *_ret = xios::CExtractAxisToScalar::get(id);
       CTimer::get("XIOS").suspend() ;
    }
 
    // -------------------- Vérification des identifiants -----------------------
-   void cxios_reduce_axis_to_scalar_valid_id(bool * _ret, const char * _id, int _id_len)
+   void cxios_extract_axis_to_scalar_valid_id(bool * _ret, const char * _id, int _id_len)
    {
       std::string id;
@@ -41 +41 @@
 
       CTimer::get("XIOS").resume() ;
-      *_ret = xios::CReduceAxisToScalar::has(id);
+      *_ret = xios::CExtractAxisToScalar::has(id);
       CTimer::get("XIOS").suspend() ;
    }
+
 } // extern "C"

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

@@ -14 +14 @@
 #include "icutil.hpp"
 #include "timer.hpp"
-#include "reduce_axis_to_scalar.hpp"
+#include "reduce_domain_to_axis.hpp"
 
 extern "C"
@@ -22 +22 @@
    // ----------------------- Redéfinition de types ----------------------------
 
-   typedef xios::CReduceAxisToScalar      * XReduceAxisToScalarPtr;
-
+   typedef xios::CReduceDomainToAxis      * XReduceDomainToAxisPtr;
+   
    // ------------------------ Création des handle -----------------------------
-   void cxios_reduce_axis_to_scalar_handle_create(XReduceAxisToScalarPtr * _ret, const char * _id, int _id_len)
+   void cxios_reduce_domain_to_axis_handle_create(XReduceDomainToAxisPtr * _ret, const char * _id, int _id_len)
    {
       std::string id;
       if (!cstr2string(_id, _id_len, id)) return;
       CTimer::get("XIOS").resume() ;
-      *_ret = xios::CReduceAxisToScalar::get(id);
+      *_ret = xios::CReduceDomainToAxis::get(id);
       CTimer::get("XIOS").suspend() ;
    }
 
    // -------------------- Vérification des identifiants -----------------------
-   void cxios_reduce_axis_to_scalar_valid_id(bool * _ret, const char * _id, int _id_len)
+   void cxios_reduce_domain_to_axis_valid_id(bool * _ret, const char * _id, int _id_len)
    {
       std::string id;
@@ -41 +41 @@
 
       CTimer::get("XIOS").resume() ;
-      *_ret = xios::CReduceAxisToScalar::has(id);
+      *_ret = xios::CReduceDomainToAxis::has(id);
       CTimer::get("XIOS").suspend() ;
    }
+
 } // extern "C"

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

@@ -15 +15 @@
 #include "timer.hpp"
 #include "reduce_axis_to_scalar.hpp"
+#include "reduce_domain_to_scalar.hpp"
 
 extern "C"
@@ -23 +24 @@
 
    typedef xios::CReduceAxisToScalar      * XReduceAxisToScalarPtr;
+   typedef xios::CReduceDomainToScalar    * XReduceDomainToScalarPtr;
 
    // ------------------------ Création des handle -----------------------------
@@ -44 +46 @@
       CTimer::get("XIOS").suspend() ;
    }
+
+   void cxios_reduce_domain_to_scalar_handle_create(XReduceDomainToScalarPtr * _ret, const char * _id, int _id_len)
+   {
+      std::string id;
+      if (!cstr2string(_id, _id_len, id)) return;
+      CTimer::get("XIOS").resume() ;
+      *_ret = xios::CReduceDomainToScalar::get(id);
+      CTimer::get("XIOS").suspend() ;
+   }
+
+   // -------------------- Vérification des identifiants -----------------------
+   void cxios_reduce_domain_to_scalar_valid_id(bool * _ret, const char * _id, int _id_len)
+   {
+      std::string id;
+      if (!cstr2string(_id, _id_len, id)) return;
+
+      CTimer::get("XIOS").resume() ;
+      *_ret = xios::CReduceDomainToScalar::has(id);
+      CTimer::get("XIOS").suspend() ;
+   }
+
 } // extern "C"

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

@@ -51 +51 @@
    typedef xios::CGenerateRectilinearDomain *  XGenerateRectilinearDomainPtr;
    typedef xios::CComputeConnectivityDomain *  XComputeConnectivityDomainPtr;
-
-   typedef xios::CTransformation<CAxis>   *  XTransformationAxisPtr;
-   typedef xios::CZoomAxis                *  XZoomAxisPtr;
-   typedef xios::CInterpolateAxis         *  XInterpolateAxisPtr;
-   typedef xios::CInverseAxis             *  XInverseAxisPtr;
+   typedef xios::CExpandDomain              *  XExpandDomainPtr;
+
+   typedef xios::CTransformation<CAxis>     *  XTransformationAxisPtr;
+   typedef xios::CZoomAxis                  *  XZoomAxisPtr;
+   typedef xios::CInterpolateAxis           *  XInterpolateAxisPtr;
+   typedef xios::CInverseAxis               *  XInverseAxisPtr;
+   typedef xios::CExtractDomainToAxis       *  XExtractDomainToAxisPtr;
+   typedef xios::CReduceDomainToAxis        *  XReduceDomainToAxisPtr;
 
    typedef xios::CTransformation<CScalar>   *  XTransformationScalarPtr;
    typedef xios::CReduceAxisToScalar        *  XReduceAxisToScalarPtr;
+   typedef xios::CReduceDomainToScalar      *  XReduceDomainToScalarPtr;
+   typedef xios::CExtractAxisToScalar       *  XExtractAxisToScalarPtr;
+
 
    // ----------------------- Ajout d'enfant à un parent -----------------------
@@ -402 +408 @@
    }
 
+   //---------------------------------------------------------------------------
+   //-------------------------Transformations -----------------------------------
+   //---------------------------------------------------------------------------
    void cxios_xml_tree_add_zoomdomaintodomain
       (XDomainPtr parent_, XZoomDomainPtr * child_, const char * child_id, int child_id_size)
@@ -464 +473 @@
       if (cstr2string(child_id, child_id_size, child_id_str))
       {
+         tmpChild_ = parent_->addTransformation(TRANS_EXPAND_DOMAIN, child_id_str);
+      }
+      else
+      {
+         tmpChild_ = parent_->addTransformation(TRANS_EXPAND_DOMAIN);
+      }
+      *child_ = static_cast<XComputeConnectivityDomainPtr>(tmpChild_);
+      CTimer::get("XIOS").suspend() ;
+   }
+
+   void cxios_xml_tree_add_expanddomaintodomain
+      (XDomainPtr parent_, XExpandDomainPtr * child_, const char * child_id, int child_id_size)
+   {
+      std::string child_id_str;
+      XTransformationDomainPtr tmpChild_;
+      CTimer::get("XIOS").resume() ;
+      if (cstr2string(child_id, child_id_size, child_id_str))
+      {
          tmpChild_ = parent_->addTransformation(TRANS_COMPUTE_CONNECTIVITY_DOMAIN, child_id_str);
       }
@@ -470 +497 @@
          tmpChild_ = parent_->addTransformation(TRANS_COMPUTE_CONNECTIVITY_DOMAIN);
       }
-      *child_ = static_cast<XComputeConnectivityDomainPtr>(tmpChild_);
-      CTimer::get("XIOS").suspend() ;
-   }
-
+      *child_ = static_cast<XExpandDomainPtr>(tmpChild_);
+      CTimer::get("XIOS").suspend() ;
+   }
+
+   // -----------------------Axis transformation--------------------------------
    void cxios_xml_tree_add_zoomaxistoaxis
       (XAxisPtr parent_, XZoomAxisPtr * child_, const char * child_id, int child_id_size)
@@ -528 +556 @@
    }
 
+   void cxios_xml_tree_add_extractdomaintoaxistoaxis
+      (XAxisPtr parent_, XExtractDomainToAxisPtr * child_, const char * child_id, int child_id_size)
+   {
+      std::string child_id_str;
+      XTransformationAxisPtr tmpChild_;
+      CTimer::get("XIOS").resume() ;
+      if (cstr2string(child_id, child_id_size, child_id_str))
+      {
+         tmpChild_ = parent_->addTransformation(TRANS_EXTRACT_DOMAIN_TO_AXIS, child_id_str);
+      }
+      else
+      {
+         tmpChild_ = parent_->addTransformation(TRANS_EXTRACT_DOMAIN_TO_AXIS);
+      }
+      *child_ = static_cast<XExtractDomainToAxisPtr>(tmpChild_);
+      CTimer::get("XIOS").suspend() ;
+   }
+
+   void cxios_xml_tree_add_reducedomaintoaxistoaxis
+      (XAxisPtr parent_, XReduceDomainToAxisPtr * child_, const char * child_id, int child_id_size)
+   {
+      std::string child_id_str;
+      XTransformationAxisPtr tmpChild_;
+      CTimer::get("XIOS").resume() ;
+      if (cstr2string(child_id, child_id_size, child_id_str))
+      {
+         tmpChild_ = parent_->addTransformation(TRANS_REDUCE_DOMAIN_TO_AXIS, child_id_str);
+      }
+      else
+      {
+         tmpChild_ = parent_->addTransformation(TRANS_REDUCE_DOMAIN_TO_AXIS);
+      }
+      *child_ = static_cast<XReduceDomainToAxisPtr>(tmpChild_);
+      CTimer::get("XIOS").suspend() ;
+   }
+
+
    void cxios_xml_tree_add_reduceaxistoscalartoscalar
       (XScalarPtr parent_, XReduceAxisToScalarPtr * child_, const char * child_id, int child_id_size)
@@ -543 +608 @@
       }
       *child_ = static_cast<XReduceAxisToScalarPtr>(tmpChild_);
+      CTimer::get("XIOS").suspend() ;
+   }
+
+   void cxios_xml_tree_add_reducedomaintoscalartoscalar
+      (XScalarPtr parent_, XReduceDomainToScalarPtr * child_, const char * child_id, int child_id_size)
+   {
+      std::string child_id_str;
+      XTransformationScalarPtr tmpChild_;
+      CTimer::get("XIOS").resume() ;
+      if (cstr2string(child_id, child_id_size, child_id_str))
+      {
+         tmpChild_ = parent_->addTransformation(TRANS_REDUCE_DOMAIN_TO_SCALAR, child_id_str);
+      }
+      else
+      {
+         tmpChild_ = parent_->addTransformation(TRANS_REDUCE_DOMAIN_TO_SCALAR);
+      }
+      *child_ = static_cast<XReduceDomainToScalarPtr>(tmpChild_);
+      CTimer::get("XIOS").suspend() ;
+   }
+
+   void cxios_xml_tree_add_extractaxistoscalartoscalar
+      (XScalarPtr parent_, XExtractAxisToScalarPtr * child_, const char * child_id, int child_id_size)
+   {
+      std::string child_id_str;
+      XTransformationScalarPtr tmpChild_;
+      CTimer::get("XIOS").resume() ;
+      if (cstr2string(child_id, child_id_size, child_id_str))
+      {
+         tmpChild_ = parent_->addTransformation(TRANS_EXTRACT_AXIS_TO_SCALAR, child_id_str);
+      }
+      else
+      {
+         tmpChild_ = parent_->addTransformation(TRANS_EXTRACT_AXIS_TO_SCALAR);
+      }
+      *child_ = static_cast<XExtractAxisToScalarPtr>(tmpChild_);
       CTimer::get("XIOS").suspend() ;
    }

XIOS/trunk/src/interface/fortran/ixios.F90

@@ -74 +74 @@
 USE iscalargroup_attr, ONLY : xios(set_scalargroup_attr), xios(get_scalargroup_attr), xios(is_defined_scalargroup_attr)
 
-USE izoom_axis, ONLY : txios(zoom_axis), xios(is_valid_zoom_axis)
-
-USE izoom_axis_attr, ONLY : xios(set_zoom_axis_attr), xios(get_zoom_axis_attr), xios(is_defined_zoom_axis_attr)
-
+!-------------------------------------------------------------------------------
+!!! Transformation INTERFACES
+!-------------------------------------------------------------------------------
+!!! DOMAIN TRANSFORMATIONS
 USE izoom_domain, ONLY : txios(zoom_domain), xios(is_valid_zoom_domain)
 
 USE izoom_domain_attr, ONLY : xios(set_zoom_domain_attr), xios(get_zoom_domain_attr), xios(is_defined_zoom_domain_attr)
-
-USE iinterpolate_axis, ONLY : txios(interpolate_axis), xios(is_valid_interpolate_axis)
-
-USE iinterpolate_axis_attr, ONLY : xios(set_interpolate_axis_attr), xios(get_interpolate_axis_attr), &
-                                   xios(is_defined_interpolate_axis_attr)
 
 USE iinterpolate_domain, ONLY : txios(interpolate_domain), xios(is_valid_interpolate_domain)
@@ -92 +87 @@
                                      xios(is_defined_interpolate_domain_attr)
 
-USE iinverse_axis, ONLY : txios(inverse_axis), xios(is_valid_inverse_axis)
-
-USE iinverse_axis_attr, ONLY : xios(set_inverse_axis_attr), xios(get_inverse_axis_attr), xios(is_defined_inverse_axis_attr)
-
 USE igenerate_rectilinear_domain, ONLY : txios(generate_rectilinear_domain), xios(is_valid_generate_rectilinear_domain)
 
@@ -101 +92 @@
                                               xios(get_generate_rectilinear_domain_attr), &
                                               xios(is_defined_generate_rectilinear_domain_attr)
-USE ireduce_axis_to_scalar, ONLY : txios(reduce_axis_to_scalar), xios(is_valid_reduce_axis_to_scalar)
-
-USE ireduce_axis_to_scalar_attr, ONLY : xios(set_reduce_axis_to_scalar_attr), xios(get_reduce_axis_to_scalar_attr), &
-                                        xios(is_defined_reduce_axis_to_scalar_attr)
 
 USE icompute_connectivity_domain, ONLY : txios(compute_connectivity_domain), xios(is_valid_compute_connectivity_domain)
@@ -112 +99 @@
                                               xios(is_defined_compute_connectivity_domain_attr)
 
+USE iexpand_domain, ONLY : txios(expand_domain), xios(is_valid_expand_domain)
+
+USE iexpand_domain_attr, ONLY : xios(set_expand_domain_attr), &
+                                xios(get_expand_domain_attr), &
+                                xios(is_defined_expand_domain_attr)
+
+!!! AXIS TRANSFORMATIONS
+USE izoom_axis, ONLY : txios(zoom_axis), xios(is_valid_zoom_axis)
+
+USE izoom_axis_attr, ONLY : xios(set_zoom_axis_attr), xios(get_zoom_axis_attr), xios(is_defined_zoom_axis_attr)
+
+
+USE iinterpolate_axis, ONLY : txios(interpolate_axis), xios(is_valid_interpolate_axis)
+
+USE iinterpolate_axis_attr, ONLY : xios(set_interpolate_axis_attr), xios(get_interpolate_axis_attr), &
+                                   xios(is_defined_interpolate_axis_attr)
+
+USE iinverse_axis, ONLY : txios(inverse_axis), xios(is_valid_inverse_axis)
+
+USE iinverse_axis_attr, ONLY : xios(set_inverse_axis_attr), xios(get_inverse_axis_attr), xios(is_defined_inverse_axis_attr)
+
+USE ireduce_domain_to_axis, ONLY : txios(reduce_domain_to_axis), xios(is_valid_reduce_domain_to_axis)
+
+USE ireduce_domain_to_axis_attr, ONLY : xios(set_reduce_domain_to_axis_attr), &
+                                        xios(get_reduce_domain_to_axis_attr), &
+                                        xios(is_defined_reduce_domain_to_axis_attr)
+
+USE iextract_domain_to_axis, ONLY : txios(extract_domain_to_axis), xios(is_valid_extract_domain_to_axis)
+
+USE iextract_domain_to_axis_attr, ONLY : xios(set_extract_domain_to_axis_attr), &
+                                         xios(get_extract_domain_to_axis_attr), &
+                                         xios(is_defined_extract_domain_to_axis_attr)
+
+!!! SCALAR TRANSFORMATIONS
+USE ireduce_domain_to_scalar, ONLY : txios(reduce_domain_to_scalar), xios(is_valid_reduce_domain_to_scalar)
+
+USE ireduce_domain_to_scalar_attr, ONLY : xios(set_reduce_domain_to_scalar_attr), xios(get_reduce_domain_to_scalar_attr), &
+                                          xios(is_defined_reduce_domain_to_scalar_attr)
+
+USE ireduce_axis_to_scalar, ONLY : txios(reduce_axis_to_scalar), xios(is_valid_reduce_axis_to_scalar)
+
+USE ireduce_axis_to_scalar_attr, ONLY : xios(set_reduce_axis_to_scalar_attr), xios(get_reduce_axis_to_scalar_attr), &
+                                        xios(is_defined_reduce_axis_to_scalar_attr)
+
+USE iextract_axis_to_scalar, ONLY : txios(extract_axis_to_scalar), xios(is_valid_extract_axis_to_scalar)
+
+USE iextract_axis_to_scalar_attr, ONLY : xios(set_extract_axis_to_scalar_attr), &
+                                         xios(get_extract_axis_to_scalar_attr), &
+                                         xios(is_defined_extract_axis_to_scalar_attr)
+
 USE XIOS_INTERFACES, ONLY : xios(set_attr), xios(get_attr), xios(is_defined_attr), xios(get_handle), xios(add_child), &
                             xios(send_field), xios(recv_field), xios(field_is_active), xios(getVar), xios(setVar), &

XIOS/trunk/src/interface/fortran/ixios_interfaces.F90

@@ -63 +63 @@
 USE iscalargroup_attr, ONLY : xios(set_scalargroup_attr_hdl), xios(get_scalargroup_attr_hdl), xios(is_defined_scalargroup_attr_hdl)
 
-USE izoom_axis, ONLY : xios(get_zoom_axis_handle)
-
-USE izoom_axis_attr, ONLY : xios(set_zoom_axis_attr_hdl), xios(get_zoom_axis_attr_hdl), xios(is_defined_zoom_axis_attr_hdl)
-
+!-------------------------------------------------------------------------------
+!!! Transformation INTERFACES
+!-------------------------------------------------------------------------------
+!!! DOMAIN TRANSFORMATIONS
 USE izoom_domain, ONLY : xios(get_zoom_domain_handle)
 
 USE izoom_domain_attr, ONLY : xios(set_zoom_domain_attr_hdl), xios(get_zoom_domain_attr_hdl), xios(is_defined_zoom_domain_attr_hdl)
-
-USE iinterpolate_axis, ONLY : xios(get_interpolate_axis_handle)
-
-USE iinterpolate_axis_attr, ONLY : xios(set_interpolate_axis_attr_hdl), xios(get_interpolate_axis_attr_hdl), &
-                                   xios(is_defined_interpolate_axis_attr_hdl)
 
 USE iinterpolate_domain, ONLY : xios(get_interpolate_domain_handle)
@@ -80 +75 @@
 USE iinterpolate_domain_attr, ONLY : xios(set_interpolate_domain_attr_hdl), xios(get_interpolate_domain_attr_hdl), &
                                      xios(is_defined_interpolate_domain_attr_hdl)
-
-USE iinverse_axis, ONLY : xios(get_inverse_axis_handle)
-
-USE iinverse_axis_attr, ONLY : xios(set_inverse_axis_attr_hdl), xios(get_inverse_axis_attr_hdl), xios(is_defined_inverse_axis_attr_hdl)
 
 USE igenerate_rectilinear_domain, ONLY : xios(get_generate_rectilinear_domain_handle)
@@ -90 +81 @@
                                               xios(get_generate_rectilinear_domain_attr_hdl), &
                                               xios(is_defined_generate_rectilinear_domain_attr_hdl)
+
 USE icompute_connectivity_domain, ONLY : xios(get_compute_connectivity_domain_handle)
 
@@ -96 +88 @@
                                               xios(is_defined_compute_connectivity_domain_attr_hdl)
 
+USE iexpand_domain, ONLY : xios(get_expand_domain_handle)
+
+USE iexpand_domain_attr, ONLY : xios(set_expand_domain_attr_hdl), &
+                                xios(get_expand_domain_attr_hdl), &
+                                xios(is_defined_expand_domain_attr_hdl)
+
+!!! AXIS TRANSFORMATIONS
+USE izoom_axis, ONLY : xios(get_zoom_axis_handle)
+
+USE izoom_axis_attr, ONLY : xios(set_zoom_axis_attr_hdl), xios(get_zoom_axis_attr_hdl), xios(is_defined_zoom_axis_attr_hdl)
+
+USE iinterpolate_axis, ONLY : xios(get_interpolate_axis_handle)
+
+USE iinterpolate_axis_attr, ONLY : xios(set_interpolate_axis_attr_hdl), &
+                                   xios(get_interpolate_axis_attr_hdl), &
+                                   xios(is_defined_interpolate_axis_attr_hdl)
+
+USE iinverse_axis, ONLY : xios(get_inverse_axis_handle)
+
+USE iinverse_axis_attr, ONLY : xios(set_inverse_axis_attr_hdl), &
+                               xios(get_inverse_axis_attr_hdl), &
+                               xios(is_defined_inverse_axis_attr_hdl)
+
+USE ireduce_domain_to_axis, ONLY : xios(get_reduce_domain_to_axis_handle)
+
+USE ireduce_domain_to_axis_attr, ONLY : xios(set_reduce_domain_to_axis_attr_hdl), &
+                                        xios(get_reduce_domain_to_axis_attr_hdl), &
+                                        xios(is_defined_reduce_domain_to_axis_attr_hdl)
+
+USE iextract_domain_to_axis, ONLY : xios(get_extract_domain_to_axis_handle)
+
+USE iextract_domain_to_axis_attr, ONLY : xios(set_extract_domain_to_axis_attr_hdl), &
+                                         xios(get_extract_domain_to_axis_attr_hdl), &
+                                         xios(is_defined_extract_domain_to_axis_attr_hdl)
+
+!!! SCALAR TRANSFORMATIONS
+
+
 USE ireduce_axis_to_scalar, ONLY : xios(get_reduce_axis_to_scalar_handle)
 
@@ -101 +131 @@
                                         xios(get_reduce_axis_to_scalar_attr_hdl), &
                                         xios(is_defined_reduce_axis_to_scalar_attr_hdl)
+
+USE ireduce_domain_to_scalar, ONLY : xios(get_reduce_domain_to_scalar_handle)
+
+USE ireduce_domain_to_scalar_attr, ONLY : xios(set_reduce_domain_to_scalar_attr_hdl), &
+                                          xios(get_reduce_domain_to_scalar_attr_hdl), &
+                                          xios(is_defined_reduce_domain_to_scalar_attr_hdl)
+
+USE iextract_axis_to_scalar, ONLY : xios(get_extract_axis_to_scalar_handle)
+
+USE iextract_axis_to_scalar_attr, ONLY : xios(set_extract_axis_to_scalar_attr_hdl), &
+                                         xios(get_extract_axis_to_scalar_attr_hdl), &
+                                         xios(is_defined_extract_axis_to_scalar_attr_hdl)
 
 USE ixml_tree, ONLY : xios(add_axis), xios(add_file), xios(add_grid), xios(add_field), xios(add_domain),   &
@@ -111 +153 @@
                       xios(add_interpolateaxistoaxis), xios(add_inverseaxistoaxis), xios(add_scalar),      &
                       xios(add_scalargroup), xios(add_scalartogrid), xios(add_reduceaxistoscalartoscalar), &
-                      xios(add_computeconnectivitydomaintodomain)
+                      xios(add_computeconnectivitydomaintodomain), xios(add_reducedomaintoaxistoaxis),     &
+                      xios(add_extractdomaintoaxistoaxis), xios(add_reducedomaintoscalartoscalar),         &
+                      xios(add_extractaxistoscalartoscalar), xios(add_expanddomaintodomain)
 
 PRIVATE
@@ -125 +169 @@
                    xios(set_generate_rectilinear_domain_attr_hdl), xios(set_scalar_attr_hdl),                &
                    xios(set_scalargroup_attr_hdl), xios(set_reduce_axis_to_scalar_attr_hdl),                 &
-                   xios(set_compute_connectivity_domain_attr_hdl)
+                   xios(set_compute_connectivity_domain_attr_hdl), xios(set_reduce_domain_to_scalar_attr_hdl), &
+                   xios(set_reduce_domain_to_axis_attr_hdl), xios(set_extract_domain_to_axis_attr_hdl),        &
+                   xios(set_extract_axis_to_scalar_attr_hdl), xios(set_expand_domain_attr_hdl)
 END INTERFACE xios(set_attr)
+
 
 INTERFACE xios(get_attr)
@@ -138 +185 @@
                    xios(get_generate_rectilinear_domain_attr_hdl), xios(get_scalar_attr_hdl),                &
                    xios(get_scalargroup_attr_hdl), xios(get_reduce_axis_to_scalar_attr_hdl),                 &
-                   xios(get_compute_connectivity_domain_attr_hdl)
+                   xios(get_compute_connectivity_domain_attr_hdl), xios(get_reduce_domain_to_scalar_attr_hdl), &
+                   xios(get_reduce_domain_to_axis_attr_hdl), xios(get_extract_domain_to_axis_attr_hdl),        &
+                   xios(get_extract_axis_to_scalar_attr_hdl), xios(get_expand_domain_attr_hdl)
 END INTERFACE xios(get_attr)
 
@@ -151 +200 @@
                    xios(is_defined_inverse_axis_attr_hdl), xios(is_defined_generate_rectilinear_domain_attr_hdl),                 &
                    xios(is_defined_scalar_attr_hdl), xios(is_defined_scalargroup_attr_hdl),                                       &
-                   xios(is_defined_reduce_axis_to_scalar_attr_hdl), xios(is_defined_compute_connectivity_domain_attr_hdl)
+                   xios(is_defined_reduce_axis_to_scalar_attr_hdl), xios(is_defined_compute_connectivity_domain_attr_hdl),        &
+                   xios(is_defined_reduce_domain_to_scalar_attr_hdl), xios(is_defined_reduce_domain_to_axis_attr_hdl),            &
+                   xios(is_defined_extract_domain_to_axis_attr_hdl), xios(is_defined_extract_axis_to_scalar_attr_hdl),            &
+                   xios(is_defined_expand_domain_attr_hdl)
 END INTERFACE xios(is_defined_attr)
 
 INTERFACE xios(get_handle)
-  MODULE PROCEDURE xios(get_context_handle), xios(get_domain_handle), xios(get_domaingroup_handle), &
-                   xios(get_file_handle), xios(get_filegroup_handle), xios(get_grid_handle),        &
-                   xios(get_gridgroup_handle), xios(get_axis_handle), xios(get_axisgroup_handle),   &
-                   xios(get_field_handle), xios(get_fieldgroup_handle),xios(get_variable_handle),   &
-                   xios(get_variablegroup_handle), xios(get_zoom_axis_handle),                      &
-                   xios(get_zoom_domain_handle), xios(get_interpolate_axis_handle),                 &
-                   xios(get_interpolate_domain_handle), xios(get_inverse_axis_handle),              &
-                   xios(get_generate_rectilinear_domain_handle), xios(get_scalar_handle),           &
-                   xios(get_scalargroup_handle), xios(get_reduce_axis_to_scalar_handle),            &
-                   xios(get_compute_connectivity_domain_handle)
+  MODULE PROCEDURE xios(get_context_handle), xios(get_domain_handle), xios(get_domaingroup_handle),                  &
+                   xios(get_file_handle), xios(get_filegroup_handle), xios(get_grid_handle),                         &
+                   xios(get_gridgroup_handle), xios(get_axis_handle), xios(get_axisgroup_handle),                    &
+                   xios(get_field_handle), xios(get_fieldgroup_handle),xios(get_variable_handle),                    &
+                   xios(get_variablegroup_handle), xios(get_zoom_axis_handle),                                       &
+                   xios(get_zoom_domain_handle), xios(get_interpolate_axis_handle),                                  &
+                   xios(get_interpolate_domain_handle), xios(get_inverse_axis_handle),                               &
+                   xios(get_generate_rectilinear_domain_handle), xios(get_scalar_handle),                            &
+                   xios(get_scalargroup_handle), xios(get_reduce_axis_to_scalar_handle),                             &
+                   xios(get_compute_connectivity_domain_handle), xios(get_reduce_domain_to_scalar_handle),           &
+                   xios(get_reduce_domain_to_axis_handle), xios(get_extract_domain_to_axis_handle),                  &
+                   xios(get_extract_axis_to_scalar_handle), xios(get_expand_domain_handle)
 END INTERFACE xios(get_handle)
 
@@ -176 +230 @@
                    xios(add_zoomaxistoaxis), xios(add_interpolateaxistoaxis), xios(add_inverseaxistoaxis),           &
                    xios(add_scalar), xios(add_scalartogrid), xios(add_reduceaxistoscalartoscalar),                   &
-                   xios(add_computeconnectivitydomaintodomain)
+                   xios(add_computeconnectivitydomaintodomain), xios(add_reducedomaintoscalartoscalar),              &
+                   xios(add_reducedomaintoaxistoaxis), xios(add_extractdomaintoaxistoaxis),                          &
+                   xios(add_extractaxistoscalartoscalar), xios(add_expanddomaintodomain)
 END INTERFACE xios(add_child)
 

XIOS/trunk/src/interface/fortran/ixml_tree.F90

@@ -10 +10 @@
    USE IDOMAIN
    USE IVARIABLE
+   
    USE IZOOM_DOMAIN
    USE IINTERPOLATE_DOMAIN
    USE IGENERATE_RECTILINEAR_DOMAIN
    USE ICOMPUTE_CONNECTIVITY_DOMAIN
+   USE IEXPAND_DOMAIN
+
    USE IZOOM_AXIS
    USE IINTERPOLATE_AXIS
    USE IINVERSE_AXIS
+   USE IREDUCE_DOMAIN_TO_AXIS
+   USE IEXTRACT_DOMAIN_TO_AXIS
+
    USE IREDUCE_AXIS_TO_SCALAR
+   USE IEXTRACT_AXIS_TO_SCALAR
+   USE IREDUCE_DOMAIN_TO_SCALAR
 
    INTERFACE ! Ne pas appeler directement/Interface FORTRAN 2003 <-> C99
@@ -191 +199 @@
       END SUBROUTINE cxios_xml_tree_add_domaintogrid
 
+      !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      !!!   TRANSFORMATIONS 
+      !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      !!! DOMAIN
       SUBROUTINE cxios_xml_tree_add_zoomdomaintodomain(parent_, child_, child_id, child_id_size) BIND(C)
          USE ISO_C_BINDING
@@ -223 +235 @@
       END SUBROUTINE cxios_xml_tree_add_computeconnectivitydomaintodomain
 
+      SUBROUTINE cxios_xml_tree_add_expanddomaintodomain(parent_, child_, child_id, child_id_size) BIND(C)
+         USE ISO_C_BINDING
+         INTEGER  (kind = C_INTPTR_T), VALUE        :: parent_
+         INTEGER  (kind = C_INTPTR_T)               :: child_
+         CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: child_id
+         INTEGER  (kind = C_INT)     , VALUE        :: child_id_size
+      END SUBROUTINE cxios_xml_tree_add_expanddomaintodomain
+
+      !!!! AXIS
       SUBROUTINE cxios_xml_tree_add_zoomaxistoaxis(parent_, child_, child_id, child_id_size) BIND(C)
          USE ISO_C_BINDING
@@ -247 +268 @@
       END SUBROUTINE cxios_xml_tree_add_inverseaxistoaxis
 
+      SUBROUTINE cxios_xml_tree_add_reducedomaintoaxistoaxis(parent_, child_, child_id, child_id_size) BIND(C)
+         USE ISO_C_BINDING
+         INTEGER  (kind = C_INTPTR_T), VALUE        :: parent_
+         INTEGER  (kind = C_INTPTR_T)               :: child_
+         CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: child_id
+         INTEGER  (kind = C_INT)     , VALUE        :: child_id_size
+      END SUBROUTINE cxios_xml_tree_add_reducedomaintoaxistoaxis
+
+      SUBROUTINE cxios_xml_tree_add_extractdomaintoaxistoaxis(parent_, child_, child_id, child_id_size) BIND(C)
+         USE ISO_C_BINDING
+         INTEGER  (kind = C_INTPTR_T), VALUE        :: parent_
+         INTEGER  (kind = C_INTPTR_T)               :: child_
+         CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: child_id
+         INTEGER  (kind = C_INT)     , VALUE        :: child_id_size
+      END SUBROUTINE cxios_xml_tree_add_extractdomaintoaxistoaxis
+
+      !!! SCALAR
       SUBROUTINE cxios_xml_tree_add_reduceaxistoscalartoscalar(parent_, child_, child_id, child_id_size) BIND(C)
          USE ISO_C_BINDING
@@ -254 +292 @@
          INTEGER  (kind = C_INT)     , VALUE        :: child_id_size
       END SUBROUTINE cxios_xml_tree_add_reduceaxistoscalartoscalar
+
+      SUBROUTINE cxios_xml_tree_add_extractaxistoscalartoscalar(parent_, child_, child_id, child_id_size) BIND(C)
+         USE ISO_C_BINDING
+         INTEGER  (kind = C_INTPTR_T), VALUE        :: parent_
+         INTEGER  (kind = C_INTPTR_T)               :: child_
+         CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: child_id
+         INTEGER  (kind = C_INT)     , VALUE        :: child_id_size
+      END SUBROUTINE cxios_xml_tree_add_extractaxistoscalartoscalar
+
+      SUBROUTINE cxios_xml_tree_add_reducedomaintoscalartoscalar(parent_, child_, child_id, child_id_size) BIND(C)
+         USE ISO_C_BINDING
+         INTEGER  (kind = C_INTPTR_T), VALUE        :: parent_
+         INTEGER  (kind = C_INTPTR_T)               :: child_
+         CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: child_id
+         INTEGER  (kind = C_INT)     , VALUE        :: child_id_size
+      END SUBROUTINE cxios_xml_tree_add_reducedomaintoscalartoscalar
 
       SUBROUTINE cxios_xml_tree_show(filename, filename_size) BIND(C)
@@ -552 +606 @@
    END SUBROUTINE xios(add_domaintogrid)
 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !!!         TRANSFORMATIONS
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !!!         DOAMIN
    SUBROUTINE xios(add_zoomdomaintodomain)(parent_hdl, child_hdl, child_id)
       TYPE(txios(domain))           , INTENT(IN) :: parent_hdl
@@ -604 +662 @@
    END SUBROUTINE xios(add_computeconnectivitydomaintodomain)
 
+   SUBROUTINE xios(add_expanddomaintodomain)(parent_hdl, child_hdl, child_id)
+      TYPE(txios(domain))                      , INTENT(IN) :: parent_hdl
+      TYPE(txios(expand_domain))               , INTENT(OUT):: child_hdl
+      CHARACTER(len = *), OPTIONAL             , INTENT(IN) :: child_id
+
+      IF (PRESENT(child_id)) THEN
+         CALL cxios_xml_tree_add_expanddomaintodomain(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
+      ELSE
+         CALL cxios_xml_tree_add_expanddomaintodomain(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
+      END IF
+
+   END SUBROUTINE xios(add_expanddomaintodomain)
+
+   !!!  AXIS
    SUBROUTINE xios(add_zoomaxistoaxis)(parent_hdl, child_hdl, child_id)
       TYPE(txios(axis))                      , INTENT(IN) :: parent_hdl
@@ -643 +715 @@
    END SUBROUTINE xios(add_inverseaxistoaxis)
 
+   SUBROUTINE xios(add_reducedomaintoaxistoaxis)(parent_hdl, child_hdl, child_id)
+      TYPE(txios(axis))                        , INTENT(IN) :: parent_hdl
+      TYPE(txios(reduce_domain_to_axis))       , INTENT(OUT):: child_hdl
+      CHARACTER(len = *), OPTIONAL             , INTENT(IN) :: child_id
+
+      IF (PRESENT(child_id)) THEN
+         CALL cxios_xml_tree_add_reducedomaintoaxistoaxis(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
+      ELSE
+         CALL cxios_xml_tree_add_reducedomaintoaxistoaxis(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
+      END IF
+
+   END SUBROUTINE xios(add_reducedomaintoaxistoaxis)
+
+   SUBROUTINE xios(add_extractdomaintoaxistoaxis)(parent_hdl, child_hdl, child_id)
+      TYPE(txios(axis))                        , INTENT(IN) :: parent_hdl
+      TYPE(txios(extract_domain_to_axis))      , INTENT(OUT):: child_hdl
+      CHARACTER(len = *), OPTIONAL             , INTENT(IN) :: child_id
+
+      IF (PRESENT(child_id)) THEN
+         CALL cxios_xml_tree_add_extractdomaintoaxistoaxis(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
+      ELSE
+         CALL cxios_xml_tree_add_extractdomaintoaxistoaxis(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
+      END IF
+
+   END SUBROUTINE xios(add_extractdomaintoaxistoaxis)
+
+   !!! SCALAR
    SUBROUTINE xios(add_reduceaxistoscalartoscalar)(parent_hdl, child_hdl, child_id)
-      TYPE(txios(axis))                      , INTENT(IN) :: parent_hdl
+      TYPE(txios(scalar))                    , INTENT(IN) :: parent_hdl
       TYPE(txios(reduce_axis_to_scalar))     , INTENT(OUT):: child_hdl
       CHARACTER(len = *), OPTIONAL           , INTENT(IN) :: child_id
@@ -655 +754 @@
 
    END SUBROUTINE xios(add_reduceaxistoscalartoscalar)
+
+   SUBROUTINE xios(add_extractaxistoscalartoscalar)(parent_hdl, child_hdl, child_id)
+      TYPE(txios(scalar))                    , INTENT(IN) :: parent_hdl
+      TYPE(txios(extract_axis_to_scalar))    , INTENT(OUT):: child_hdl
+      CHARACTER(len = *), OPTIONAL           , INTENT(IN) :: child_id
+
+      IF (PRESENT(child_id)) THEN
+         CALL cxios_xml_tree_add_extractaxistoscalartoscalar(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
+      ELSE
+         CALL cxios_xml_tree_add_extractaxistoscalartoscalar(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
+      END IF
+
+   END SUBROUTINE xios(add_extractaxistoscalartoscalar)
+
+   SUBROUTINE xios(add_reducedomaintoscalartoscalar)(parent_hdl, child_hdl, child_id)
+      TYPE(txios(scalar))                      , INTENT(IN) :: parent_hdl
+      TYPE(txios(reduce_domain_to_scalar))     , INTENT(OUT):: child_hdl
+      CHARACTER(len = *), OPTIONAL             , INTENT(IN) :: child_id
+
+      IF (PRESENT(child_id)) THEN
+         CALL cxios_xml_tree_add_reducedomaintoscalartoscalar(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
+      ELSE
+         CALL cxios_xml_tree_add_reducedomaintoscalartoscalar(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
+      END IF
+
+   END SUBROUTINE xios(add_reducedomaintoscalartoscalar)
+
 END MODULE IXML_TREE