Changeset 786 for XIOS/trunk/src

Timestamp:

11/12/15 16:33:25 (8 years ago)

Author:

mhnguyen

Message:

Generating interface for transformations

+) Update Fortran interface for other transformations
+) Remove some redundant files
+) Update test to new interface

Test
+) On Curie
+) test_client and test_complete are correct

Location:

XIOS/trunk/src

Files:

• config/transformation_attribute.conf (deleted)
• generate_fortran_interface.cpp (modified) (4 diffs)
• interface/c/icgenerate_rectilinear_domain.cpp (moved) (moved from XIOS/trunk/src/interface/c/iczoom_domain.cpp) (3 diffs)
• interface/c/icinterpolate.cpp (added)
• interface/c/icinverse_axis.cpp (copied) (copied from XIOS/trunk/src/interface/c/iczoom_axis.cpp) (3 diffs)
• interface/c/iczoom.cpp (moved) (moved from XIOS/trunk/src/interface/c/iczoom_axis.cpp) (3 diffs)
• interface/c_attr/icgenerate_rectilinear_domain_attr.cpp (added)
• interface/c_attr/icinterpolate_axis_attr.cpp (added)
• interface/c_attr/icinterpolate_domain_attr.cpp (added)
• interface/c_attr/icinverse_axis_attr.cpp (added)
• interface/fortran/generate_rectilinear_domain_interface.f90 (added)
• interface/fortran/igenerate_rectilinear_domain.F90 (added)
• interface/fortran/iinterpolate_axis.F90 (added)
• interface/fortran/iinterpolate_domain.F90 (added)
• interface/fortran/iinverse_axis.F90 (added)
• interface/fortran/interpolate_axis_interface.f90 (added)
• interface/fortran/interpolate_domain_interface.f90 (added)
• interface/fortran/inverse_axis_interface.f90 (added)
• interface/fortran/ixios.F90 (modified) (1 diff)
• interface/fortran/ixios_interfaces.F90 (modified) (5 diffs)
• interface/fortran_attr/generate_rectilinear_domain_interface_attr.F90 (added)
• interface/fortran_attr/igenerate_rectilinear_domain_attr.F90 (added)
• interface/fortran_attr/iinterpolate_axis_attr.F90 (added)
• interface/fortran_attr/iinterpolate_domain_attr.F90 (added)
• interface/fortran_attr/iinverse_axis_attr.F90 (added)
• interface/fortran_attr/interpolate_axis_interface_attr.F90 (added)
• interface/fortran_attr/interpolate_domain_interface_attr.F90 (added)
• interface/fortran_attr/inverse_axis_interface_attr.F90 (added)
• node/axis.cpp (modified) (1 diff)
• test/test_complete.f90 (modified) (1 diff)
• test/test_remap.f90 (modified) (1 diff)

XIOS/trunk/src/generate_fortran_interface.cpp

@@ -5 +5 @@
 #include "object_template.hpp"
 #include "group_template.hpp"
-#include "context.hpp"
-#include "file.hpp"
-#include "zoom_domain.hpp"
-#include "zoom_axis.hpp"
+//#include "context.hpp"
+//#include "file.hpp"
+//#include "zoom_domain.hpp"
+//#include "zoom_axis.hpp"
+//#include "interpolate_axis.hpp"
+//#include "interpolate_domain.hpp"
+#include "node_type.hpp"
 
 int main (int argc, char ** argv, char ** UNUSED (env))
@@ -34 +37 @@
   CZoomAxis zoomAxis;
 
+  CInterpolateAxis interpolateAxis;
+  CInterpolateDomain interpolateDomain;
+
+  CGenerateRectilinearDomain genDomain;
+  CInverseAxis inverseAxis;
+
   ostringstream oss;
   ofstream file;
@@ -224 +233 @@
   file.close();
 
+  file.open((path+"interpolate_axis_interface_attr.F90").c_str());
+  interpolateAxis.generateFortran2003Interface(file);
+  file.close();
+
+  file.open((path+"icinterpolate_axis_attr.cpp").c_str());
+  interpolateAxis.generateCInterface(file);
+  file.close();
+
+  file.open((path+"iinterpolate_axis_attr.F90").c_str());
+  interpolateAxis.generateFortranInterface(file);
+  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+"inverse_axis_interface_attr.F90").c_str());
+  inverseAxis.generateFortran2003Interface(file);
+  file.close();
+
+  file.open((path+"icinverse_axis_attr.cpp").c_str());
+  inverseAxis.generateCInterface(file);
+  file.close();
+
+  file.open((path+"iinverse_axis_attr.F90").c_str());
+  inverseAxis.generateFortranInterface(file);
+  file.close();
+
   file.open((path+"context_interface_attr.F90").c_str());
   context->generateFortran2003Interface(file);
@@ -235 +292 @@
   context->generateFortranInterface(file);
   file.close();
-
-
-
 }

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

@@ -14 +14 @@
 #include "icutil.hpp"
 #include "timer.hpp"
-#include "zoom_domain.hpp"
+#include "generate_rectilinear_domain.hpp"
 
 extern "C"
@@ -22 +22 @@
    // ----------------------- Redéfinition de types ----------------------------
 
-   typedef xios::CZoomDomain      * XZoomDomainPtr;
+   typedef xios::CGenerateRectilinearDomain   * XGenDomainPtr;
 
    // ------------------------ Création des handle -----------------------------
-   void cxios_zoom_domain_handle_create(XZoomDomainPtr * _ret, const char * _id, int _id_len)
+   void cxios_generate_rectilinear_domain_handle_create(XGenDomainPtr * _ret, const char * _id, int _id_len)
    {
       std::string id;
       if (!cstr2string(_id, _id_len, id)) return;
       CTimer::get("XIOS").resume() ;
-      *_ret = xios::CZoomDomain::get(id);
+      *_ret = xios::CGenerateRectilinearDomain::get(id);
       CTimer::get("XIOS").suspend() ;
    }
 
    // -------------------- Vérification des identifiants -----------------------
-   void cxios_zoom_domain_valid_id(bool * _ret, const char * _id, int _id_len)
+   void cxios_generate_rectilinear_domain_valid_id(bool * _ret, const char * _id, int _id_len)
    {
       std::string id;
@@ -41 +41 @@
 
       CTimer::get("XIOS").resume() ;
-      *_ret = xios::CZoomDomain::has(id);
+      *_ret = xios::CGenerateRectilinearDomain::has(id);
       CTimer::get("XIOS").suspend() ;
    }

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

@@ -14 +14 @@
 #include "icutil.hpp"
 #include "timer.hpp"
-#include "zoom_axis.hpp"
+#include "inverse_axis.hpp"
 
 extern "C"
@@ -22 +22 @@
    // ----------------------- Redéfinition de types ----------------------------
 
-   typedef xios::CZoomAxis   * XZoomAxisPtr;
+   typedef xios::CInverseAxis      * XInverseAxisPtr;
 
    // ------------------------ Création des handle -----------------------------
-   void cxios_zoom_axis_handle_create (XZoomAxisPtr * _ret, const char * _id, int _id_len)
+   void cxios_inverse_axis_handle_create(XInverseAxisPtr * _ret, const char * _id, int _id_len)
    {
       std::string id;
       if (!cstr2string(_id, _id_len, id)) return;
       CTimer::get("XIOS").resume() ;
-      *_ret = xios::CZoomAxis::get(id);
+      *_ret = xios::CInverseAxis::get(id);
       CTimer::get("XIOS").suspend() ;
    }
 
    // -------------------- Vérification des identifiants -----------------------
-   void cxios_zoom_axis_valid_id (bool * _ret, const char * _id, int _id_len)
+   void cxios_inverse_axis_valid_id(bool * _ret, const char * _id, int _id_len)
    {
       std::string id;
@@ -41 +41 @@
 
       CTimer::get("XIOS").resume() ;
-      *_ret = xios::CZoomAxis::has(id);
+      *_ret = xios::CInverseAxis::has(id);
       CTimer::get("XIOS").suspend() ;
    }

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

@@ -15 +15 @@
 #include "timer.hpp"
 #include "zoom_axis.hpp"
+#include "zoom_domain.hpp"
 
 extern "C"
@@ -23 +24 @@
 
    typedef xios::CZoomAxis   * XZoomAxisPtr;
-
+   typedef xios::CZoomDomain * XZoomDomainPtr;
    // ------------------------ Création des handle -----------------------------
    void cxios_zoom_axis_handle_create (XZoomAxisPtr * _ret, const char * _id, int _id_len)
@@ -44 +45 @@
       CTimer::get("XIOS").suspend() ;
    }
+
+   // ------------------------ Création des handle -----------------------------
+   void cxios_zoom_domain_handle_create(XZoomDomainPtr * _ret, const char * _id, int _id_len)
+   {
+      std::string id;
+      if (!cstr2string(_id, _id_len, id)) return;
+      CTimer::get("XIOS").resume() ;
+      *_ret = xios::CZoomDomain::get(id);
+      CTimer::get("XIOS").suspend() ;
+   }
+
+   // -------------------- Vérification des identifiants -----------------------
+   void cxios_zoom_domain_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::CZoomDomain::has(id);
+      CTimer::get("XIOS").suspend() ;
+   }
 } // extern "C"

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

@@ -75 +75 @@
 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)
+
+USE iinterpolate_domain_attr, ONLY : xios(set_interpolate_domain_attr), xios(get_interpolate_domain_attr), &
+                                     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)
+
+USE igenerate_rectilinear_domain_attr, ONLY : xios(set_generate_rectilinear_domain_attr), xios(get_generate_rectilinear_domain_attr), &
+                                              xios(is_defined_generate_rectilinear_domain_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(send_scalar), xios(recv_field), xios(field_is_active), xios(getVar), xios(setVar)

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

@@ -59 +59 @@
 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)
+
+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)
+
+USE igenerate_rectilinear_domain_attr, ONLY : xios(set_generate_rectilinear_domain_attr_hdl), &
+                                              xios(get_generate_rectilinear_domain_attr_hdl), &
+                                              xios(is_defined_generate_rectilinear_domain_attr_hdl)
+
 USE ixml_tree, ONLY : xios(add_axis), xios(add_file), xios(add_grid), xios(add_field), xios(add_domain),   &
                       xios(add_fieldtofile), xios(add_variabletofile), xios(add_variabletofield),          &
@@ -73 +93 @@
                    xios(set_grid_attr_hdl), xios(set_gridgroup_attr_hdl), xios(set_axis_attr_hdl) ,          &
                    xios(set_axisgroup_attr_hdl), xios(set_context_attr_hdl), xios(set_zoom_axis_attr_hdl),   &
-                   xios(set_zoom_domain_attr_hdl)
+                   xios(set_zoom_domain_attr_hdl), xios(set_interpolate_axis_attr_hdl),                      &
+                   xios(set_interpolate_domain_attr_hdl), xios(set_inverse_axis_attr_hdl),                   &
+                   xios(set_generate_rectilinear_domain_attr_hdl)
 END INTERFACE xios(set_attr)
 
@@ -82 +104 @@
                    xios(get_grid_attr_hdl), xios(get_gridgroup_attr_hdl), xios(get_axis_attr_hdl) ,          &
                    xios(get_axisgroup_attr_hdl), xios(get_context_attr_hdl), xios(get_zoom_axis_attr_hdl),   &
-                   xios(get_zoom_domain_attr_hdl)
+                   xios(get_zoom_domain_attr_hdl), xios(get_interpolate_axis_attr_hdl),                      &
+                   xios(get_interpolate_domain_attr_hdl), xios(get_inverse_axis_attr_hdl),                   &
+                   xios(get_generate_rectilinear_domain_attr_hdl)
 END INTERFACE xios(get_attr)
 
@@ -91 +115 @@
                    xios(is_defined_grid_attr_hdl), xios(is_defined_gridgroup_attr_hdl), xios(is_defined_axis_attr_hdl) ,          &
                    xios(is_defined_axisgroup_attr_hdl), xios(is_defined_context_attr_hdl),                                        &
-                   xios(is_defined_zoom_axis_attr_hdl), xios(is_defined_zoom_domain_attr_hdl)
+                   xios(is_defined_zoom_axis_attr_hdl), xios(is_defined_zoom_domain_attr_hdl),                                    &
+                   xios(is_defined_interpolate_axis_attr_hdl), xios(is_defined_interpolate_domain_attr_hdl),                      &
+                   xios(is_defined_inverse_axis_attr_hdl), xios(is_defined_generate_rectilinear_domain_attr_hdl)
 END INTERFACE xios(is_defined_attr)
 
@@ -99 +125 @@
                    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_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)
 END INTERFACE xios(get_handle)
 

XIOS/trunk/src/node/axis.cpp

@@ -920 +920 @@
           tmp->parse(node);
           transformationMap_.push_back(std::make_pair(TRANS_INVERSE_AXIS,tmp));
-        } else if (node.getElementName() == zoom) {
-          CZoomAxis* tmp = (CZoomAxisGroup::get(zoomAxisDefRoot))->createChild();
+        }
+        else if (node.getElementName() == zoom) {
+          CZoomAxis* tmp = (CZoomAxisGroup::get(zoomAxisDefRoot))->createChild(nodeId);
           tmp->parse(node);
           transformationMap_.push_back(std::make_pair(TRANS_ZOOM_AXIS,tmp));

XIOS/trunk/src/test/test_complete.f90

@@ -88 +88 @@
 
   CALL xios_set_axis_attr("axis_atm",n_glo=llm ,value=lval) ;
+  CALL xios_set_zoom_axis_attr("axis_atm_zoom",zoom_size=2);
 
   CALL xios_set_domain_attr("domain_atm",ni_glo=ni_glo, nj_glo=nj_glo, ibegin=ibegin, ni=ni,jbegin=jbegin,nj=nj, type='curvilinear')

XIOS/trunk/src/test/test_remap.f90

@@ -120 +120 @@
                             bounds_lon_1D=dst_boundslon, bounds_lat_1D=dst_boundslat, nvertex=dst_nvertex)
 
-!  CALL xios_set_zoom_domain_attr("dst_domain_regular_pole", zoom_ibegin=10, zoom_ni=10, &
-!                                 zoom_jbegin=10, zoom_nj=10)
+  CALL xios_set_generate_rectilinear_domain_attr("domain_regular_pole", lat_start=dble(-90.0), lat_end=dble(90), &
+                                                 lon_start=dble(2), lon_end=dble(360))
 
   dtime%second = 3600