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

Timestamp:

03/24/15 11:21:45 (9 years ago)

Author:

rlacroix

Message:

Fix the Fortran interface generation to avoid generating dead code that caused a timer not to be stopped.

File:

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

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

@@ -1 +1 @@
 /* ************************************************************************** *
- *               Interface auto generated - do not modify                   *
+ *               Interface auto generated - do not modify                     *
  * ************************************************************************** */
 
@@ -16 +16 @@
 extern "C"
 {
-  typedef xios::CGrid*  grid_Ptr;
-  
+  typedef xios::CGrid* grid_Ptr;
+
   void cxios_set_grid_axis_domain_order(grid_Ptr grid_hdl, bool* axis_domain_order, int extent1)
   {
     CTimer::get("XIOS").resume();
-    CArray<bool,1> tmp(axis_domain_order,shape(extent1),neverDeleteData) ;
+    CArray<bool,1> tmp(axis_domain_order, shape(extent1), neverDeleteData);
     grid_hdl->axis_domain_order.reference(tmp.copy());
      CTimer::get("XIOS").suspend();
   }
-  
+
   void cxios_get_grid_axis_domain_order(grid_Ptr grid_hdl, bool* axis_domain_order, int extent1)
   {
     CTimer::get("XIOS").resume();
-    CArray<bool,1> tmp(axis_domain_order,shape(extent1),neverDeleteData) ;
-    tmp=grid_hdl->axis_domain_order.getInheritedValue() ;
+    CArray<bool,1> tmp(axis_domain_order, shape(extent1), neverDeleteData);
+    tmp=grid_hdl->axis_domain_order.getInheritedValue();
      CTimer::get("XIOS").suspend();
   }
-  
-  bool cxios_is_defined_grid_axis_domain_order(grid_Ptr grid_hdl )
+
+  bool cxios_is_defined_grid_axis_domain_order(grid_Ptr grid_hdl)
   {
      CTimer::get("XIOS").resume();
-    return grid_hdl->axis_domain_order.hasInheritedValue();
+     bool isDefined = grid_hdl->axis_domain_order.hasInheritedValue();
      CTimer::get("XIOS").suspend();
+     return isDefined;
   }
-  
-  
-  
+
+
   void cxios_set_grid_description(grid_Ptr grid_hdl, const char * description, int description_size)
   {
     std::string description_str;
-    if(!cstr2string(description, description_size, description_str)) return;
-     CTimer::get("XIOS").resume();
+    if (!cstr2string(description, description_size, description_str)) return;
+    CTimer::get("XIOS").resume();
     grid_hdl->description.setValue(description_str);
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").suspend();
   }
-  
+
   void cxios_get_grid_description(grid_Ptr grid_hdl, char * description, int description_size)
   {
-     CTimer::get("XIOS").resume();
-    if(!string_copy(grid_hdl->description.getInheritedValue(),description , description_size))
-      ERROR("void cxios_get_grid_description(grid_Ptr grid_hdl, char * description, int description_size)", <<"Input string is to short");
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    if (!string_copy(grid_hdl->description.getInheritedValue(), description, description_size))
+      ERROR("void cxios_get_grid_description(grid_Ptr grid_hdl, char * description, int description_size)", << "Input string is too short");
+    CTimer::get("XIOS").suspend();
   }
-  
-  bool cxios_is_defined_grid_description(grid_Ptr grid_hdl )
+
+  bool cxios_is_defined_grid_description(grid_Ptr grid_hdl)
   {
      CTimer::get("XIOS").resume();
-    return grid_hdl->description.hasInheritedValue();
+     bool isDefined = grid_hdl->description.hasInheritedValue();
      CTimer::get("XIOS").suspend();
+     return isDefined;
   }
-  
-  
-  
+
+
   void cxios_set_grid_mask1(grid_Ptr grid_hdl, bool* mask1, int extent1)
   {
     CTimer::get("XIOS").resume();
-    CArray<bool,1> tmp(mask1,shape(extent1),neverDeleteData) ;
+    CArray<bool,1> tmp(mask1, shape(extent1), neverDeleteData);
     grid_hdl->mask1.reference(tmp.copy());
      CTimer::get("XIOS").suspend();
   }
-  
+
   void cxios_get_grid_mask1(grid_Ptr grid_hdl, bool* mask1, int extent1)
   {
     CTimer::get("XIOS").resume();
-    CArray<bool,1> tmp(mask1,shape(extent1),neverDeleteData) ;
-    tmp=grid_hdl->mask1.getInheritedValue() ;
+    CArray<bool,1> tmp(mask1, shape(extent1), neverDeleteData);
+    tmp=grid_hdl->mask1.getInheritedValue();
      CTimer::get("XIOS").suspend();
   }
-  
-  bool cxios_is_defined_grid_mask1(grid_Ptr grid_hdl )
+
+  bool cxios_is_defined_grid_mask1(grid_Ptr grid_hdl)
   {
      CTimer::get("XIOS").resume();
-    return grid_hdl->mask1.hasInheritedValue();
+     bool isDefined = grid_hdl->mask1.hasInheritedValue();
      CTimer::get("XIOS").suspend();
+     return isDefined;
   }
-  
-  
-  
+
+
   void cxios_set_grid_mask2(grid_Ptr grid_hdl, bool* mask2, int extent1, int extent2)
   {
     CTimer::get("XIOS").resume();
-    CArray<bool,2> tmp(mask2,shape(extent1,extent2),neverDeleteData) ;
+    CArray<bool,2> tmp(mask2, shape(extent1, extent2), neverDeleteData);
     grid_hdl->mask2.reference(tmp.copy());
      CTimer::get("XIOS").suspend();
   }
-  
+
   void cxios_get_grid_mask2(grid_Ptr grid_hdl, bool* mask2, int extent1, int extent2)
   {
     CTimer::get("XIOS").resume();
-    CArray<bool,2> tmp(mask2,shape(extent1,extent2),neverDeleteData) ;
-    tmp=grid_hdl->mask2.getInheritedValue() ;
+    CArray<bool,2> tmp(mask2, shape(extent1, extent2), neverDeleteData);
+    tmp=grid_hdl->mask2.getInheritedValue();
      CTimer::get("XIOS").suspend();
   }
-  
-  bool cxios_is_defined_grid_mask2(grid_Ptr grid_hdl )
+
+  bool cxios_is_defined_grid_mask2(grid_Ptr grid_hdl)
   {
      CTimer::get("XIOS").resume();
-    return grid_hdl->mask2.hasInheritedValue();
+     bool isDefined = grid_hdl->mask2.hasInheritedValue();
      CTimer::get("XIOS").suspend();
+     return isDefined;
   }
-  
-  
-  
+
+
   void cxios_set_grid_mask3(grid_Ptr grid_hdl, bool* mask3, int extent1, int extent2, int extent3)
   {
     CTimer::get("XIOS").resume();
-    CArray<bool,3> tmp(mask3,shape(extent1,extent2,extent3),neverDeleteData) ;
+    CArray<bool,3> tmp(mask3, shape(extent1, extent2, extent3), neverDeleteData);
     grid_hdl->mask3.reference(tmp.copy());
      CTimer::get("XIOS").suspend();
   }
-  
+
   void cxios_get_grid_mask3(grid_Ptr grid_hdl, bool* mask3, int extent1, int extent2, int extent3)
   {
     CTimer::get("XIOS").resume();
-    CArray<bool,3> tmp(mask3,shape(extent1,extent2,extent3),neverDeleteData) ;
-    tmp=grid_hdl->mask3.getInheritedValue() ;
+    CArray<bool,3> tmp(mask3, shape(extent1, extent2, extent3), neverDeleteData);
+    tmp=grid_hdl->mask3.getInheritedValue();
      CTimer::get("XIOS").suspend();
   }
-  
-  bool cxios_is_defined_grid_mask3(grid_Ptr grid_hdl )
+
+  bool cxios_is_defined_grid_mask3(grid_Ptr grid_hdl)
   {
      CTimer::get("XIOS").resume();
-    return grid_hdl->mask3.hasInheritedValue();
+     bool isDefined = grid_hdl->mask3.hasInheritedValue();
      CTimer::get("XIOS").suspend();
+     return isDefined;
   }
-  
-  
-  
+
+
   void cxios_set_grid_name(grid_Ptr grid_hdl, const char * name, int name_size)
   {
     std::string name_str;
-    if(!cstr2string(name, name_size, name_str)) return;
-     CTimer::get("XIOS").resume();
+    if (!cstr2string(name, name_size, name_str)) return;
+    CTimer::get("XIOS").resume();
     grid_hdl->name.setValue(name_str);
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").suspend();
   }
-  
+
   void cxios_get_grid_name(grid_Ptr grid_hdl, char * name, int name_size)
   {
-     CTimer::get("XIOS").resume();
-    if(!string_copy(grid_hdl->name.getInheritedValue(),name , name_size))
-      ERROR("void cxios_get_grid_name(grid_Ptr grid_hdl, char * name, int name_size)", <<"Input string is to short");
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    if (!string_copy(grid_hdl->name.getInheritedValue(), name, name_size))
+      ERROR("void cxios_get_grid_name(grid_Ptr grid_hdl, char * name, int name_size)", << "Input string is too short");
+    CTimer::get("XIOS").suspend();
   }
-  
-  bool cxios_is_defined_grid_name(grid_Ptr grid_hdl )
+
+  bool cxios_is_defined_grid_name(grid_Ptr grid_hdl)
   {
      CTimer::get("XIOS").resume();
-    return grid_hdl->name.hasInheritedValue();
+     bool isDefined = grid_hdl->name.hasInheritedValue();
      CTimer::get("XIOS").suspend();
+     return isDefined;
   }
-  
-  
-  
-  
 }