Changeset 445 for XIOS/trunk/src/interface/c_attr/icaxis_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/icaxis_attr.cpp (modified) (20 diffs)

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

@@ -30 +30 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(axis_hdl->long_name.getValue(),long_name , long_name_size))
+    if(!string_copy(axis_hdl->long_name.getInheritedValue(),long_name , long_name_size))
       ERROR("void cxios_get_axis_long_name(axis_Ptr axis_hdl, char * long_name, int long_name_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -38 +38 @@
   {
      CTimer::get("XIOS").resume();
-    return !axis_hdl->long_name.isEmpty();
+    return axis_hdl->long_name.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -57 +57 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(axis_hdl->name.getValue(),name , name_size))
+    if(!string_copy(axis_hdl->name.getInheritedValue(),name , name_size))
       ERROR("void cxios_get_axis_name(axis_Ptr axis_hdl, char * name, int name_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -65 +65 @@
   {
      CTimer::get("XIOS").resume();
-    return !axis_hdl->name.isEmpty();
+    return axis_hdl->name.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -84 +84 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(axis_hdl->positive.getStringValue(),positive , positive_size))
+    if(!string_copy(axis_hdl->positive.getInheritedStringValue(),positive , positive_size))
       ERROR("void cxios_get_axis_positive(axis_Ptr axis_hdl, char * positive, int positive_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -92 +92 @@
   {
      CTimer::get("XIOS").resume();
-    return !axis_hdl->positive.isEmpty();
+    return axis_hdl->positive.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -108 +108 @@
   void cxios_get_axis_size(axis_Ptr axis_hdl, int* size)
   {
-    *size = axis_hdl->size.getValue();
+    *size = axis_hdl->size.getInheritedValue();
   }
   
@@ -114 +114 @@
   {
      CTimer::get("XIOS").resume();
-    return !axis_hdl->size.isEmpty();
+    return axis_hdl->size.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -133 +133 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(axis_hdl->standard_name.getValue(),standard_name , standard_name_size))
+    if(!string_copy(axis_hdl->standard_name.getInheritedValue(),standard_name , standard_name_size))
       ERROR("void cxios_get_axis_standard_name(axis_Ptr axis_hdl, char * standard_name, int standard_name_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -141 +141 @@
   {
      CTimer::get("XIOS").resume();
-    return !axis_hdl->standard_name.isEmpty();
+    return axis_hdl->standard_name.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -160 +160 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(axis_hdl->unit.getValue(),unit , unit_size))
+    if(!string_copy(axis_hdl->unit.getInheritedValue(),unit , unit_size))
       ERROR("void cxios_get_axis_unit(axis_Ptr axis_hdl, char * unit, int unit_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -168 +168 @@
   {
      CTimer::get("XIOS").resume();
-    return !axis_hdl->unit.isEmpty();
+    return axis_hdl->unit.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -187 +187 @@
     CTimer::get("XIOS").resume();
     CArray<double,1> tmp(value,shape(extent1),neverDeleteData) ;
-    tmp=axis_hdl->value ;
+    tmp=axis_hdl->value.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
@@ -194 +194 @@
   {
      CTimer::get("XIOS").resume();
-    return !axis_hdl->value.isEmpty();
+    return axis_hdl->value.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -210 +210 @@
   void cxios_get_axis_zoom_begin(axis_Ptr axis_hdl, int* zoom_begin)
   {
-    *zoom_begin = axis_hdl->zoom_begin.getValue();
+    *zoom_begin = axis_hdl->zoom_begin.getInheritedValue();
   }
   
@@ -216 +216 @@
   {
      CTimer::get("XIOS").resume();
-    return !axis_hdl->zoom_begin.isEmpty();
+    return axis_hdl->zoom_begin.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -232 +232 @@
   void cxios_get_axis_zoom_end(axis_Ptr axis_hdl, int* zoom_end)
   {
-    *zoom_end = axis_hdl->zoom_end.getValue();
+    *zoom_end = axis_hdl->zoom_end.getInheritedValue();
   }
   
@@ -238 +238 @@
   {
      CTimer::get("XIOS").resume();
-    return !axis_hdl->zoom_end.isEmpty();
+    return axis_hdl->zoom_end.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -254 +254 @@
   void cxios_get_axis_zoom_size(axis_Ptr axis_hdl, int* zoom_size)
   {
-    *zoom_size = axis_hdl->zoom_size.getValue();
+    *zoom_size = axis_hdl->zoom_size.getInheritedValue();
   }
   
@@ -260 +260 @@
   {
      CTimer::get("XIOS").resume();
-    return !axis_hdl->zoom_size.isEmpty();
+    return axis_hdl->zoom_size.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }