Changeset 445 for XIOS/trunk/src/interface/c_attr/icdomain_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/icdomain_attr.cpp (modified) (62 diffs)

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

@@ -27 +27 @@
   void cxios_get_domain_data_dim(domain_Ptr domain_hdl, int* data_dim)
   {
-    *data_dim = domain_hdl->data_dim.getValue();
+    *data_dim = domain_hdl->data_dim.getInheritedValue();
   }
   
@@ -33 +33 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->data_dim.isEmpty();
+    return domain_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=domain_hdl->data_i_index ;
+    tmp=domain_hdl->data_i_index.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
@@ -59 +59 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->data_i_index.isEmpty();
+    return domain_hdl->data_i_index.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -75 +75 @@
   void cxios_get_domain_data_ibegin(domain_Ptr domain_hdl, int* data_ibegin)
   {
-    *data_ibegin = domain_hdl->data_ibegin.getValue();
+    *data_ibegin = domain_hdl->data_ibegin.getInheritedValue();
   }
   
@@ -81 +81 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->data_ibegin.isEmpty();
+    return domain_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=domain_hdl->data_j_index ;
+    tmp=domain_hdl->data_j_index.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
@@ -107 +107 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->data_j_index.isEmpty();
+    return domain_hdl->data_j_index.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -123 +123 @@
   void cxios_get_domain_data_jbegin(domain_Ptr domain_hdl, int* data_jbegin)
   {
-    *data_jbegin = domain_hdl->data_jbegin.getValue();
+    *data_jbegin = domain_hdl->data_jbegin.getInheritedValue();
   }
   
@@ -129 +129 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->data_jbegin.isEmpty();
+    return domain_hdl->data_jbegin.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -145 +145 @@
   void cxios_get_domain_data_n_index(domain_Ptr domain_hdl, int* data_n_index)
   {
-    *data_n_index = domain_hdl->data_n_index.getValue();
+    *data_n_index = domain_hdl->data_n_index.getInheritedValue();
   }
   
@@ -151 +151 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->data_n_index.isEmpty();
+    return domain_hdl->data_n_index.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -167 +167 @@
   void cxios_get_domain_data_ni(domain_Ptr domain_hdl, int* data_ni)
   {
-    *data_ni = domain_hdl->data_ni.getValue();
+    *data_ni = domain_hdl->data_ni.getInheritedValue();
   }
   
@@ -173 +173 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->data_ni.isEmpty();
+    return domain_hdl->data_ni.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -189 +189 @@
   void cxios_get_domain_data_nj(domain_Ptr domain_hdl, int* data_nj)
   {
-    *data_nj = domain_hdl->data_nj.getValue();
+    *data_nj = domain_hdl->data_nj.getInheritedValue();
   }
   
@@ -195 +195 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->data_nj.isEmpty();
+    return domain_hdl->data_nj.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -214 +214 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(domain_hdl->domain_group_ref.getValue(),domain_group_ref , domain_group_ref_size))
+    if(!string_copy(domain_hdl->domain_group_ref.getInheritedValue(),domain_group_ref , domain_group_ref_size))
       ERROR("void cxios_get_domain_domain_group_ref(domain_Ptr domain_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 !domain_hdl->domain_group_ref.isEmpty();
+    return domain_hdl->domain_group_ref.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -238 +238 @@
   void cxios_get_domain_ibegin(domain_Ptr domain_hdl, int* ibegin)
   {
-    *ibegin = domain_hdl->ibegin.getValue();
+    *ibegin = domain_hdl->ibegin.getInheritedValue();
   }
   
@@ -244 +244 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->ibegin.isEmpty();
+    return domain_hdl->ibegin.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -260 +260 @@
   void cxios_get_domain_iend(domain_Ptr domain_hdl, int* iend)
   {
-    *iend = domain_hdl->iend.getValue();
+    *iend = domain_hdl->iend.getInheritedValue();
   }
   
@@ -266 +266 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->iend.isEmpty();
+    return domain_hdl->iend.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -282 +282 @@
   void cxios_get_domain_jbegin(domain_Ptr domain_hdl, int* jbegin)
   {
-    *jbegin = domain_hdl->jbegin.getValue();
+    *jbegin = domain_hdl->jbegin.getInheritedValue();
   }
   
@@ -288 +288 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->jbegin.isEmpty();
+    return domain_hdl->jbegin.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -304 +304 @@
   void cxios_get_domain_jend(domain_Ptr domain_hdl, int* jend)
   {
-    *jend = domain_hdl->jend.getValue();
+    *jend = domain_hdl->jend.getInheritedValue();
   }
   
@@ -310 +310 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->jend.isEmpty();
+    return domain_hdl->jend.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -329 +329 @@
     CTimer::get("XIOS").resume();
     CArray<double,1> tmp(latvalue,shape(extent1),neverDeleteData) ;
-    tmp=domain_hdl->latvalue ;
+    tmp=domain_hdl->latvalue.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
@@ -336 +336 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->latvalue.isEmpty();
+    return domain_hdl->latvalue.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -355 +355 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(domain_hdl->long_name.getValue(),long_name , long_name_size))
+    if(!string_copy(domain_hdl->long_name.getInheritedValue(),long_name , long_name_size))
       ERROR("void cxios_get_domain_long_name(domain_Ptr domain_hdl, char * long_name, int long_name_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -363 +363 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->long_name.isEmpty();
+    return domain_hdl->long_name.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -382 +382 @@
     CTimer::get("XIOS").resume();
     CArray<double,1> tmp(lonvalue,shape(extent1),neverDeleteData) ;
-    tmp=domain_hdl->lonvalue ;
+    tmp=domain_hdl->lonvalue.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
@@ -389 +389 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->lonvalue.isEmpty();
+    return domain_hdl->lonvalue.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -408 +408 @@
     CTimer::get("XIOS").resume();
     CArray<bool,2> tmp(mask,shape(extent1,extent2),neverDeleteData) ;
-    tmp=domain_hdl->mask ;
+    tmp=domain_hdl->mask.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
@@ -415 +415 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->mask.isEmpty();
+    return domain_hdl->mask.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -434 +434 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(domain_hdl->name.getValue(),name , name_size))
+    if(!string_copy(domain_hdl->name.getInheritedValue(),name , name_size))
       ERROR("void cxios_get_domain_name(domain_Ptr domain_hdl, char * name, int name_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -442 +442 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->name.isEmpty();
+    return domain_hdl->name.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -458 +458 @@
   void cxios_get_domain_ni(domain_Ptr domain_hdl, int* ni)
   {
-    *ni = domain_hdl->ni.getValue();
+    *ni = domain_hdl->ni.getInheritedValue();
   }
   
@@ -464 +464 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->ni.isEmpty();
+    return domain_hdl->ni.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -480 +480 @@
   void cxios_get_domain_ni_glo(domain_Ptr domain_hdl, int* ni_glo)
   {
-    *ni_glo = domain_hdl->ni_glo.getValue();
+    *ni_glo = domain_hdl->ni_glo.getInheritedValue();
   }
   
@@ -486 +486 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->ni_glo.isEmpty();
+    return domain_hdl->ni_glo.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -502 +502 @@
   void cxios_get_domain_nj(domain_Ptr domain_hdl, int* nj)
   {
-    *nj = domain_hdl->nj.getValue();
+    *nj = domain_hdl->nj.getInheritedValue();
   }
   
@@ -508 +508 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->nj.isEmpty();
+    return domain_hdl->nj.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -524 +524 @@
   void cxios_get_domain_nj_glo(domain_Ptr domain_hdl, int* nj_glo)
   {
-    *nj_glo = domain_hdl->nj_glo.getValue();
+    *nj_glo = domain_hdl->nj_glo.getInheritedValue();
   }
   
@@ -530 +530 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->nj_glo.isEmpty();
+    return domain_hdl->nj_glo.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -549 +549 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(domain_hdl->standard_name.getValue(),standard_name , standard_name_size))
+    if(!string_copy(domain_hdl->standard_name.getInheritedValue(),standard_name , standard_name_size))
       ERROR("void cxios_get_domain_standard_name(domain_Ptr domain_hdl, char * standard_name, int standard_name_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -557 +557 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->standard_name.isEmpty();
+    return domain_hdl->standard_name.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -573 +573 @@
   void cxios_get_domain_zoom_ibegin(domain_Ptr domain_hdl, int* zoom_ibegin)
   {
-    *zoom_ibegin = domain_hdl->zoom_ibegin.getValue();
+    *zoom_ibegin = domain_hdl->zoom_ibegin.getInheritedValue();
   }
   
@@ -579 +579 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->zoom_ibegin.isEmpty();
+    return domain_hdl->zoom_ibegin.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -595 +595 @@
   void cxios_get_domain_zoom_ibegin_loc(domain_Ptr domain_hdl, int* zoom_ibegin_loc)
   {
-    *zoom_ibegin_loc = domain_hdl->zoom_ibegin_loc.getValue();
+    *zoom_ibegin_loc = domain_hdl->zoom_ibegin_loc.getInheritedValue();
   }
   
@@ -601 +601 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->zoom_ibegin_loc.isEmpty();
+    return domain_hdl->zoom_ibegin_loc.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -617 +617 @@
   void cxios_get_domain_zoom_jbegin(domain_Ptr domain_hdl, int* zoom_jbegin)
   {
-    *zoom_jbegin = domain_hdl->zoom_jbegin.getValue();
+    *zoom_jbegin = domain_hdl->zoom_jbegin.getInheritedValue();
   }
   
@@ -623 +623 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->zoom_jbegin.isEmpty();
+    return domain_hdl->zoom_jbegin.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -639 +639 @@
   void cxios_get_domain_zoom_jbegin_loc(domain_Ptr domain_hdl, int* zoom_jbegin_loc)
   {
-    *zoom_jbegin_loc = domain_hdl->zoom_jbegin_loc.getValue();
+    *zoom_jbegin_loc = domain_hdl->zoom_jbegin_loc.getInheritedValue();
   }
   
@@ -645 +645 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->zoom_jbegin_loc.isEmpty();
+    return domain_hdl->zoom_jbegin_loc.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -661 +661 @@
   void cxios_get_domain_zoom_ni(domain_Ptr domain_hdl, int* zoom_ni)
   {
-    *zoom_ni = domain_hdl->zoom_ni.getValue();
+    *zoom_ni = domain_hdl->zoom_ni.getInheritedValue();
   }
   
@@ -667 +667 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->zoom_ni.isEmpty();
+    return domain_hdl->zoom_ni.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -683 +683 @@
   void cxios_get_domain_zoom_ni_loc(domain_Ptr domain_hdl, int* zoom_ni_loc)
   {
-    *zoom_ni_loc = domain_hdl->zoom_ni_loc.getValue();
+    *zoom_ni_loc = domain_hdl->zoom_ni_loc.getInheritedValue();
   }
   
@@ -689 +689 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->zoom_ni_loc.isEmpty();
+    return domain_hdl->zoom_ni_loc.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -705 +705 @@
   void cxios_get_domain_zoom_nj(domain_Ptr domain_hdl, int* zoom_nj)
   {
-    *zoom_nj = domain_hdl->zoom_nj.getValue();
+    *zoom_nj = domain_hdl->zoom_nj.getInheritedValue();
   }
   
@@ -711 +711 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->zoom_nj.isEmpty();
+    return domain_hdl->zoom_nj.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -727 +727 @@
   void cxios_get_domain_zoom_nj_loc(domain_Ptr domain_hdl, int* zoom_nj_loc)
   {
-    *zoom_nj_loc = domain_hdl->zoom_nj_loc.getValue();
+    *zoom_nj_loc = domain_hdl->zoom_nj_loc.getInheritedValue();
   }
   
@@ -733 +733 @@
   {
      CTimer::get("XIOS").resume();
-    return !domain_hdl->zoom_nj_loc.isEmpty();
+    return domain_hdl->zoom_nj_loc.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }