Changeset 1321 for XIOS/trunk
- Timestamp:
- 10/30/17 14:41:06 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/node/field.cpp
r1319 r1321 479 479 480 480 // Check if data previously requested has been received as expected 481 if (wasDataRequestedFromServer && (!isEOF || c ontext->getCalendar()->getCurrentDate()<= dateEOF))481 if (wasDataRequestedFromServer && (!isEOF || currentDate <= dateEOF)) 482 482 { 483 483 CTimer timer("CField::checkForLateDataFromServer"); 484 485 bool isDataLate = !wasDataAlreadyReceivedFromServer || lastDataReceivedFromServer + file->output_freq < currentDate; 484 const CDate nextDataDue = wasDataAlreadyReceivedFromServer ? (lastDataReceivedFromServer + file->output_freq) : context->getCalendar()->getInitDate(); 485 486 bool isDataLate = nextDataDue < currentDate; 486 487 while (isDataLate && timer.getCumulatedTime() < CXios::recvFieldTimeout) 487 488 { … … 492 493 timer.suspend(); 493 494 494 isDataLate = !wasDataAlreadyReceivedFromServer || lastDataReceivedFromServer + file->output_freq< currentDate;495 isDataLate = nextDataDue < currentDate; 495 496 } 496 497
Note: See TracChangeset
for help on using the changeset viewer.