Changeset 934 for XIOS/trunk/src/interface

Timestamp:

09/22/16 10:58:44 (8 years ago)

Author:

mhnguyen

Message:

Adding new transformation: Compute_connectivity_domain

Test
+) On Curie
+) Test passes

Location:

XIOS/trunk/src/interface

Files:

• c/iccompute_connectivity_domain.cpp (added)
• c/icxml_tree.cpp (modified) (2 diffs)
• c_attr/iccompute_connectivity_domain_attr.cpp (added)
• fortran/compute_connectivity_domain_interface.f90 (added)
• fortran/icompute_connectivity_domain.F90 (added)
• fortran/ixios.F90 (modified) (1 diff)
• fortran/ixios_interfaces.F90 (modified) (7 diffs)
• fortran/ixml_tree.F90 (modified) (3 diffs)
• fortran_attr/compute_connectivity_domain_interface_attr.F90 (added)
• fortran_attr/icompute_connectivity_domain_attr.F90 (added)

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

@@ -50 +50 @@
    typedef xios::CInterpolateDomain         *  XInterpolateDomainPtr;
    typedef xios::CGenerateRectilinearDomain *  XGenerateRectilinearDomainPtr;
+   typedef xios::CComputeConnectivityDomain *  XComputeConnectivityDomainPtr;
 
    typedef xios::CTransformation<CAxis>   *  XTransformationAxisPtr;
@@ -452 +453 @@
       }
       *child_ = static_cast<XGenerateRectilinearDomainPtr>(tmpChild_);
+      CTimer::get("XIOS").suspend() ;
+   }
+
+   void cxios_xml_tree_add_computeconnectivitydomaintodomain
+      (XDomainPtr parent_, XComputeConnectivityDomainPtr * 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);
+      }
+      else
+      {
+         tmpChild_ = parent_->addTransformation(TRANS_COMPUTE_CONNECTIVITY_DOMAIN);
+      }
+      *child_ = static_cast<XComputeConnectivityDomainPtr>(tmpChild_);
       CTimer::get("XIOS").suspend() ;
    }

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

@@ -106 +106 @@
                                         xios(is_defined_reduce_axis_to_scalar_attr)
 
+USE icompute_connectivity_domain, ONLY : txios(compute_connectivity_domain), xios(is_valid_compute_connectivity_domain)
+
+USE icompute_connectivity_domain_attr, ONLY : xios(set_compute_connectivity_domain_attr), &
+                                              xios(get_compute_connectivity_domain_attr), &
+                                              xios(is_defined_compute_connectivity_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(recv_field), xios(field_is_active), xios(getVar), xios(setVar)

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

@@ -88 +88 @@
                                               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)
+
+USE icompute_connectivity_domain_attr, ONLY : xios(set_compute_connectivity_domain_attr_hdl), &
+                                              xios(get_compute_connectivity_domain_attr_hdl), &
+                                              xios(is_defined_compute_connectivity_domain_attr_hdl)
 
 USE ireduce_axis_to_scalar, ONLY : xios(get_reduce_axis_to_scalar_handle)
@@ -103 +108 @@
                       xios(add_generatedomaintodomain), xios(add_zoomaxistoaxis),                          &
                       xios(add_interpolateaxistoaxis), xios(add_inverseaxistoaxis), xios(add_scalar),      &
-                      xios(add_scalargroup), xios(add_scalartogrid), xios(add_reduceaxistoscalartoscalar)
+                      xios(add_scalargroup), xios(add_scalartogrid), xios(add_reduceaxistoscalartoscalar), &
+                      xios(add_computeconnectivitydomaintodomain)
 
 PRIVATE
@@ -116 +122 @@
                    xios(set_interpolate_domain_attr_hdl), xios(set_inverse_axis_attr_hdl),                   &
                    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_scalargroup_attr_hdl), xios(set_reduce_axis_to_scalar_attr_hdl),                 &
+                   xios(set_compute_connectivity_domain_attr_hdl)
 END INTERFACE xios(set_attr)
 
@@ -128 +135 @@
                    xios(get_interpolate_domain_attr_hdl), xios(get_inverse_axis_attr_hdl),                   &
                    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_scalargroup_attr_hdl), xios(get_reduce_axis_to_scalar_attr_hdl),                 &
+                   xios(get_compute_connectivity_domain_attr_hdl)
 END INTERFACE xios(get_attr)
 
@@ -141 +149 @@
                    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_reduce_axis_to_scalar_attr_hdl), xios(is_defined_compute_connectivity_domain_attr_hdl)
 END INTERFACE xios(is_defined_attr)
 
@@ -153 +161 @@
                    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_scalargroup_handle), xios(get_reduce_axis_to_scalar_handle),            &
+                   xios(get_compute_connectivity_domain_handle)
 END INTERFACE xios(get_handle)
 
@@ -164 +173 @@
                    xios(add_interpolatedomaintodomain), xios(add_generatedomaintodomain),                            &
                    xios(add_zoomaxistoaxis), xios(add_interpolateaxistoaxis), xios(add_inverseaxistoaxis),           &
-                   xios(add_scalar), xios(add_scalartogrid), xios(add_reduceaxistoscalartoscalar)
+                   xios(add_scalar), xios(add_scalartogrid), xios(add_reduceaxistoscalartoscalar),                   &
+                   xios(add_computeconnectivitydomaintodomain)
 END INTERFACE xios(add_child)
 

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

@@ -13 +13 @@
    USE IINTERPOLATE_DOMAIN
    USE IGENERATE_RECTILINEAR_DOMAIN
+   USE ICOMPUTE_CONNECTIVITY_DOMAIN
    USE IZOOM_AXIS
    USE IINTERPOLATE_AXIS
@@ -214 +215 @@
       END SUBROUTINE cxios_xml_tree_add_generatedomaintodomain
 
+      SUBROUTINE cxios_xml_tree_add_computeconnectivitydomaintodomain(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_computeconnectivitydomaintodomain
+
       SUBROUTINE cxios_xml_tree_add_zoomaxistoaxis(parent_, child_, child_id, child_id_size) BIND(C)
          USE ISO_C_BINDING
@@ -582 +591 @@
    END SUBROUTINE xios(add_generatedomaintodomain)
 
+   SUBROUTINE xios(add_computeconnectivitydomaintodomain)(parent_hdl, child_hdl, child_id)
+      TYPE(txios(domain))                      , INTENT(IN) :: parent_hdl
+      TYPE(txios(compute_connectivity_domain)) , INTENT(OUT):: child_hdl
+      CHARACTER(len = *), OPTIONAL             , INTENT(IN) :: child_id
+
+      IF (PRESENT(child_id)) THEN
+         CALL cxios_xml_tree_add_computeconnectivitydomaintodomain(parent_hdl%daddr, child_hdl%daddr, child_id, len(child_id))
+      ELSE
+         CALL cxios_xml_tree_add_computeconnectivitydomaintodomain(parent_hdl%daddr, child_hdl%daddr, "NONE", -1)
+      END IF
+
+   END SUBROUTINE xios(add_computeconnectivitydomaintodomain)
+
    SUBROUTINE xios(add_zoomaxistoaxis)(parent_hdl, child_hdl, child_id)
       TYPE(txios(axis))                      , INTENT(IN) :: parent_hdl