Changeset 445 for XIOS/trunk/src/interface/c_attr/icdomaingroup_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/icdomaingroup_attr.cpp (modified) (64 diffs)

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

@@ -27 +27 @@
   void cxios_get_domaingroup_data_dim(domaingroup_Ptr domaingroup_hdl, int* data_dim)
   {
-    *data_dim = domaingroup_hdl->data_dim.getValue();
+    *data_dim = domaingroup_hdl->data_dim.getInheritedValue();
   }
   
@@ -33 +33 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->data_dim.isEmpty();
+    return domaingroup_hdl->data_dim.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -52 +52 @@
     CTimer::get("XIOS").resume();
     CArray<int,1> tmp(data_i_index,shape(extent1),neverDeleteData) ;
-    tmp=domaingroup_hdl->data_i_index ;
+    tmp=domaingroup_hdl->data_i_index.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
@@ -59 +59 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->data_i_index.isEmpty();
+    return domaingroup_hdl->data_i_index.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -75 +75 @@
   void cxios_get_domaingroup_data_ibegin(domaingroup_Ptr domaingroup_hdl, int* data_ibegin)
   {
-    *data_ibegin = domaingroup_hdl->data_ibegin.getValue();
+    *data_ibegin = domaingroup_hdl->data_ibegin.getInheritedValue();
   }
   
@@ -81 +81 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->data_ibegin.isEmpty();
+    return domaingroup_hdl->data_ibegin.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -100 +100 @@
     CTimer::get("XIOS").resume();
     CArray<int,1> tmp(data_j_index,shape(extent1),neverDeleteData) ;
-    tmp=domaingroup_hdl->data_j_index ;
+    tmp=domaingroup_hdl->data_j_index.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
@@ -107 +107 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->data_j_index.isEmpty();
+    return domaingroup_hdl->data_j_index.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -123 +123 @@
   void cxios_get_domaingroup_data_jbegin(domaingroup_Ptr domaingroup_hdl, int* data_jbegin)
   {
-    *data_jbegin = domaingroup_hdl->data_jbegin.getValue();
+    *data_jbegin = domaingroup_hdl->data_jbegin.getInheritedValue();
   }
   
@@ -129 +129 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->data_jbegin.isEmpty();
+    return domaingroup_hdl->data_jbegin.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -145 +145 @@
   void cxios_get_domaingroup_data_n_index(domaingroup_Ptr domaingroup_hdl, int* data_n_index)
   {
-    *data_n_index = domaingroup_hdl->data_n_index.getValue();
+    *data_n_index = domaingroup_hdl->data_n_index.getInheritedValue();
   }
   
@@ -151 +151 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->data_n_index.isEmpty();
+    return domaingroup_hdl->data_n_index.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -167 +167 @@
   void cxios_get_domaingroup_data_ni(domaingroup_Ptr domaingroup_hdl, int* data_ni)
   {
-    *data_ni = domaingroup_hdl->data_ni.getValue();
+    *data_ni = domaingroup_hdl->data_ni.getInheritedValue();
   }
   
@@ -173 +173 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->data_ni.isEmpty();
+    return domaingroup_hdl->data_ni.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -189 +189 @@
   void cxios_get_domaingroup_data_nj(domaingroup_Ptr domaingroup_hdl, int* data_nj)
   {
-    *data_nj = domaingroup_hdl->data_nj.getValue();
+    *data_nj = domaingroup_hdl->data_nj.getInheritedValue();
   }
   
@@ -195 +195 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->data_nj.isEmpty();
+    return domaingroup_hdl->data_nj.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -214 +214 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(domaingroup_hdl->domain_group_ref.getValue(),domain_group_ref , domain_group_ref_size))
+    if(!string_copy(domaingroup_hdl->domain_group_ref.getInheritedValue(),domain_group_ref , domain_group_ref_size))
       ERROR("void cxios_get_domaingroup_domain_group_ref(domaingroup_Ptr domaingroup_hdl, char * domain_group_ref, int domain_group_ref_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -222 +222 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->domain_group_ref.isEmpty();
+    return domaingroup_hdl->domain_group_ref.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -241 +241 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(domaingroup_hdl->group_ref.getValue(),group_ref , group_ref_size))
+    if(!string_copy(domaingroup_hdl->group_ref.getInheritedValue(),group_ref , group_ref_size))
       ERROR("void cxios_get_domaingroup_group_ref(domaingroup_Ptr domaingroup_hdl, char * group_ref, int group_ref_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -249 +249 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->group_ref.isEmpty();
+    return domaingroup_hdl->group_ref.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -265 +265 @@
   void cxios_get_domaingroup_ibegin(domaingroup_Ptr domaingroup_hdl, int* ibegin)
   {
-    *ibegin = domaingroup_hdl->ibegin.getValue();
+    *ibegin = domaingroup_hdl->ibegin.getInheritedValue();
   }
   
@@ -271 +271 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->ibegin.isEmpty();
+    return domaingroup_hdl->ibegin.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -287 +287 @@
   void cxios_get_domaingroup_iend(domaingroup_Ptr domaingroup_hdl, int* iend)
   {
-    *iend = domaingroup_hdl->iend.getValue();
+    *iend = domaingroup_hdl->iend.getInheritedValue();
   }
   
@@ -293 +293 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->iend.isEmpty();
+    return domaingroup_hdl->iend.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -309 +309 @@
   void cxios_get_domaingroup_jbegin(domaingroup_Ptr domaingroup_hdl, int* jbegin)
   {
-    *jbegin = domaingroup_hdl->jbegin.getValue();
+    *jbegin = domaingroup_hdl->jbegin.getInheritedValue();
   }
   
@@ -315 +315 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->jbegin.isEmpty();
+    return domaingroup_hdl->jbegin.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -331 +331 @@
   void cxios_get_domaingroup_jend(domaingroup_Ptr domaingroup_hdl, int* jend)
   {
-    *jend = domaingroup_hdl->jend.getValue();
+    *jend = domaingroup_hdl->jend.getInheritedValue();
   }
   
@@ -337 +337 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->jend.isEmpty();
+    return domaingroup_hdl->jend.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -356 +356 @@
     CTimer::get("XIOS").resume();
     CArray<double,1> tmp(latvalue,shape(extent1),neverDeleteData) ;
-    tmp=domaingroup_hdl->latvalue ;
+    tmp=domaingroup_hdl->latvalue.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
@@ -363 +363 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->latvalue.isEmpty();
+    return domaingroup_hdl->latvalue.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -382 +382 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(domaingroup_hdl->long_name.getValue(),long_name , long_name_size))
+    if(!string_copy(domaingroup_hdl->long_name.getInheritedValue(),long_name , long_name_size))
       ERROR("void cxios_get_domaingroup_long_name(domaingroup_Ptr domaingroup_hdl, char * long_name, int long_name_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -390 +390 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->long_name.isEmpty();
+    return domaingroup_hdl->long_name.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -409 +409 @@
     CTimer::get("XIOS").resume();
     CArray<double,1> tmp(lonvalue,shape(extent1),neverDeleteData) ;
-    tmp=domaingroup_hdl->lonvalue ;
+    tmp=domaingroup_hdl->lonvalue.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
@@ -416 +416 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->lonvalue.isEmpty();
+    return domaingroup_hdl->lonvalue.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -435 +435 @@
     CTimer::get("XIOS").resume();
     CArray<bool,2> tmp(mask,shape(extent1,extent2),neverDeleteData) ;
-    tmp=domaingroup_hdl->mask ;
+    tmp=domaingroup_hdl->mask.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
@@ -442 +442 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->mask.isEmpty();
+    return domaingroup_hdl->mask.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -461 +461 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(domaingroup_hdl->name.getValue(),name , name_size))
+    if(!string_copy(domaingroup_hdl->name.getInheritedValue(),name , name_size))
       ERROR("void cxios_get_domaingroup_name(domaingroup_Ptr domaingroup_hdl, char * name, int name_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -469 +469 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->name.isEmpty();
+    return domaingroup_hdl->name.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -485 +485 @@
   void cxios_get_domaingroup_ni(domaingroup_Ptr domaingroup_hdl, int* ni)
   {
-    *ni = domaingroup_hdl->ni.getValue();
+    *ni = domaingroup_hdl->ni.getInheritedValue();
   }
   
@@ -491 +491 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->ni.isEmpty();
+    return domaingroup_hdl->ni.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -507 +507 @@
   void cxios_get_domaingroup_ni_glo(domaingroup_Ptr domaingroup_hdl, int* ni_glo)
   {
-    *ni_glo = domaingroup_hdl->ni_glo.getValue();
+    *ni_glo = domaingroup_hdl->ni_glo.getInheritedValue();
   }
   
@@ -513 +513 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->ni_glo.isEmpty();
+    return domaingroup_hdl->ni_glo.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -529 +529 @@
   void cxios_get_domaingroup_nj(domaingroup_Ptr domaingroup_hdl, int* nj)
   {
-    *nj = domaingroup_hdl->nj.getValue();
+    *nj = domaingroup_hdl->nj.getInheritedValue();
   }
   
@@ -535 +535 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->nj.isEmpty();
+    return domaingroup_hdl->nj.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -551 +551 @@
   void cxios_get_domaingroup_nj_glo(domaingroup_Ptr domaingroup_hdl, int* nj_glo)
   {
-    *nj_glo = domaingroup_hdl->nj_glo.getValue();
+    *nj_glo = domaingroup_hdl->nj_glo.getInheritedValue();
   }
   
@@ -557 +557 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->nj_glo.isEmpty();
+    return domaingroup_hdl->nj_glo.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -576 +576 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(domaingroup_hdl->standard_name.getValue(),standard_name , standard_name_size))
+    if(!string_copy(domaingroup_hdl->standard_name.getInheritedValue(),standard_name , standard_name_size))
       ERROR("void cxios_get_domaingroup_standard_name(domaingroup_Ptr domaingroup_hdl, char * standard_name, int standard_name_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -584 +584 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->standard_name.isEmpty();
+    return domaingroup_hdl->standard_name.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -600 +600 @@
   void cxios_get_domaingroup_zoom_ibegin(domaingroup_Ptr domaingroup_hdl, int* zoom_ibegin)
   {
-    *zoom_ibegin = domaingroup_hdl->zoom_ibegin.getValue();
+    *zoom_ibegin = domaingroup_hdl->zoom_ibegin.getInheritedValue();
   }
   
@@ -606 +606 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->zoom_ibegin.isEmpty();
+    return domaingroup_hdl->zoom_ibegin.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -622 +622 @@
   void cxios_get_domaingroup_zoom_ibegin_loc(domaingroup_Ptr domaingroup_hdl, int* zoom_ibegin_loc)
   {
-    *zoom_ibegin_loc = domaingroup_hdl->zoom_ibegin_loc.getValue();
+    *zoom_ibegin_loc = domaingroup_hdl->zoom_ibegin_loc.getInheritedValue();
   }
   
@@ -628 +628 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->zoom_ibegin_loc.isEmpty();
+    return domaingroup_hdl->zoom_ibegin_loc.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -644 +644 @@
   void cxios_get_domaingroup_zoom_jbegin(domaingroup_Ptr domaingroup_hdl, int* zoom_jbegin)
   {
-    *zoom_jbegin = domaingroup_hdl->zoom_jbegin.getValue();
+    *zoom_jbegin = domaingroup_hdl->zoom_jbegin.getInheritedValue();
   }
   
@@ -650 +650 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->zoom_jbegin.isEmpty();
+    return domaingroup_hdl->zoom_jbegin.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -666 +666 @@
   void cxios_get_domaingroup_zoom_jbegin_loc(domaingroup_Ptr domaingroup_hdl, int* zoom_jbegin_loc)
   {
-    *zoom_jbegin_loc = domaingroup_hdl->zoom_jbegin_loc.getValue();
+    *zoom_jbegin_loc = domaingroup_hdl->zoom_jbegin_loc.getInheritedValue();
   }
   
@@ -672 +672 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->zoom_jbegin_loc.isEmpty();
+    return domaingroup_hdl->zoom_jbegin_loc.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -688 +688 @@
   void cxios_get_domaingroup_zoom_ni(domaingroup_Ptr domaingroup_hdl, int* zoom_ni)
   {
-    *zoom_ni = domaingroup_hdl->zoom_ni.getValue();
+    *zoom_ni = domaingroup_hdl->zoom_ni.getInheritedValue();
   }
   
@@ -694 +694 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->zoom_ni.isEmpty();
+    return domaingroup_hdl->zoom_ni.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -710 +710 @@
   void cxios_get_domaingroup_zoom_ni_loc(domaingroup_Ptr domaingroup_hdl, int* zoom_ni_loc)
   {
-    *zoom_ni_loc = domaingroup_hdl->zoom_ni_loc.getValue();
+    *zoom_ni_loc = domaingroup_hdl->zoom_ni_loc.getInheritedValue();
   }
   
@@ -716 +716 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->zoom_ni_loc.isEmpty();
+    return domaingroup_hdl->zoom_ni_loc.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -732 +732 @@
   void cxios_get_domaingroup_zoom_nj(domaingroup_Ptr domaingroup_hdl, int* zoom_nj)
   {
-    *zoom_nj = domaingroup_hdl->zoom_nj.getValue();
+    *zoom_nj = domaingroup_hdl->zoom_nj.getInheritedValue();
   }
   
@@ -738 +738 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->zoom_nj.isEmpty();
+    return domaingroup_hdl->zoom_nj.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -754 +754 @@
   void cxios_get_domaingroup_zoom_nj_loc(domaingroup_Ptr domaingroup_hdl, int* zoom_nj_loc)
   {
-    *zoom_nj_loc = domaingroup_hdl->zoom_nj_loc.getValue();
+    *zoom_nj_loc = domaingroup_hdl->zoom_nj_loc.getInheritedValue();
   }
   
@@ -760 +760 @@
   {
      CTimer::get("XIOS").resume();
-    return !domaingroup_hdl->zoom_nj_loc.isEmpty();
+    return domaingroup_hdl->zoom_nj_loc.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }