Changeset 1358 for XIOS/trunk/src/node/field.cpp
- Timestamp:
- 12/06/17 08:34:41 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/node/field.cpp
r1326 r1358 40 40 , wasDataRequestedFromServer(false) 41 41 , wasDataAlreadyReceivedFromServer(false) 42 , mustAutoTrigger(false) 42 43 , isEOF(false) 43 44 { setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group")); } … … 55 56 , wasDataRequestedFromServer(false) 56 57 , wasDataAlreadyReceivedFromServer(false) 58 , mustAutoTrigger(false) 57 59 , isEOF(false) 58 60 { setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group")); } … … 479 481 480 482 // Check if data previously requested has been received as expected 481 if (wasDataRequestedFromServer && (!isEOF || currentDate <= dateEOF))483 if (wasDataRequestedFromServer && !isEOF) 482 484 { 483 485 CTimer timer("CField::checkForLateDataFromServer"); … … 487 489 { 488 490 const CDate nextDataDue = wasDataAlreadyReceivedFromServer ? (lastDataReceivedFromServer + file->output_freq) : context->getCalendar()->getInitDate(); 489 isDataLate = nextDataDue < currentDate;491 isDataLate = (nextDataDue <= currentDate); 490 492 491 493 if (isDataLate) … … 504 506 << "Late data at timestep = " << currentDate); 505 507 } 508 } 509 510 void CField::checkIfMustAutoTrigger(void) 511 { 512 mustAutoTrigger = serverSourceFilter ? serverSourceFilter->mustAutoTrigger() : false; 513 } 514 515 void CField::autoTriggerIfNeeded(void) 516 { 517 if (mustAutoTrigger) 518 serverSourceFilter->trigger(CContext::getCurrent()->getCalendar()->getCurrentDate()); 506 519 } 507 520
Note: See TracChangeset
for help on using the changeset viewer.