- Timestamp:
- 09/23/15 16:18:56 (9 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/context_client.cpp
r697 r704 104 104 } 105 105 106 if ( 0 != parentServer) // attached mode106 if (isAttachedModeEnabled()) 107 107 { 108 108 waitEvent(ranks); … … 141 141 } 142 142 143 if ( 0 != parentServer) // attached mode143 if (isAttachedModeEnabled()) 144 144 { 145 145 while (checkBuffers()) … … 288 288 } 289 289 290 290 /*! 291 * Check if the attached mode is used. 292 * 293 * \return true if and only if attached mode is used 294 */ 295 bool CContextClient::isAttachedModeEnabled() const 296 { 297 return (parentServer != 0); 298 } 291 299 292 300 /*! -
XIOS/trunk/src/context_client.hpp
r697 r704 43 43 const std::list<int>& getRanksServerLeader(void) const; 44 44 45 bool isAttachedModeEnabled() const; 46 45 47 // Close and finalize context client 46 48 void closeContext(void); -
XIOS/trunk/src/interface/c/iccalendar.cpp
r639 r704 13 13 CTimer::get("XIOS").resume(); 14 14 xios::CContext* context = CContext::getCurrent(); 15 if (!context->hasServer) context->checkBuffersAndListen(); 15 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 16 context->checkBuffersAndListen(); 16 17 context->updateCalendar(step); 17 18 context->sendUpdateCalendar(step); -
XIOS/trunk/src/interface/c/icdata.cpp
r597 r704 373 373 CTimer::get("XIOS send field").resume(); 374 374 CContext* context = CContext::getCurrent(); 375 if (!context->hasServer) context->checkBuffersAndListen(); 375 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 376 context->checkBuffersAndListen(); 376 377 CArray<double, 1> data(data_k8, shape(data_Xsize), neverDeleteData); 377 378 CField::get(fieldid_str)->setData(data); … … 389 390 390 391 CContext* context = CContext::getCurrent(); 391 if (!context->hasServer) context->checkBuffersAndListen(); 392 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 393 context->checkBuffersAndListen(); 392 394 393 395 CArray<double, 1> data(data_k8, shape(data_Xsize), neverDeleteData); … … 407 409 408 410 CContext* context = CContext::getCurrent(); 409 if (!context->hasServer) context->checkBuffersAndListen(); 411 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 412 context->checkBuffersAndListen(); 410 413 411 414 CArray<double, 2>data(data_k8, shape(data_Xsize, data_Ysize), neverDeleteData); … … 425 428 426 429 CContext* context = CContext::getCurrent(); 427 if (!context->hasServer) context->checkBuffersAndListen(); 430 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 431 context->checkBuffersAndListen(); 428 432 429 433 CArray<double, 3>data(data_k8, shape(data_Xsize, data_Ysize, data_Zsize), neverDeleteData); … … 442 446 CTimer::get("XIOS send field").resume(); 443 447 CContext* context = CContext::getCurrent(); 444 if (!context->hasServer) context->checkBuffersAndListen(); 448 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 449 context->checkBuffersAndListen(); 445 450 446 451 CArray<float, 1> data_tmp(data_k4, shape(data_Xsize), neverDeleteData); … … 461 466 462 467 CContext* context = CContext::getCurrent(); 463 if (!context->hasServer) context->checkBuffersAndListen(); 468 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 469 context->checkBuffersAndListen(); 464 470 465 471 CArray<float, 1> data_tmp(data_k4, shape(data_Xsize), neverDeleteData); … … 481 487 482 488 CContext* context = CContext::getCurrent(); 483 if (!context->hasServer) context->checkBuffersAndListen(); 489 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 490 context->checkBuffersAndListen(); 484 491 485 492 CArray<float, 2> data_tmp(data_k4, shape(data_Xsize, data_Ysize), neverDeleteData); … … 501 508 502 509 CContext* context = CContext::getCurrent(); 503 if (!context->hasServer) context->checkBuffersAndListen(); 510 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 511 context->checkBuffersAndListen(); 504 512 505 513 CArray<float, 3> data_tmp(data_k4, shape(data_Xsize, data_Ysize, data_Zsize), neverDeleteData); … … 523 531 524 532 CContext* context = CContext::getCurrent(); 525 if (!context->hasServer) context->checkBuffersAndListen(); 533 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 534 context->checkBuffersAndListen(); 526 535 527 536 CArray<double, 1> data(data_k8, shape(data_Xsize), neverDeleteData); … … 541 550 542 551 CContext* context = CContext::getCurrent(); 543 if (!context->hasServer) context->checkBuffersAndListen(); 552 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 553 context->checkBuffersAndListen(); 544 554 545 555 CArray<double, 2>data(data_k8, shape(data_Xsize, data_Ysize), neverDeleteData); … … 559 569 560 570 CContext* context = CContext::getCurrent(); 561 if (!context->hasServer) context->checkBuffersAndListen(); 571 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 572 context->checkBuffersAndListen(); 562 573 563 574 CArray<double, 3>data(data_k8, shape(data_Xsize, data_Ysize, data_Zsize), neverDeleteData); … … 577 588 578 589 CContext* context = CContext::getCurrent(); 579 if (!context->hasServer) context->checkBuffersAndListen(); 590 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 591 context->checkBuffersAndListen(); 580 592 581 593 CArray<double, 1> data(data_Xsize); … … 597 609 598 610 CContext* context = CContext::getCurrent(); 599 if (!context->hasServer) context->checkBuffersAndListen(); 611 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 612 context->checkBuffersAndListen(); 600 613 601 614 CArray<double, 2> data(data_Xsize, data_Ysize); … … 617 630 618 631 CContext* context = CContext::getCurrent(); 619 if (!context->hasServer) context->checkBuffersAndListen(); 632 if (!context->hasServer && !context->client->isAttachedModeEnabled()) 633 context->checkBuffersAndListen(); 620 634 621 635 CArray<double, 3> data(data_Xsize, data_Ysize, data_Zsize);
Note: See TracChangeset
for help on using the changeset viewer.