Changeset 981 for XIOS/trunk/src/interface/c/icxml_tree.cpp

Timestamp:

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

Author:

mhnguyen

Message:

Fortran interfaces:

+) Adding Fortran interfaces of transformation

Test
+) Only complilation on Curie

File:

• XIOS/trunk/src/interface/c/icxml_tree.cpp (modified) (6 diffs)

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() ;
    }