Changeset 445 for XIOS/trunk/src/generate_interface_impl.hpp

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/generate_interface_impl.hpp (modified) (7 diffs)

XIOS/trunk/src/generate_interface_impl.hpp

@@ -42 +42 @@
     oss<<"{"<<iendl ;
     oss<<"   CTimer::get(\"XIOS\").resume();"<<iendl ;
-    oss<<"  return !"<<className<<"_hdl->"<<name<<".isEmpty();"<<iendl ;
+    oss<<"  return "<<className<<"_hdl->"<<name<<".hasInheritedValue();"<<iendl ;
     oss<<"   CTimer::get(\"XIOS\").suspend();"<<iendl ;
     oss<<"}"<<iendl ;
@@ -64 +64 @@
     oss<<"void cxios_get_"<<className<<"_"<<name<<"("<<className<<"_Ptr "<<className<<"_hdl, "<< typeName<<"* "<<name<<")"<<iendl ;
     oss<<"{"<<iendl;
-    oss<<"  *"<<name<<" = "<<className<<"_hdl->"<<name<<".getValue();"<<iendl ;
+    oss<<"  *"<<name<<" = "<<className<<"_hdl->"<<name<<".getInheritedValue();"<<iendl ;
     oss<<"}"<<iendl ;
     oss<<iendl ;
@@ -88 +88 @@
     oss<<"{"<<iendl ;
     oss<<"   CTimer::get(\"XIOS\").resume();"<<iendl ;
-    oss<<"  if(!string_copy("<<className<<"_hdl->"<<name<<".getValue(),"<<name<<" , "<<name<<"_size))"<<iendl ;
+    oss<<"  if(!string_copy("<<className<<"_hdl->"<<name<<".getInheritedValue(),"<<name<<" , "<<name<<"_size))"<<iendl ;
     oss<<"    ERROR(\"void cxios_get_"<<className<<"_"<<name<<"("<<className<<"_Ptr "<<className<<"_hdl, char * "<<name<<", int "
        <<name<<"_size)\", <<\"Input string is to short\");"<<iendl ;
@@ -115 +115 @@
     oss<<"{"<<iendl ;
     oss<<"   CTimer::get(\"XIOS\").resume();"<<iendl ;
-    oss<<"  if(!string_copy("<<className<<"_hdl->"<<name<<".getStringValue(),"<<name<<" , "<<name<<"_size))"<<iendl ;
+    oss<<"  if(!string_copy("<<className<<"_hdl->"<<name<<".getInheritedStringValue(),"<<name<<" , "<<name<<"_size))"<<iendl ;
     oss<<"    ERROR(\"void cxios_get_"<<className<<"_"<<name<<"("<<className<<"_Ptr "<<className<<"_hdl, char * "<<name<<", int "
        <<name<<"_size)\", <<\"Input string is to short\");"<<iendl ;
@@ -610 +610 @@
     oss<<"  CTimer::get(\"XIOS\").resume();"<<iendl ; \
     oss<<"  CArray<"<<typeName<<",1> tmp("<<name<<",shape(extent1),neverDeleteData) ;"<<iendl ;\
-    oss<<"  tmp="<<className<<"_hdl->"<<name<<" ;"<<iendl ;\
+    oss<<"  tmp="<<className<<"_hdl->"<<name<<".getInheritedValue() ;"<<iendl ;\
     oss<<"   CTimer::get(\"XIOS\").suspend();"<<iendl ;\
     oss<<"}"<<iendl ;\
@@ -634 +634 @@
     oss<<"  CTimer::get(\"XIOS\").resume();"<<iendl ; \
     oss<<"  CArray<"<<typeName<<",2> tmp("<<name<<",shape(extent1,extent2),neverDeleteData) ;"<<iendl ;\
-    oss<<"  tmp="<<className<<"_hdl->"<<name<<" ;"<<iendl ;\
+    oss<<"  tmp="<<className<<"_hdl->"<<name<<".getInheritedValue() ;"<<iendl ;\
     oss<<"   CTimer::get(\"XIOS\").suspend();"<<iendl ;\
     oss<<"}"<<iendl ;\
@@ -658 +658 @@
     oss<<"  CTimer::get(\"XIOS\").resume();"<<iendl ; \
     oss<<"  CArray<"<<typeName<<",3> tmp("<<name<<",shape(extent1,extent2,extent3),neverDeleteData) ;"<<iendl ;\
-    oss<<"  tmp="<<className<<"_hdl->"<<name<<" ;"<<iendl ;\
+    oss<<"  tmp="<<className<<"_hdl->"<<name<<".getInheritedValue() ;"<<iendl ;\
     oss<<"   CTimer::get(\"XIOS\").suspend();"<<iendl ;\
     oss<<"}"<<iendl ;\