Changeset 133

Timestamp:

10/14/10 15:40:26 (14 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv/src/XMLIO

Files:

• c_interface.cpp (modified) (5 diffs)
• c_interface.hpp (modified) (3 diffs)
• main.f90 (modified) (3 diffs)

XMLIO_V2/dev/dev_rv/src/XMLIO/c_interface.cpp

@@ -18 +18 @@
 }
 
-static inline XString stringXtoStd(const std::string& _str)
+static inline XString stringXtoStd(const std::string& _str) // Non testée
 {
    XString _retstr = {new char[_str.size()](), _str.size()};
@@ -79 +79 @@
    XMLParser::Parse(node);
 }
+
 /* ********************************************************** */
 /*                      DATA TREATMENT INTERFACE              */
@@ -90 +91 @@
    for (it  = AllDataTreatment.begin();
         it != AllDataTreatment.end(); it++)
-      delete (*it);
+      if (*it != NULL) delete (*it);
 }
 
@@ -113 +114 @@
 void xios_dtreatment_create_files_and_headers_(const XHandle * const _hd, const XFileType * const _ft)
 {
-   // Si le handle de traitement n'est pas initialisé à 0, on ne fait aucun traitement.
    if (isNullHandle(*_hd) || (_hd->data_type != DTREATMENT)) return;
    DataTreatment * const __dt = (DataTreatment*)_hd->data_ptr;
@@ -128 +128 @@
 }
 
+/* ********************************************************** */
+/*                      CONTEXT INTERFACE                     */
+/* ********************************************************** */
+
+void xios_context_set_current_(const XHandle * const _ctxt, const bool * const _wswap)
+{
+   bool __wswap = (_wswap == NULL) ? false : *_wswap;
+   if (isNullHandle(*_ctxt) || (_ctxt->data_type != ECONTEXT)) return;
+
+   Context* const __ctxt = (Context*) _ctxt->data_ptr;
+   Context::SetCurrentContext(__ctxt->getId(), __wswap) ;
+}
+

XMLIO_V2/dev/dev_rv/src/XMLIO/c_interface.hpp

@@ -44 +44 @@
    /* ******************** HANDLE INTERFACE ******************** */
    void xios_handle_create_ (XHandle * _ret, const XDType * const _dtype, XString _id);
+
+   /*
    void xios_handle_verify_ (XBool   * _ret, const XHandle * const _hd);
    void xios_handle_getType_(XDType  * _ret, const XHandle * const _hd);
@@ -51 +53 @@
    void xios_handle_isGroup_  (XBool * _ret, const XHandle * const _hd);
    void xios_handle_isElement_(XBool * _ret, const XHandle * const _hd);
+   */
 
    /* ******************** XML INTERFACE *********************** */
@@ -60 +63 @@
    void xios_dtreatment_create_files_and_headers_(const XHandle * const _hd, const XFileType * const _ft);
 
-   /* ******************** CALENDAR INTERFACE ****************** */
+   /* ******************** CONTEXT INTERFACE ******************* */
+   void xios_context_set_current_(const XHandle * const _ctxt, const bool * const _wswap);
 
-   void xios_date_new_(XHandle * _dte, const XDate * const _xdate);
-   void xios_calendar_setTimeStep_(XHandle * _cal, const XDuration * const _dur);
 
-   /* ******************** CONTEXT INTERFACE ******************* */
-   void xios_context_SetCurrent_(const XHandle * const _ctxt);
+   /*
    void xios_context_GetCurrent_(XHandle * _ctxt);
    void xios_context_ShowTree_  (void);
 
    void xios_context_getCalendar_(const XHandle * const _ctxt, XHandle* _cal);
+   */
 
    /* ******************** AXIS INTERFACE ********************** */

XMLIO_V2/dev/dev_rv/src/XMLIO/main.f90

@@ -65 +65 @@
 END MODULE IXML
 
+MODULE ICONTEXT
+   IMPLICIT NONE
+   INTERFACE
+
+      SUBROUTINE xios_context_set_current(context, withswap)
+         USE XTYPE
+         TYPE(XHandle),     INTENT(IN)  :: context
+         LOGICAL, OPTIONAL, INTENT(IN)  :: withswap
+      END SUBROUTINE xios_context_set_current
+
+   END INTERFACE
+
+END MODULE ICONTEXT
+
 MODULE IDATATREATMENT
    IMPLICIT NONE
@@ -88 +102 @@
    USE IXHANDLE
    USE IXML
+   USE ICONTEXT
    USE IDATATREATMENT
 
@@ -107 +122 @@
    ! ----------- Début du traitement ----------- !
 
+   CALL xios_context_set_current(context1, .TRUE.)
+
    ! Création et initialisation d'une instance de traitement des données dans 'context1'.
    CALL xios_dtreatment_new(dtreat, context1)