Ignore:
Timestamp:
06/06/17 17:58:16 (7 years ago)
Author:
oabramkina
Message:

Two server levels: merging with trunk r1137.
There are bugs.

Location:
XIOS/dev/dev_olga/src/config
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • XIOS/dev/dev_olga/src/config/axis_attribute.conf

    r1025 r1158  
    66 
    77DECLARE_ATTRIBUTE(int,       n_glo) 
    8 DECLARE_ENUM2(positive, up, down)                
     8DECLARE_ENUM2(positive, up, down) 
    99 
    1010/* GLOBAL */ 
    … …  
    2929DECLARE_ARRAY(bool, 1 , mask) 
    3030DECLARE_ARRAY(double, 2 , bounds) 
     31DECLARE_ATTRIBUTE(int,       prec) 
     32DECLARE_ARRAY(StdString    ,1    , label) 

  • XIOS/dev/dev_olga/src/config/domain_attribute.conf

    r1025 r1158  
    5353DECLARE_ENUM4(type,rectilinear,curvilinear,unstructured, gaussian) 
    5454DECLARE_ATTRIBUTE(StdString, domain_ref) 
     55DECLARE_ATTRIBUTE(int,       prec) 

  • XIOS/dev/dev_olga/src/config/domain_attribute_private.conf

    r1099 r1158  
    1414DECLARE_ARRAY_PRIVATE(double, 1, latvalue_rectilinear_read_from_file) 
    1515 
     16// Array contain whole value (non distributed) of longitude and latitude of curvilinear read from a file 
     17DECLARE_ARRAY_PRIVATE(double, 2, lonvalue_curvilinear_read_from_file) 
     18DECLARE_ARRAY_PRIVATE(double, 2, latvalue_curvilinear_read_from_file) 
     19DECLARE_ARRAY_PRIVATE(double, 3, bounds_lonvalue_curvilinear_read_from_file) 
     20DECLARE_ARRAY_PRIVATE(double, 3, bounds_latvalue_curvilinear_read_from_file) 
     21 
     22// Array contain whole value (non distributed) of longitude and latitude of unstructured read from a file 
     23DECLARE_ARRAY_PRIVATE(double, 1, lonvalue_unstructured_read_from_file) 
     24DECLARE_ARRAY_PRIVATE(double, 1, latvalue_unstructured_read_from_file) 
     25DECLARE_ARRAY_PRIVATE(double, 2, bounds_lonvalue_unstructured_read_from_file) 
     26DECLARE_ARRAY_PRIVATE(double, 2, bounds_latvalue_unstructured_read_from_file) 
     27 
    1628DECLARE_ATTRIBUTE_PRIVATE(int,  global_zoom_ibegin) 
    1729DECLARE_ATTRIBUTE_PRIVATE(int,  global_zoom_ni) 

  • XIOS/dev/dev_olga/src/config/expand_domain_attribute.conf

    r941 r1158  
    22 
    33DECLARE_ENUM2(type,node,edge) 
     4 
     5// Flag to determine if domain expension should be periodic (and in which direction) 
     6DECLARE_ATTRIBUTE(bool,      i_periodic) 
     7DECLARE_ATTRIBUTE(bool,      j_periodic) 

  • XIOS/dev/dev_olga/src/config/file_attribute.conf

    r983 r1158  
    1414DECLARE_ENUM2(format,        netcdf4, netcdf4_classic) 
    1515DECLARE_ENUM2(convention,    CF, UGRID) 
     16DECLARE_ATTRIBUTE(StdString, convention_str) 
    1617DECLARE_ENUM2(par_access,    collective, independent) 
    1718DECLARE_ATTRIBUTE(bool,      append) 
    1819DECLARE_ENUM2(mode,          read, write) 
    19 DECLARE_ENUM4(time_counter,  centered, instant, record, none) 
     20DECLARE_ENUM7(time_counter,  centered, instant, record, exclusive, centered_exclusive, instant_exclusive, none) 
    2021DECLARE_ATTRIBUTE(StdString, time_counter_name) 
     22DECLARE_ENUM2(time_units, seconds, days) 
    2123DECLARE_ATTRIBUTE(int,       record_offset) 
    2224DECLARE_ATTRIBUTE(bool,      cyclic) 
    2325 
    2426DECLARE_ATTRIBUTE(int,       compression_level) 
    25 DECLARE_ATTRIBUTE(bool,      coupler) 
    2627 
    2728DECLARE_ENUM4(timeseries,    none, only, both, exclusive) 
    2829DECLARE_ATTRIBUTE(StdString, ts_prefix) 
    29  
     30DECLARE_ATTRIBUTE(StdString, time_stamp_name) 
     31DECLARE_ATTRIBUTE(StdString, time_stamp_format) 
     32DECLARE_ATTRIBUTE(StdString, uuid_name) 
     33DECLARE_ATTRIBUTE(StdString, uuid_format) 

  • XIOS/dev/dev_olga/src/config/interpolate_domain_attribute.conf

    r1021 r1158  
    11/* GLOBAL */ 
    2 DECLARE_ATTRIBUTE(StdString, file) 
    32DECLARE_ATTRIBUTE(int, order) 
    43DECLARE_ATTRIBUTE(bool, renormalize) 
     4DECLARE_ATTRIBUTE(bool, quantity) 
    55 
    66/* Write interpolation weights into file */ 

  • XIOS/dev/dev_olga/src/config/scalar_attribute.conf

    r887 r1158  
    99 
    1010DECLARE_ATTRIBUTE(StdString, scalar_ref) 
     11DECLARE_ATTRIBUTE(int, prec) 

  • XIOS/dev/dev_olga/src/config/var_attribute.conf

    r527 r1158  
    11DECLARE_TYPE(type) 
    22DECLARE_ATTRIBUTE(StdString, name) 
     3DECLARE_ENUM4(ts_target, file, field, both, none) 
Note: See TracChangeset for help on using the changeset viewer.