Changeset 444
- Timestamp:
- 06/19/13 10:04:28 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/output/nc4_data_output.cpp
r437 r444 571 571 572 572 CArray<double,1> time_data(1) ; 573 574 if (field->operation.getValue()=="instant") time_data(0) = Time(*field->last_Write_srv) 573 574 bool wtime = !(!field->operation.isEmpty() && 575 ( field->operation.getValue().compare("once") == 0)); 576 577 if (wtime) 578 { 579 if (field->operation.getValue()=="instant") time_data(0) = Time(*field->last_Write_srv) 575 580 -Time(context->calendar->getTimeOrigin()); 576 else time_data(0) = (Time(*field->last_Write_srv)+Time(*field->lastlast_Write_srv))/2 577 -Time(context->calendar->getTimeOrigin()); 581 else time_data(0) = (Time(*field->last_Write_srv)+Time(*field->lastlast_Write_srv))/2 582 -Time(context->calendar->getTimeOrigin()); 583 } 578 584 579 585 … … 593 599 { 594 600 SuperClassWriter::writeData(field_data3D, fieldid, isCollective, field->getNStep()-1); 595 SuperClassWriter::writeData(time_data, oss.str(), isCollective, field->getNStep()-1);601 if (wtime) SuperClassWriter::writeData(time_data, oss.str(), isCollective, field->getNStep()-1); 596 602 break ; 597 603 } … … 612 618 } 613 619 SuperClassWriter::writeData(field_data3D, fieldid, isCollective, field->getNStep()-1,&start,&count ); 614 SuperClassWriter::writeTimeAxisData(time_data, oss.str(), isCollective, field->getNStep()-1,isRoot );620 if (wtime) SuperClassWriter::writeTimeAxisData(time_data, oss.str(), isCollective, field->getNStep()-1,isRoot ); 615 621 break; 616 622 } … … 628 634 { 629 635 SuperClassWriter::writeData(field_data2D, fieldid, isCollective, field->getNStep()-1); 630 SuperClassWriter::writeData(time_data, oss.str(), isCollective, field->getNStep()-1);636 if (wtime) SuperClassWriter::writeData(time_data, oss.str(), isCollective, field->getNStep()-1); 631 637 break; 632 638 } … … 647 653 648 654 SuperClassWriter::writeData(field_data2D, fieldid, isCollective, field->getNStep()-1,&start,&count); 649 SuperClassWriter::writeTimeAxisData(time_data, oss.str(), isCollective, field->getNStep()-1,isRoot);655 if (wtime) SuperClassWriter::writeTimeAxisData(time_data, oss.str(), isCollective, field->getNStep()-1,isRoot); 650 656 break; 651 657 … … 662 668 { 663 669 StdOStringStream oss; 670 671 if (field->operation.getValue().compare("once") == 0) return ; 672 664 673 oss << "time_" << field->operation.getValue() 665 674 << "_" << field->getRelFile()->output_freq.getValue();
Note: See TracChangeset
for help on using the changeset viewer.