- Timestamp:
- 09/18/13 18:25:47 (11 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/duration.cpp
r436 r448 45 45 { 46 46 duration.year = duration.month = duration.day = 47 duration.hour = duration.minute = duration.second = 0.0;47 duration.hour = duration.minute = duration.second = duration.timestep=0.0; 48 48 double v = 1.0; 49 49 char c = '/'; … … 109 109 { 110 110 CDuration timeStep=c.getTimeStep() ; 111 second +=time Step.second ;112 minute +=time Step.minute ;113 hour +=time Step.hour ;114 day +=time Step.day ;115 month +=time Step.month ;116 year +=time Step.year ;111 second +=timestep*timeStep.second ; 112 minute +=timestep*timeStep.minute ; 113 hour +=timestep*timeStep.hour ; 114 day +=timestep*timeStep.day ; 115 month +=timestep*timeStep.month ; 116 year +=timestep*timeStep.year ; 117 117 timestep = 0 ; 118 return (*this); 118 119 119 } 120 120 -
XIOS/trunk/src/interface/c/icdate.cpp
r403 r448 29 29 { 30 30 CTimer::get("XIOS").resume() ; 31 CDuration dur = {ts_year, ts_month, ts_day, ts_hour, ts_minute, ts_second };31 CDuration dur = {ts_year, ts_month, ts_day, ts_hour, ts_minute, ts_second, 0}; 32 32 xios::CContext* context = CContext::getCurrent() ; 33 33 -
XIOS/trunk/src/output/nc4_data_output.cpp
r444 r448 461 461 CDuration duration ; 462 462 463 duration .FromString(field->freq_op) ;463 duration=CDuration::FromString(field->freq_op) ; 464 464 duration.solveTimeStep(*(context->calendar)); 465 465 SuperClassWriter::addAttribute("interval_operation", duration.toString(), &fieldid); 466 466 467 duration .FromString(field->getRelFile()->output_freq) ;467 duration=CDuration::FromString(field->getRelFile()->output_freq) ; 468 468 duration.solveTimeStep(*(context->calendar)); 469 469 SuperClassWriter::addAttribute("interval_write", duration.toString(), &fieldid);
Note: See TracChangeset
for help on using the changeset viewer.