Ignore:
Timestamp:
02/11/15 16:23:02 (9 years ago)
Author:
mhnguyen
Message:

Redesigning grid structure

+) Add an intermediate class to calculate distribution on client and servers
+) Change all index of attributes to zero (0), instead of one(1)

Test
+) On Curie
+) Test new features passes but some data are still shifted

Location:
XIOS/trunk/src/interface/c_attr
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp

    r541 r551  
    1717{ 
    1818  typedef xios::CGrid*  grid_Ptr; 
    19    
    20   void cxios_set_grid_axisDomOrder(grid_Ptr grid_hdl, int* axisDomOrder, int extent1) 
     19 
     20  void cxios_set_grid_axisDomOrder(grid_Ptr grid_hdl, bool* axisDomainOrder, int extent1) 
    2121  { 
    2222    CTimer::get("XIOS").resume(); 
    23     CArray<int,1> tmp(axisDomOrder,shape(extent1),neverDeleteData) ; 
    24     grid_hdl->axisDomOrder.reference(tmp.copy()); 
     23    CArray<bool,1> tmp(axisDomainOrder,shape(extent1),neverDeleteData) ; 
     24    grid_hdl->axisDomainOrder.reference(tmp.copy()); 
    2525     CTimer::get("XIOS").suspend(); 
    2626  } 
    27    
    28   void cxios_get_grid_axisDomOrder(grid_Ptr grid_hdl, int* axisDomOrder, int extent1) 
     27 
     28  void cxios_get_grid_axisDomOrder(grid_Ptr grid_hdl, bool* axisDomainOrder, int extent1) 
    2929  { 
    3030    CTimer::get("XIOS").resume(); 
    31     CArray<int,1> tmp(axisDomOrder,shape(extent1),neverDeleteData) ; 
    32     tmp=grid_hdl->axisDomOrder.getInheritedValue() ; 
     31    CArray<bool,1> tmp(axisDomainOrder,shape(extent1),neverDeleteData) ; 
     32    tmp=grid_hdl->axisDomainOrder.getInheritedValue() ; 
    3333     CTimer::get("XIOS").suspend(); 
    3434  } 
    35    
     35 
    3636  bool cxios_is_defined_grid_axisDomOrder(grid_Ptr grid_hdl ) 
    3737  { 
    3838     CTimer::get("XIOS").resume(); 
    39     return grid_hdl->axisDomOrder.hasInheritedValue(); 
     39    return grid_hdl->axisDomainOrder.hasInheritedValue(); 
    4040     CTimer::get("XIOS").suspend(); 
    4141  } 
    42    
    43    
    44    
     42 
     43 
     44 
    4545  void cxios_set_grid_description(grid_Ptr grid_hdl, const char * description, int description_size) 
    4646  { 
    … …  
    5151     CTimer::get("XIOS").suspend(); 
    5252  } 
    53    
     53 
    5454  void cxios_get_grid_description(grid_Ptr grid_hdl, char * description, int description_size) 
    5555  { 
    … …  
    5959     CTimer::get("XIOS").suspend(); 
    6060  } 
    61    
     61 
    6262  bool cxios_is_defined_grid_description(grid_Ptr grid_hdl ) 
    6363  { 
    … …  
    6666     CTimer::get("XIOS").suspend(); 
    6767  } 
    68    
    69    
    70    
     68 
     69 
     70 
    7171  void cxios_set_grid_mask(grid_Ptr grid_hdl, bool* mask, int extent1, int extent2, int extent3) 
    7272  { 
    … …  
    7676     CTimer::get("XIOS").suspend(); 
    7777  } 
    78    
     78 
    7979  void cxios_get_grid_mask(grid_Ptr grid_hdl, bool* mask, int extent1, int extent2, int extent3) 
    8080  { 
    … …  
    8484     CTimer::get("XIOS").suspend(); 
    8585  } 
    86    
     86 
    8787  bool cxios_is_defined_grid_mask(grid_Ptr grid_hdl ) 
    8888  { 
    … …  
    9191     CTimer::get("XIOS").suspend(); 
    9292  } 
    93    
    94    
    95    
     93 
     94 
     95 
    9696  void cxios_set_grid_name(grid_Ptr grid_hdl, const char * name, int name_size) 
    9797  { 
    … …  
    102102     CTimer::get("XIOS").suspend(); 
    103103  } 
    104    
     104 
    105105  void cxios_get_grid_name(grid_Ptr grid_hdl, char * name, int name_size) 
    106106  { 
    … …  
    110110     CTimer::get("XIOS").suspend(); 
    111111  } 
    112    
     112 
    113113  bool cxios_is_defined_grid_name(grid_Ptr grid_hdl ) 
    114114  { 
    … …  
    117117     CTimer::get("XIOS").suspend(); 
    118118  } 
    119    
    120    
    121    
    122    
     119 
     120 
     121 
     122 
    123123} 

  • XIOS/trunk/src/interface/c_attr/icgridgroup_attr.cpp

    r541 r551  
    1717{ 
    1818  typedef xios::CGridGroup*  gridgroup_Ptr; 
    19    
    20   void cxios_set_gridgroup_axisDomOrder(gridgroup_Ptr gridgroup_hdl, int* axisDomOrder, int extent1) 
     19 
     20  void cxios_set_gridgroup_axisDomOrder(gridgroup_Ptr gridgroup_hdl, bool* axisDomainOrder, int extent1) 
    2121  { 
    2222    CTimer::get("XIOS").resume(); 
    23     CArray<int,1> tmp(axisDomOrder,shape(extent1),neverDeleteData) ; 
    24     gridgroup_hdl->axisDomOrder.reference(tmp.copy()); 
     23    CArray<bool,1> tmp(axisDomainOrder,shape(extent1),neverDeleteData) ; 
     24    gridgroup_hdl->axisDomainOrder.reference(tmp.copy()); 
    2525     CTimer::get("XIOS").suspend(); 
    2626  } 
    27    
    28   void cxios_get_gridgroup_axisDomOrder(gridgroup_Ptr gridgroup_hdl, int* axisDomOrder, int extent1) 
     27 
     28  void cxios_get_gridgroup_axisDomOrder(gridgroup_Ptr gridgroup_hdl, bool* axisDomainOrder, int extent1) 
    2929  { 
    3030    CTimer::get("XIOS").resume(); 
    31     CArray<int,1> tmp(axisDomOrder,shape(extent1),neverDeleteData) ; 
    32     tmp=gridgroup_hdl->axisDomOrder.getInheritedValue() ; 
     31    CArray<bool,1> tmp(axisDomainOrder,shape(extent1),neverDeleteData) ; 
     32    tmp=gridgroup_hdl->axisDomainOrder.getInheritedValue() ; 
    3333     CTimer::get("XIOS").suspend(); 
    3434  } 
    35    
     35 
    3636  bool cxios_is_defined_gridgroup_axisDomOrder(gridgroup_Ptr gridgroup_hdl ) 
    3737  { 
    3838     CTimer::get("XIOS").resume(); 
    39     return gridgroup_hdl->axisDomOrder.hasInheritedValue(); 
     39    return gridgroup_hdl->axisDomainOrder.hasInheritedValue(); 
    4040     CTimer::get("XIOS").suspend(); 
    4141  } 
    42    
    43    
    44    
     42 
     43 
     44 
    4545  void cxios_set_gridgroup_description(gridgroup_Ptr gridgroup_hdl, const char * description, int description_size) 
    4646  { 
    … …  
    5151     CTimer::get("XIOS").suspend(); 
    5252  } 
    53    
     53 
    5454  void cxios_get_gridgroup_description(gridgroup_Ptr gridgroup_hdl, char * description, int description_size) 
    5555  { 
    … …  
    5959     CTimer::get("XIOS").suspend(); 
    6060  } 
    61    
     61 
    6262  bool cxios_is_defined_gridgroup_description(gridgroup_Ptr gridgroup_hdl ) 
    6363  { 
    … …  
    6666     CTimer::get("XIOS").suspend(); 
    6767  } 
    68    
    69    
    70    
     68 
     69 
     70 
    7171  void cxios_set_gridgroup_group_ref(gridgroup_Ptr gridgroup_hdl, const char * group_ref, int group_ref_size) 
    7272  { 
    … …  
    7777     CTimer::get("XIOS").suspend(); 
    7878  } 
    79    
     79 
    8080  void cxios_get_gridgroup_group_ref(gridgroup_Ptr gridgroup_hdl, char * group_ref, int group_ref_size) 
    8181  { 
    … …  
    8585     CTimer::get("XIOS").suspend(); 
    8686  } 
    87    
     87 
    8888  bool cxios_is_defined_gridgroup_group_ref(gridgroup_Ptr gridgroup_hdl ) 
    8989  { 
    … …  
    9292     CTimer::get("XIOS").suspend(); 
    9393  } 
    94    
    95    
    96    
     94 
     95 
     96 
    9797  void cxios_set_gridgroup_mask(gridgroup_Ptr gridgroup_hdl, bool* mask, int extent1, int extent2, int extent3) 
    9898  { 
    … …  
    102102     CTimer::get("XIOS").suspend(); 
    103103  } 
    104    
     104 
    105105  void cxios_get_gridgroup_mask(gridgroup_Ptr gridgroup_hdl, bool* mask, int extent1, int extent2, int extent3) 
    106106  { 
    … …  
    110110     CTimer::get("XIOS").suspend(); 
    111111  } 
    112    
     112 
    113113  bool cxios_is_defined_gridgroup_mask(gridgroup_Ptr gridgroup_hdl ) 
    114114  { 
    … …  
    117117     CTimer::get("XIOS").suspend(); 
    118118  } 
    119    
    120    
    121    
     119 
     120 
     121 
    122122  void cxios_set_gridgroup_name(gridgroup_Ptr gridgroup_hdl, const char * name, int name_size) 
    123123  { 
    … …  
    128128     CTimer::get("XIOS").suspend(); 
    129129  } 
    130    
     130 
    131131  void cxios_get_gridgroup_name(gridgroup_Ptr gridgroup_hdl, char * name, int name_size) 
    132132  { 
    … …  
    136136     CTimer::get("XIOS").suspend(); 
    137137  } 
    138    
     138 
    139139  bool cxios_is_defined_gridgroup_name(gridgroup_Ptr gridgroup_hdl ) 
    140140  { 
    … …  
    143143     CTimer::get("XIOS").suspend(); 
    144144  } 
    145    
    146    
    147    
    148    
     145 
     146 
     147 
     148 
    149149} 
Note: See TracChangeset for help on using the changeset viewer.