Changeset 541 for XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp

Timestamp:

12/16/14 12:55:59 (10 years ago)

Author:

mhnguyen

Message:

Replacing some attribute files with new ones

File:

• XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp (modified) (2 diffs)

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

@@ -18 +18 @@
   typedef xios::CGrid*  grid_Ptr;
   
-  void cxios_set_grid_axis_ref(grid_Ptr grid_hdl, const char * axis_ref, int axis_ref_size)
+  void cxios_set_grid_axisDomOrder(grid_Ptr grid_hdl, int* axisDomOrder, int extent1)
   {
-    std::string axis_ref_str;
-    if(!cstr2string(axis_ref, axis_ref_size, axis_ref_str)) return;
-     CTimer::get("XIOS").resume();
-    grid_hdl->axis_ref.setValue(axis_ref_str);
+    CTimer::get("XIOS").resume();
+    CArray<int,1> tmp(axisDomOrder,shape(extent1),neverDeleteData) ;
+    grid_hdl->axisDomOrder.reference(tmp.copy());
      CTimer::get("XIOS").suspend();
   }
   
-  void cxios_get_grid_axis_ref(grid_Ptr grid_hdl, char * axis_ref, int axis_ref_size)
+  void cxios_get_grid_axisDomOrder(grid_Ptr grid_hdl, int* axisDomOrder, int extent1)
   {
-     CTimer::get("XIOS").resume();
-    if(!string_copy(grid_hdl->axis_ref.getInheritedValue(),axis_ref , axis_ref_size))
-      ERROR("void cxios_get_grid_axis_ref(grid_Ptr grid_hdl, char * axis_ref, int axis_ref_size)", <<"Input string is to short");
+    CTimer::get("XIOS").resume();
+    CArray<int,1> tmp(axisDomOrder,shape(extent1),neverDeleteData) ;
+    tmp=grid_hdl->axisDomOrder.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
   
-  bool cxios_is_defined_grid_axis_ref(grid_Ptr grid_hdl )
+  bool cxios_is_defined_grid_axisDomOrder(grid_Ptr grid_hdl )
   {
      CTimer::get("XIOS").resume();
-    return grid_hdl->axis_ref.hasInheritedValue();
+    return grid_hdl->axisDomOrder.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -65 +64 @@
      CTimer::get("XIOS").resume();
     return grid_hdl->description.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
-  }
-  
-  
-  
-  void cxios_set_grid_domain_ref(grid_Ptr grid_hdl, const char * domain_ref, int domain_ref_size)
-  {
-    std::string domain_ref_str;
-    if(!cstr2string(domain_ref, domain_ref_size, domain_ref_str)) return;
-     CTimer::get("XIOS").resume();
-    grid_hdl->domain_ref.setValue(domain_ref_str);
-     CTimer::get("XIOS").suspend();
-  }
-  
-  void cxios_get_grid_domain_ref(grid_Ptr grid_hdl, char * domain_ref, int domain_ref_size)
-  {
-     CTimer::get("XIOS").resume();
-    if(!string_copy(grid_hdl->domain_ref.getInheritedValue(),domain_ref , domain_ref_size))
-      ERROR("void cxios_get_grid_domain_ref(grid_Ptr grid_hdl, char * domain_ref, int domain_ref_size)", <<"Input string is to short");
-     CTimer::get("XIOS").suspend();
-  }
-  
-  bool cxios_is_defined_grid_domain_ref(grid_Ptr grid_hdl )
-  {
-     CTimer::get("XIOS").resume();
-    return grid_hdl->domain_ref.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }