Changeset 1358 for XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp
- Timestamp:
- 12/06/17 08:34:41 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp
r1344 r1358 42 42 , wasDataRequestedFromServer(false) 43 43 , wasDataAlreadyReceivedFromServer(false) 44 , mustAutoTrigger(false) 44 45 , isEOF(false), nstepMaxRead(false) 45 46 { setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group")); } … … 58 59 , wasDataRequestedFromServer(false) 59 60 , wasDataAlreadyReceivedFromServer(false) 61 , mustAutoTrigger(false) 60 62 , isEOF(false), nstepMaxRead(false) 61 63 { setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group")); } … … 569 571 570 572 // Check if data previously requested has been received as expected 571 if (wasDataRequestedFromServer && (!isEOF || currentDate <= dateEOF))573 if (wasDataRequestedFromServer && !isEOF) 572 574 { 573 575 CTimer timer("CField::checkForLateDataFromServer"); … … 577 579 { 578 580 const CDate nextDataDue = wasDataAlreadyReceivedFromServer ? (lastDataReceivedFromServer + file->output_freq) : context->getCalendar()->getInitDate(); 579 isDataLate = nextDataDue < currentDate;581 isDataLate = (nextDataDue <= currentDate); 580 582 581 583 if (isDataLate) … … 594 596 << "Late data at timestep = " << currentDate); 595 597 } 598 } 599 600 void CField::checkIfMustAutoTrigger(void) 601 { 602 mustAutoTrigger = serverSourceFilter ? serverSourceFilter->mustAutoTrigger() : false; 603 } 604 605 void CField::autoTriggerIfNeeded(void) 606 { 607 if (mustAutoTrigger) 608 serverSourceFilter->trigger(CContext::getCurrent()->getCalendar()->getCurrentDate()); 596 609 } 597 610
Note: See TracChangeset
for help on using the changeset viewer.