Changeset 445 for XIOS/trunk/src/interface/c_attr/icgridgroup_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/icgridgroup_attr.cpp (modified) (12 diffs)

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

@@ -30 +30 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(gridgroup_hdl->axis_ref.getValue(),axis_ref , axis_ref_size))
+    if(!string_copy(gridgroup_hdl->axis_ref.getInheritedValue(),axis_ref , axis_ref_size))
       ERROR("void cxios_get_gridgroup_axis_ref(gridgroup_Ptr gridgroup_hdl, char * axis_ref, int axis_ref_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -38 +38 @@
   {
      CTimer::get("XIOS").resume();
-    return !gridgroup_hdl->axis_ref.isEmpty();
+    return gridgroup_hdl->axis_ref.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -57 +57 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(gridgroup_hdl->description.getValue(),description , description_size))
+    if(!string_copy(gridgroup_hdl->description.getInheritedValue(),description , description_size))
       ERROR("void cxios_get_gridgroup_description(gridgroup_Ptr gridgroup_hdl, char * description, int description_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -65 +65 @@
   {
      CTimer::get("XIOS").resume();
-    return !gridgroup_hdl->description.isEmpty();
+    return gridgroup_hdl->description.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -84 +84 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(gridgroup_hdl->domain_ref.getValue(),domain_ref , domain_ref_size))
+    if(!string_copy(gridgroup_hdl->domain_ref.getInheritedValue(),domain_ref , domain_ref_size))
       ERROR("void cxios_get_gridgroup_domain_ref(gridgroup_Ptr gridgroup_hdl, char * domain_ref, int domain_ref_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -92 +92 @@
   {
      CTimer::get("XIOS").resume();
-    return !gridgroup_hdl->domain_ref.isEmpty();
+    return gridgroup_hdl->domain_ref.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -111 +111 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(gridgroup_hdl->group_ref.getValue(),group_ref , group_ref_size))
+    if(!string_copy(gridgroup_hdl->group_ref.getInheritedValue(),group_ref , group_ref_size))
       ERROR("void cxios_get_gridgroup_group_ref(gridgroup_Ptr gridgroup_hdl, char * group_ref, int group_ref_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -119 +119 @@
   {
      CTimer::get("XIOS").resume();
-    return !gridgroup_hdl->group_ref.isEmpty();
+    return gridgroup_hdl->group_ref.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -138 +138 @@
     CTimer::get("XIOS").resume();
     CArray<bool,3> tmp(mask,shape(extent1,extent2,extent3),neverDeleteData) ;
-    tmp=gridgroup_hdl->mask ;
+    tmp=gridgroup_hdl->mask.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
@@ -145 +145 @@
   {
      CTimer::get("XIOS").resume();
-    return !gridgroup_hdl->mask.isEmpty();
+    return gridgroup_hdl->mask.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -164 +164 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(gridgroup_hdl->name.getValue(),name , name_size))
+    if(!string_copy(gridgroup_hdl->name.getInheritedValue(),name , name_size))
       ERROR("void cxios_get_gridgroup_name(gridgroup_Ptr gridgroup_hdl, char * name, int name_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -172 +172 @@
   {
      CTimer::get("XIOS").resume();
-    return !gridgroup_hdl->name.isEmpty();
+    return gridgroup_hdl->name.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }