Ignore:
Timestamp:
01/25/23 16:59:46 (17 months ago)
Author:
ymipsl
Message:

Merge XIOS_FILE_SERVICE dev branch into trunk

YM

Location:
XIOS3/trunk
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed

  • XIOS3/trunk

  • XIOS3/trunk/src/config/context_attribute.conf

    r1761 r2458  
    11DECLARE_ATTRIBUTE(StdString, output_dir) 
    22DECLARE_ATTRIBUTE(bool, attached_mode) 
     3DECLARE_ATTRIBUTE(StdString, default_pool) 
     4DECLARE_ATTRIBUTE(StdString, default_pool_writer) 
     5DECLARE_ATTRIBUTE(StdString, default_pool_reader) 
     6DECLARE_ATTRIBUTE(StdString, default_pool_gatherer) 
     7DECLARE_ATTRIBUTE(StdString, default_writer) 
     8DECLARE_ATTRIBUTE(StdString, default_gatherer) 
     9DECLARE_ATTRIBUTE(StdString, default_reader) 
     10DECLARE_ATTRIBUTE(bool, default_using_server2) 

  • XIOS3/trunk/src/config/file_attribute.conf

    r1493 r2458  
    3838DECLARE_ATTRIBUTE(StdString, uuid_name) 
    3939DECLARE_ATTRIBUTE(StdString, uuid_format) 
     40 
     41DECLARE_ATTRIBUTE(StdString, pool_writer) 
     42DECLARE_ATTRIBUTE(StdString, writer) 
     43DECLARE_ATTRIBUTE(StdString, pool_gatherer) 
     44DECLARE_ATTRIBUTE(StdString, gatherer) 
     45DECLARE_ATTRIBUTE(StdString, pool_reader) 
     46DECLARE_ATTRIBUTE(StdString, reader) 
     47DECLARE_ATTRIBUTE(bool, using_server2) 

  • XIOS3/trunk/src/config/node_type.conf

    r2408 r2458  
    128128#endif //__XIOS_CPoolNode__ 
    129129 
     130#ifdef __XIOS_CServiceNode__ 
     131   DECLARE_NODE(ServiceNode, node) 
     132#endif //__XIOS_CServiceNode__ 
     133 
    130134#ifdef __XIOS_CContext__ 
    131135   DECLARE_NODE_PAR(Context, context) 

  • XIOS3/trunk/src/config/pool_attribute.conf

    r2408 r2458  
    11DECLARE_ATTRIBUTE(StdString, name) 
     2DECLARE_ATTRIBUTE(int, nprocs) 
     3DECLARE_ATTRIBUTE(double, global_fraction) 
     4DECLARE_ATTRIBUTE(double, remain_fraction) 
     5DECLARE_ATTRIBUTE(bool, remain) 
Note: See TracChangeset for help on using the changeset viewer.