- Timestamp:
- 10/14/10 15:40:26 (14 years ago)
- Location:
- XMLIO_V2/dev/dev_rv/src/XMLIO
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
XMLIO_V2/dev/dev_rv/src/XMLIO/c_interface.cpp
r132 r133 18 18 } 19 19 20 static inline XString stringXtoStd(const std::string& _str) 20 static inline XString stringXtoStd(const std::string& _str) // Non testée 21 21 { 22 22 XString _retstr = {new char[_str.size()](), _str.size()}; … … 79 79 XMLParser::Parse(node); 80 80 } 81 81 82 /* ********************************************************** */ 82 83 /* DATA TREATMENT INTERFACE */ … … 90 91 for (it = AllDataTreatment.begin(); 91 92 it != AllDataTreatment.end(); it++) 92 delete (*it);93 if (*it != NULL) delete (*it); 93 94 } 94 95 … … 113 114 void xios_dtreatment_create_files_and_headers_(const XHandle * const _hd, const XFileType * const _ft) 114 115 { 115 // Si le handle de traitement n'est pas initialisé à 0, on ne fait aucun traitement.116 116 if (isNullHandle(*_hd) || (_hd->data_type != DTREATMENT)) return; 117 117 DataTreatment * const __dt = (DataTreatment*)_hd->data_ptr; … … 128 128 } 129 129 130 /* ********************************************************** */ 131 /* CONTEXT INTERFACE */ 132 /* ********************************************************** */ 133 134 void xios_context_set_current_(const XHandle * const _ctxt, const bool * const _wswap) 135 { 136 bool __wswap = (_wswap == NULL) ? false : *_wswap; 137 if (isNullHandle(*_ctxt) || (_ctxt->data_type != ECONTEXT)) return; 138 139 Context* const __ctxt = (Context*) _ctxt->data_ptr; 140 Context::SetCurrentContext(__ctxt->getId(), __wswap) ; 141 } 142 -
XMLIO_V2/dev/dev_rv/src/XMLIO/c_interface.hpp
r132 r133 44 44 /* ******************** HANDLE INTERFACE ******************** */ 45 45 void xios_handle_create_ (XHandle * _ret, const XDType * const _dtype, XString _id); 46 47 /* 46 48 void xios_handle_verify_ (XBool * _ret, const XHandle * const _hd); 47 49 void xios_handle_getType_(XDType * _ret, const XHandle * const _hd); … … 51 53 void xios_handle_isGroup_ (XBool * _ret, const XHandle * const _hd); 52 54 void xios_handle_isElement_(XBool * _ret, const XHandle * const _hd); 55 */ 53 56 54 57 /* ******************** XML INTERFACE *********************** */ … … 60 63 void xios_dtreatment_create_files_and_headers_(const XHandle * const _hd, const XFileType * const _ft); 61 64 62 /* ******************** CALENDAR INTERFACE ****************** */ 65 /* ******************** CONTEXT INTERFACE ******************* */ 66 void xios_context_set_current_(const XHandle * const _ctxt, const bool * const _wswap); 63 67 64 void xios_date_new_(XHandle * _dte, const XDate * const _xdate);65 void xios_calendar_setTimeStep_(XHandle * _cal, const XDuration * const _dur);66 68 67 /* ******************** CONTEXT INTERFACE ******************* */ 68 void xios_context_SetCurrent_(const XHandle * const _ctxt); 69 /* 69 70 void xios_context_GetCurrent_(XHandle * _ctxt); 70 71 void xios_context_ShowTree_ (void); 71 72 72 73 void xios_context_getCalendar_(const XHandle * const _ctxt, XHandle* _cal); 74 */ 73 75 74 76 /* ******************** AXIS INTERFACE ********************** */ -
XMLIO_V2/dev/dev_rv/src/XMLIO/main.f90
r132 r133 65 65 END MODULE IXML 66 66 67 MODULE ICONTEXT 68 IMPLICIT NONE 69 INTERFACE 70 71 SUBROUTINE xios_context_set_current(context, withswap) 72 USE XTYPE 73 TYPE(XHandle), INTENT(IN) :: context 74 LOGICAL, OPTIONAL, INTENT(IN) :: withswap 75 END SUBROUTINE xios_context_set_current 76 77 END INTERFACE 78 79 END MODULE ICONTEXT 80 67 81 MODULE IDATATREATMENT 68 82 IMPLICIT NONE … … 88 102 USE IXHANDLE 89 103 USE IXML 104 USE ICONTEXT 90 105 USE IDATATREATMENT 91 106 … … 107 122 ! ----------- Début du traitement ----------- ! 108 123 124 CALL xios_context_set_current(context1, .TRUE.) 125 109 126 ! Création et initialisation d'une instance de traitement des données dans 'context1'. 110 127 CALL xios_dtreatment_new(dtreat, context1)
Note: See TracChangeset
for help on using the changeset viewer.