Changeset 509 for XIOS/trunk/src/interface/c
- Timestamp:
- 11/13/14 15:09:14 (10 years ago)
- Location:
- XIOS/trunk/src/interface/c
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/interface/c/icdata.cpp
r501 r509 92 92 CTimer::get("XIOS close definition").resume() ; 93 93 CContext* context = CContext::getCurrent() ; 94 // context->setClientServerBuffer(); 94 95 context->closeDefinition() ; 95 96 CTimer::get("XIOS close definition").suspend() ; … … 257 258 { 258 259 CVariable::get(context->getId(),varIdStr)->setData<double>(data); 259 CVariable::get(context->getId(),varIdStr)->sendValue();260 //CVariable::get(context->getId(),varIdStr)->sendValue(); 260 261 } 261 262 … … 278 279 { 279 280 CVariable::get(context->getId(),varIdStr)->setData<float>(data); 280 CVariable::get(context->getId(),varIdStr)->sendValue();281 //CVariable::get(context->getId(),varIdStr)->sendValue(); 281 282 } 282 283 … … 299 300 { 300 301 CVariable::get(context->getId(),varIdStr)->setData<int>(data); 301 CVariable::get(context->getId(),varIdStr)->sendValue();302 //CVariable::get(context->getId(),varIdStr)->sendValue(); 302 303 } 303 304 … … 321 322 { 322 323 CVariable::get(context->getId(),varIdStr)->setData<bool>(data); 323 CVariable::get(context->getId(),varIdStr)->sendValue();324 //CVariable::get(context->getId(),varIdStr)->sendValue(); 324 325 } 325 326 … … 347 348 { 348 349 CVariable::get(context->getId(),varIdStr)->setData<string>(dataStr); 349 CVariable::get(context->getId(),varIdStr)->sendValue();350 //CVariable::get(context->getId(),varIdStr)->sendValue(); 350 351 } 351 352 -
XIOS/trunk/src/interface/c/icdate.cpp
r501 r509 31 31 CDuration dur = {ts_year, ts_month, ts_day, ts_hour, ts_minute, ts_second, 0}; 32 32 xios::CContext* context = CContext::getCurrent() ; 33 34 context->timestep.setValue(dur.toString()); 35 context->sendAttributToServer("timestep") ; 36 CTimer::get("XIOS").suspend() ; 33 context->timestep.setValue(dur.toString()); 34 CTimer::get("XIOS").suspend() ; 37 35 } 38 36 catch (xios::CException & exc) … … 42 40 } 43 41 } 44 42 45 43 void cxios_update_calendar(int step) 46 44 { … … 51 49 context->sendUpdateCalendar(step) ; 52 50 CTimer::get("XIOS").suspend() ; 53 54 51 } 55 52 -
XIOS/trunk/src/interface/c/icxml_tree.cpp
r501 r509 44 44 typedef xios::CAxis * XAxisPtr; 45 45 typedef xios::CAxisGroup * XAxisGroupPtr; 46 46 47 47 typedef xios::CVariable * XVariablePtr; 48 48 typedef xios::CVariableGroup * XVariableGroupPtr; 49 49 50 50 // ----------------------- Ajout d'enfant à un parent ----------------------- 51 51 52 52 void cxios_xml_tree_add_field 53 53 (XFieldGroupPtr parent_, XFieldPtr * child_, const char * child_id, int child_id_size) 54 54 { 55 std::string child_id_str; 56 CTimer::get("XIOS").resume() ; 57 if (cstr2string(child_id, child_id_size, child_id_str)) 58 { 59 *child_ = parent_->createChild(child_id_str) ; 60 parent_->sendCreateChild(child_id_str) ; 61 } 62 else 63 { 64 *child_ = parent_->createChild() ; 65 parent_->sendCreateChild() ; 55 std::string child_id_str; 56 CTimer::get("XIOS").resume() ; 57 if (cstr2string(child_id, child_id_size, child_id_str)) 58 { 59 *child_ = parent_->createChild(child_id_str) ; 60 } 61 else 62 { 63 *child_ = parent_->createChild() ; 66 64 } 67 65 CTimer::get("XIOS").suspend() ; 68 66 } 69 67 70 68 void cxios_xml_tree_add_grid 71 69 (XGridGroupPtr parent_, XGridPtr * child_, const char * child_id, int child_id_size) 72 70 { 73 std::string child_id_str; 74 CTimer::get("XIOS").resume() ; 75 if (cstr2string(child_id, child_id_size, child_id_str)) 76 { 77 *child_ = parent_->createChild(child_id_str) ; 78 parent_->sendCreateChild(child_id_str) ; 79 } 80 else 81 { 82 *child_ = parent_->createChild() ; 83 parent_->sendCreateChild() ; 84 } 85 CTimer::get("XIOS").suspend() ; 86 } 87 71 std::string child_id_str; 72 CTimer::get("XIOS").resume() ; 73 if (cstr2string(child_id, child_id_size, child_id_str)) 74 { 75 *child_ = parent_->createChild(child_id_str) ; 76 } 77 else 78 { 79 *child_ = parent_->createChild() ; 80 } 81 CTimer::get("XIOS").suspend() ; 82 } 83 88 84 void cxios_xml_tree_add_file 89 85 (XFileGroupPtr parent_, XFilePtr * child_, const char * child_id, int child_id_size) 90 86 { 91 std::string child_id_str; 92 CTimer::get("XIOS").resume() ; 93 if (cstr2string(child_id, child_id_size, child_id_str)) 94 { 95 *child_ = parent_->createChild(child_id_str) ; 96 parent_->sendCreateChild(child_id_str) ; 97 } 98 else 99 { 100 *child_ = parent_->createChild() ; 101 parent_->sendCreateChild() ; 102 } 103 CTimer::get("XIOS").suspend() ; 104 } 105 87 std::string child_id_str; 88 CTimer::get("XIOS").resume() ; 89 if (cstr2string(child_id, child_id_size, child_id_str)) 90 { 91 *child_ = parent_->createChild(child_id_str) ; 92 } 93 else 94 { 95 *child_ = parent_->createChild() ; 96 } 97 CTimer::get("XIOS").suspend() ; 98 } 99 106 100 void cxios_xml_tree_add_axis 107 101 (XAxisGroupPtr parent_, XAxisPtr * child_, const char * child_id, int child_id_size) 108 102 { 109 std::string child_id_str; 110 CTimer::get("XIOS").resume() ; 111 if (cstr2string(child_id, child_id_size, child_id_str)) 112 { 113 *child_ = parent_->createChild(child_id_str) ; 114 parent_->sendCreateChild(child_id_str) ; 115 } 116 else 117 { 118 *child_ = parent_->createChild() ; 119 parent_->sendCreateChild() ; 120 } 121 CTimer::get("XIOS").suspend() ; 122 } 123 103 std::string child_id_str; 104 CTimer::get("XIOS").resume() ; 105 if (cstr2string(child_id, child_id_size, child_id_str)) 106 { 107 *child_ = parent_->createChild(child_id_str) ; 108 } 109 else 110 { 111 *child_ = parent_->createChild() ; 112 } 113 CTimer::get("XIOS").suspend() ; 114 } 115 124 116 void cxios_xml_tree_add_domain 125 117 (XDomainGroupPtr parent_, XDomainPtr * child_, const char * child_id, int child_id_size) … … 130 122 { 131 123 *child_ = parent_->createChild(child_id_str) ; 132 parent_->sendCreateChild(child_id_str) ; 133 } 134 else 135 { 136 *child_ = parent_->createChild() ; 137 parent_->sendCreateChild() ; 138 } 139 CTimer::get("XIOS").suspend() ; 140 } 141 124 } 125 else 126 { 127 *child_ = parent_->createChild() ; 128 } 129 CTimer::get("XIOS").suspend() ; 130 } 131 142 132 void cxios_xml_tree_add_fieldtofile 143 133 (XFilePtr parent_, XFieldPtr * child_, const char * child_id, int child_id_size) … … 145 135 std::string child_id_str; 146 136 CTimer::get("XIOS").resume() ; 147 137 148 138 if (cstr2string(child_id, child_id_size, child_id_str)) 149 139 { 150 140 *child_ = parent_->addField(child_id_str); 151 parent_->sendAddField(child_id_str) ;152 141 } 153 142 else 154 143 { 155 144 *child_ = parent_->addField(); 156 parent_->sendAddField() ;157 145 } 158 146 CTimer::get("XIOS").suspend() ; … … 164 152 std::string child_id_str; 165 153 CTimer::get("XIOS").resume() ; 166 154 167 155 if (cstr2string(child_id, child_id_size, child_id_str)) 168 156 { 169 157 *child_ = parent_->addVariable(child_id_str); 170 parent_->sendAddVariable(child_id_str) ;171 158 } 172 159 else 173 160 { 174 161 *child_ = parent_->addVariable(); 175 parent_->sendAddVariable() ; 176 } 177 CTimer::get("XIOS").suspend() ; 178 } 179 162 } 163 CTimer::get("XIOS").suspend() ; 164 } 165 180 166 void cxios_xml_tree_add_variabletofield 181 167 (XFieldPtr parent_, XVariablePtr * child_, const char * child_id, int child_id_size) … … 183 169 std::string child_id_str; 184 170 CTimer::get("XIOS").resume() ; 185 171 186 172 if (cstr2string(child_id, child_id_size, child_id_str)) 187 173 { 188 174 *child_ = parent_->addVariable(child_id_str); 189 parent_->sendAddVariable(child_id_str) ;190 175 } 191 176 else 192 177 { 193 178 *child_ = parent_->addVariable(); 194 parent_->sendAddVariable() ; 195 } 196 CTimer::get("XIOS").suspend() ; 197 } 179 } 180 CTimer::get("XIOS").suspend() ; 181 } 198 182 // ----------------------- Ajout de groupe à un parent ---------------------- 199 183 … … 201 185 (XFieldGroupPtr parent_, XFieldGroupPtr * child_, const char * child_id, int child_id_size) 202 186 { 203 std::string child_id_str; 204 CTimer::get("XIOS").resume() ; 205 if (cstr2string(child_id, child_id_size, child_id_str)) 206 { 207 *child_ = parent_->createChildGroup(child_id_str) ; 208 parent_->sendCreateChildGroup(child_id_str) ; 209 } 210 else 211 { 212 *child_ = parent_->createChildGroup() ; 213 parent_->sendCreateChildGroup(child_id_str) ; 187 std::string child_id_str; 188 CTimer::get("XIOS").resume() ; 189 if (cstr2string(child_id, child_id_size, child_id_str)) 190 { 191 *child_ = parent_->createChildGroup(child_id_str) ; 192 } 193 else 194 { 195 *child_ = parent_->createChildGroup() ; 214 196 } 215 197 CTimer::get("XIOS").suspend() ; … … 224 206 { 225 207 *child_ = parent_->createChildGroup(child_id_str) ; 226 parent_->sendCreateChildGroup(child_id_str) ; 227 } 228 else 229 { 230 *child_ = parent_->createChildGroup() ; 231 parent_->sendCreateChildGroup(child_id_str) ; 208 } 209 else 210 { 211 *child_ = parent_->createChildGroup() ; 232 212 } 233 213 CTimer::get("XIOS").suspend() ; … … 242 222 { 243 223 *child_ = parent_->createChildGroup(child_id_str) ; 244 parent_->sendCreateChildGroup(child_id_str) ; 245 } 246 else 247 { 248 *child_ = parent_->createChildGroup() ; 249 parent_->sendCreateChildGroup(child_id_str) ; 224 } 225 else 226 { 227 *child_ = parent_->createChildGroup() ; 250 228 } 251 229 CTimer::get("XIOS").suspend() ; … … 260 238 { 261 239 *child_ = parent_->createChildGroup(child_id_str) ; 262 parent_->sendCreateChildGroup(child_id_str) ; 263 } 264 else 265 { 266 *child_ = parent_->createChildGroup() ; 267 parent_->sendCreateChildGroup(child_id_str) ; 240 } 241 else 242 { 243 *child_ = parent_->createChildGroup() ; 268 244 } 269 245 CTimer::get("XIOS").suspend() ; … … 278 254 { 279 255 *child_ = parent_->createChildGroup(child_id_str) ; 280 parent_->sendCreateChildGroup(child_id_str) ; 281 } 282 else 283 { 284 *child_ = parent_->createChildGroup() ; 285 parent_->sendCreateChildGroup(child_id_str) ; 256 } 257 else 258 { 259 *child_ = parent_->createChildGroup() ; 286 260 } 287 261 CTimer::get("XIOS").suspend() ; … … 291 265 (XFilePtr parent_, XFieldGroupPtr * child_, const char * child_id, int child_id_size) 292 266 { 293 std::string child_id_str; 267 std::string child_id_str; 294 268 CTimer::get("XIOS").resume() ; 295 269 if (cstr2string(child_id, child_id_size, child_id_str)) 296 270 { 297 271 *child_ = parent_->addFieldGroup(child_id_str); 298 parent_->sendAddFieldGroup(child_id_str) ;299 272 } 300 273 else 301 274 { 302 275 *child_ = parent_->addFieldGroup(); 303 parent_->sendAddFieldGroup() ; 304 } 305 CTimer::get("XIOS").suspend() ; 306 } 307 276 } 277 CTimer::get("XIOS").suspend() ; 278 } 279 308 280 void cxios_xml_tree_add_variablegrouptofile 309 281 (XFilePtr parent_, XVariableGroupPtr * child_, const char * child_id, int child_id_size) 310 282 { 311 std::string child_id_str; 283 std::string child_id_str; 312 284 CTimer::get("XIOS").resume() ; 313 285 if (cstr2string(child_id, child_id_size, child_id_str)) 314 286 { 315 287 *child_ = parent_->addVariableGroup(child_id_str); 316 parent_->sendAddVariableGroup(child_id_str) ;317 288 } 318 289 else 319 290 { 320 291 *child_ = parent_->addVariableGroup(); 321 parent_->sendAddVariableGroup() ; 322 } 323 CTimer::get("XIOS").suspend() ; 324 } 325 292 } 293 CTimer::get("XIOS").suspend() ; 294 } 295 326 296 void cxios_xml_tree_add_variablegrouptofield 327 297 (XFieldPtr parent_, XVariableGroupPtr * child_, const char * child_id, int child_id_size) 328 298 { 329 std::string child_id_str; 299 std::string child_id_str; 330 300 CTimer::get("XIOS").resume() ; 331 301 if (cstr2string(child_id, child_id_size, child_id_str)) 332 302 { 333 303 *child_ = parent_->addVariableGroup(child_id_str); 334 parent_->sendAddVariableGroup(child_id_str) ;335 304 } 336 305 else 337 306 { 338 307 *child_ = parent_->addVariableGroup(); 339 parent_->sendAddVariableGroup() ; 340 } 341 CTimer::get("XIOS").suspend() ; 342 } 343 344 308 } 309 CTimer::get("XIOS").suspend() ; 310 } 311 312 345 313 // ----------------------- Affichage de l'arborescence ---------------------- 346 347 // void cxios_xml_tree_show (const char * filename, int filename_size) 314 315 // void cxios_xml_tree_show (const char * filename, int filename_size) 348 316 // { 349 317 // std::string filename_str; … … 361 329 // } 362 330 // } 363 364 331 332 365 333 // ----------------------- Parsing de document xml -------------------------- 366 334 367 335 // void cxios_xml_parse_file (const char * filename , int filename_size)// 368 336 // { 369 // std::string filename_str; 337 // std::string filename_str; 370 338 // if (!cstr2string(filename, filename_size, filename_str)) return; 371 339 // … … 380 348 // } 381 349 // } 382 350 383 351 // void cxios_xml_parse_string(const char * xmlcontent, int xmlcontent_size) 384 352 // { 385 // std::string xmlcontent_str; 353 // std::string xmlcontent_str; 386 354 // if (!cstr2string(xmlcontent, xmlcontent_size, xmlcontent_str)) return; 387 355 // … … 396 364 // } 397 365 // } 398 366 399 367 400 368
Note: See TracChangeset
for help on using the changeset viewer.