Ignore:
Timestamp:
07/10/17 18:17:04 (7 years ago)
Author:
yushan
Message:

branch merged with trunk @1200

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_yushan_merged/src/config/file_attribute.conf

    r1160 r1205  
    1010DECLARE_ATTRIBUTE(CDuration, split_freq) 
    1111DECLARE_ATTRIBUTE(StdString, split_freq_format) 
     12DECLARE_ATTRIBUTE(CDuration, split_start_offset) 
     13DECLARE_ATTRIBUTE(CDuration, split_end_offset) 
     14DECLARE_ATTRIBUTE(string,     split_last_date) 
    1215DECLARE_ATTRIBUTE(bool,      enabled) 
    1316DECLARE_ENUM2(type,          one_file, multiple_file) 
    1417DECLARE_ENUM2(format,        netcdf4, netcdf4_classic) 
    1518DECLARE_ENUM2(convention,    CF, UGRID) 
     19DECLARE_ATTRIBUTE(StdString, convention_str) 
    1620DECLARE_ENUM2(par_access,    collective, independent) 
    1721DECLARE_ATTRIBUTE(bool,      append) 
Note: See TracChangeset for help on using the changeset viewer.