Changeset 445 for XIOS/trunk/src/interface/c_attr/icfield_attr.cpp

Timestamp:

06/19/13 10:09:36 (11 years ago)

Author:

ymipsl

Message:

Add possibility to make inheritance of attributes and reference before closing the context definition.
New fortran fonction : xios_solve inheritance()
After this call, the value of attribute have the inherited value of their parent.

YM

File:

• XIOS/trunk/src/interface/c_attr/icfield_attr.cpp (modified) (30 diffs)

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

@@ -30 +30 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(field_hdl->axis_ref.getValue(),axis_ref , axis_ref_size))
+    if(!string_copy(field_hdl->axis_ref.getInheritedValue(),axis_ref , axis_ref_size))
       ERROR("void cxios_get_field_axis_ref(field_Ptr field_hdl, char * axis_ref, int axis_ref_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -38 +38 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->axis_ref.isEmpty();
+    return field_hdl->axis_ref.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -54 +54 @@
   void cxios_get_field_default_value(field_Ptr field_hdl, double* default_value)
   {
-    *default_value = field_hdl->default_value.getValue();
+    *default_value = field_hdl->default_value.getInheritedValue();
   }
   
@@ -60 +60 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->default_value.isEmpty();
+    return field_hdl->default_value.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -79 +79 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(field_hdl->domain_ref.getValue(),domain_ref , domain_ref_size))
+    if(!string_copy(field_hdl->domain_ref.getInheritedValue(),domain_ref , domain_ref_size))
       ERROR("void cxios_get_field_domain_ref(field_Ptr field_hdl, char * domain_ref, int domain_ref_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -87 +87 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->domain_ref.isEmpty();
+    return field_hdl->domain_ref.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -103 +103 @@
   void cxios_get_field_enabled(field_Ptr field_hdl, bool* enabled)
   {
-    *enabled = field_hdl->enabled.getValue();
+    *enabled = field_hdl->enabled.getInheritedValue();
   }
   
@@ -109 +109 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->enabled.isEmpty();
+    return field_hdl->enabled.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -128 +128 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(field_hdl->field_ref.getValue(),field_ref , field_ref_size))
+    if(!string_copy(field_hdl->field_ref.getInheritedValue(),field_ref , field_ref_size))
       ERROR("void cxios_get_field_field_ref(field_Ptr field_hdl, char * field_ref, int field_ref_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -136 +136 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->field_ref.isEmpty();
+    return field_hdl->field_ref.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -155 +155 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(field_hdl->freq_offset.getValue(),freq_offset , freq_offset_size))
+    if(!string_copy(field_hdl->freq_offset.getInheritedValue(),freq_offset , freq_offset_size))
       ERROR("void cxios_get_field_freq_offset(field_Ptr field_hdl, char * freq_offset, int freq_offset_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -163 +163 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->freq_offset.isEmpty();
+    return field_hdl->freq_offset.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -182 +182 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(field_hdl->freq_op.getValue(),freq_op , freq_op_size))
+    if(!string_copy(field_hdl->freq_op.getInheritedValue(),freq_op , freq_op_size))
       ERROR("void cxios_get_field_freq_op(field_Ptr field_hdl, char * freq_op, int freq_op_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -190 +190 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->freq_op.isEmpty();
+    return field_hdl->freq_op.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -209 +209 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(field_hdl->grid_ref.getValue(),grid_ref , grid_ref_size))
+    if(!string_copy(field_hdl->grid_ref.getInheritedValue(),grid_ref , grid_ref_size))
       ERROR("void cxios_get_field_grid_ref(field_Ptr field_hdl, char * grid_ref, int grid_ref_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -217 +217 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->grid_ref.isEmpty();
+    return field_hdl->grid_ref.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -233 +233 @@
   void cxios_get_field_level(field_Ptr field_hdl, int* level)
   {
-    *level = field_hdl->level.getValue();
+    *level = field_hdl->level.getInheritedValue();
   }
   
@@ -239 +239 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->level.isEmpty();
+    return field_hdl->level.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -258 +258 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(field_hdl->long_name.getValue(),long_name , long_name_size))
+    if(!string_copy(field_hdl->long_name.getInheritedValue(),long_name , long_name_size))
       ERROR("void cxios_get_field_long_name(field_Ptr field_hdl, char * long_name, int long_name_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -266 +266 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->long_name.isEmpty();
+    return field_hdl->long_name.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -285 +285 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(field_hdl->name.getValue(),name , name_size))
+    if(!string_copy(field_hdl->name.getInheritedValue(),name , name_size))
       ERROR("void cxios_get_field_name(field_Ptr field_hdl, char * name, int name_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -293 +293 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->name.isEmpty();
+    return field_hdl->name.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -312 +312 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(field_hdl->operation.getValue(),operation , operation_size))
+    if(!string_copy(field_hdl->operation.getInheritedValue(),operation , operation_size))
       ERROR("void cxios_get_field_operation(field_Ptr field_hdl, char * operation, int operation_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -320 +320 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->operation.isEmpty();
+    return field_hdl->operation.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -336 +336 @@
   void cxios_get_field_prec(field_Ptr field_hdl, int* prec)
   {
-    *prec = field_hdl->prec.getValue();
+    *prec = field_hdl->prec.getInheritedValue();
   }
   
@@ -342 +342 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->prec.isEmpty();
+    return field_hdl->prec.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -361 +361 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(field_hdl->standard_name.getValue(),standard_name , standard_name_size))
+    if(!string_copy(field_hdl->standard_name.getInheritedValue(),standard_name , standard_name_size))
       ERROR("void cxios_get_field_standard_name(field_Ptr field_hdl, char * standard_name, int standard_name_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -369 +369 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->standard_name.isEmpty();
+    return field_hdl->standard_name.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -388 +388 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(field_hdl->unit.getValue(),unit , unit_size))
+    if(!string_copy(field_hdl->unit.getInheritedValue(),unit , unit_size))
       ERROR("void cxios_get_field_unit(field_Ptr field_hdl, char * unit, int unit_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -396 +396 @@
   {
      CTimer::get("XIOS").resume();
-    return !field_hdl->unit.isEmpty();
+    return field_hdl->unit.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }