Changeset 445 for XIOS/trunk/src/interface/c_attr/iccontext_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/iccontext_attr.cpp (modified) (10 diffs)

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

@@ -30 +30 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(context_hdl->calendar_type.getValue(),calendar_type , calendar_type_size))
+    if(!string_copy(context_hdl->calendar_type.getInheritedValue(),calendar_type , calendar_type_size))
       ERROR("void cxios_get_context_calendar_type(context_Ptr context_hdl, char * calendar_type, int calendar_type_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -38 +38 @@
   {
      CTimer::get("XIOS").resume();
-    return !context_hdl->calendar_type.isEmpty();
+    return context_hdl->calendar_type.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -57 +57 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(context_hdl->output_dir.getValue(),output_dir , output_dir_size))
+    if(!string_copy(context_hdl->output_dir.getInheritedValue(),output_dir , output_dir_size))
       ERROR("void cxios_get_context_output_dir(context_Ptr context_hdl, char * output_dir, int output_dir_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -65 +65 @@
   {
      CTimer::get("XIOS").resume();
-    return !context_hdl->output_dir.isEmpty();
+    return context_hdl->output_dir.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -84 +84 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(context_hdl->start_date.getValue(),start_date , start_date_size))
+    if(!string_copy(context_hdl->start_date.getInheritedValue(),start_date , start_date_size))
       ERROR("void cxios_get_context_start_date(context_Ptr context_hdl, char * start_date, int start_date_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -92 +92 @@
   {
      CTimer::get("XIOS").resume();
-    return !context_hdl->start_date.isEmpty();
+    return context_hdl->start_date.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -111 +111 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(context_hdl->time_origin.getValue(),time_origin , time_origin_size))
+    if(!string_copy(context_hdl->time_origin.getInheritedValue(),time_origin , time_origin_size))
       ERROR("void cxios_get_context_time_origin(context_Ptr context_hdl, char * time_origin, int time_origin_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -119 +119 @@
   {
      CTimer::get("XIOS").resume();
-    return !context_hdl->time_origin.isEmpty();
+    return context_hdl->time_origin.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
@@ -138 +138 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(context_hdl->timestep.getValue(),timestep , timestep_size))
+    if(!string_copy(context_hdl->timestep.getInheritedValue(),timestep , timestep_size))
       ERROR("void cxios_get_context_timestep(context_Ptr context_hdl, char * timestep, int timestep_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();
@@ -146 +146 @@
   {
      CTimer::get("XIOS").resume();
-    return !context_hdl->timestep.isEmpty();
+    return context_hdl->timestep.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }