Changeset 472 for XIOS/trunk/src/interface/fortran/ixios.F90

Timestamp:

02/03/14 14:16:20 (10 years ago)

Author:

ymipsl

Message:

Enhancement : user defined global and field attribute can be output in the netcdfcf file.
A variable child element inclosed into a file element will be output as a global file attribute.
A variable child element inclosed into a field element will be output as a field attribute.

+ variable fortran interface added

YM

File:

• XIOS/trunk/src/interface/fortran/ixios.F90 (modified) (6 diffs)

XIOS/trunk/src/interface/fortran/ixios.F90

@@ -43 +43 @@
                              xios(is_defined_fieldgroup_attr), xios(is_defined_fieldgroup_attr_hdl)
 
+USE ivariable, ONLY : txios(variable), txios(variablegroup), xios(get_variable_handle),  &
+                   xios(get_variablegroup_handle), xios(is_valid_variable),        &
+                   xios(is_valid_variablegroup)
+
+USE ivariable_attr, ONLY : xios(set_variable_attr),xios(set_variable_attr_hdl),    &
+                        xios(get_variable_attr),xios(get_variable_attr_hdl), &
+                        xios(is_defined_variable_attr),xios(is_defined_variable_attr_hdl)
+  
+USE ivariablegroup_attr, ONLY : xios(set_variablegroup_attr), xios(set_variablegroup_attr_hdl),  &
+                             xios(get_variablegroup_attr), xios(get_variablegroup_attr_hdl), &
+                             xios(is_defined_variablegroup_attr), xios(is_defined_variablegroup_attr_hdl)
+                             
 USE ifile, ONLY : txios(file), txios(filegroup), xios(get_file_handle),    & 
                   xios(get_filegroup_handle), xios(is_valid_file), xios(is_valid_filegroup)
@@ -77 +89 @@
 
 USE ixml_tree, ONLY : xios(add_axis), xios(add_file), xios(add_grid), xios(add_field), xios(add_domain),          &
-                     xios(add_fieldtofile), xios(add_axisgroup), xios(add_filegroup), xios(add_gridgroup), &
-                     xios(add_fieldgroup), xios(add_domaingroup), xios(add_fieldgrouptofile)
-                  
+                     xios(add_fieldtofile), xios(add_variabletofile), xios(add_variabletofield),                  &
+                     xios(add_axisgroup), xios(add_filegroup), xios(add_gridgroup), xios(add_fieldgroup),         & 
+                     xios(add_domaingroup), xios(add_fieldgrouptofile), xios(add_variablegrouptofile),            &
+                     xios(add_variablegrouptofield)
 
 PRIVATE
@@ -86 +99 @@
 INTERFACE xios(set_attr)
   MODULE PROCEDURE xios(set_domaingroup_attr_hdl), xios(set_domain_attr_hdl), xios(set_fieldgroup_attr_hdl), &
-                   xios(set_field_attr_hdl), xios(set_file_attr_hdl), xios(set_filegroup_attr_hdl),          &
+                   xios(set_field_attr_hdl),xios(set_variable_attr_hdl), xios(set_variablegroup_attr_hdl),   &
+                   xios(set_file_attr_hdl), xios(set_filegroup_attr_hdl),                                    &
                    xios(set_grid_attr_hdl), xios(set_gridgroup_attr_hdl), xios(set_axis_attr_hdl) ,          &
                    xios(set_axisgroup_attr_hdl), xios(set_context_attr_hdl)
@@ -93 +107 @@
 INTERFACE xios(get_attr)
   MODULE PROCEDURE xios(get_domaingroup_attr_hdl), xios(get_domain_attr_hdl), xios(get_fieldgroup_attr_hdl), &
-                   xios(get_field_attr_hdl), xios(get_file_attr_hdl), xios(get_filegroup_attr_hdl),          &
+                   xios(get_field_attr_hdl), xios(get_variable_attr_hdl), xios(get_variablegroup_attr_hdl),  &
+                   xios(get_file_attr_hdl), xios(get_filegroup_attr_hdl),                                    &
                    xios(get_grid_attr_hdl), xios(get_gridgroup_attr_hdl), xios(get_axis_attr_hdl) ,          &
                    xios(get_axisgroup_attr_hdl), xios(get_context_attr_hdl)
@@ -100 +115 @@
 INTERFACE xios(is_defined_attr)
   MODULE PROCEDURE xios(is_defined_domaingroup_attr_hdl), xios(is_defined_domain_attr_hdl), xios(is_defined_fieldgroup_attr_hdl), &
-                   xios(is_defined_field_attr_hdl), xios(is_defined_file_attr_hdl), xios(is_defined_filegroup_attr_hdl),          &
+                   xios(is_defined_field_attr_hdl), xios(is_defined_variable_attr_hdl), xios(is_defined_variablegroup_attr_hdl),  &
+                   xios(is_defined_file_attr_hdl), xios(is_defined_filegroup_attr_hdl),                                           &
                    xios(is_defined_grid_attr_hdl), xios(is_defined_gridgroup_attr_hdl), xios(is_defined_axis_attr_hdl) ,          &
                    xios(is_defined_axisgroup_attr_hdl), xios(is_defined_context_attr_hdl)
@@ -109 +125 @@
                     xios(get_file_handle), xios(get_filegroup_handle), xios(get_grid_handle),               &
                     xios(get_gridgroup_handle), xios(get_axis_handle), xios(get_axisgroup_handle),          &
-                    xios(get_field_handle), xios(get_fieldgroup_handle)
+                    xios(get_field_handle), xios(get_fieldgroup_handle),xios(get_variable_handle),          &
+                    xios(get_variablegroup_handle)
 END INTERFACE xios(get_handle) 
 
 INTERFACE xios(add_child)
-  MODULE PROCEDURE xios(add_axis), xios(add_file), xios(add_grid), xios(add_field), xios(add_domain),    &
-                   xios(add_fieldtofile), xios(add_axisgroup), xios(add_filegroup), xios(add_gridgroup), &
-                   xios(add_fieldgroup), xios(add_domaingroup), xios(add_fieldgrouptofile)
+  MODULE PROCEDURE xios(add_axis), xios(add_file), xios(add_grid), xios(add_field), xios(add_domain),                &
+                   xios(add_fieldtofile), xios(add_variabletofile), xios(add_variabletofield), xios(add_axisgroup),  &
+                   xios(add_filegroup), xios(add_gridgroup), xios(add_fieldgroup), xios(add_domaingroup),            &
+                   xios(add_fieldgrouptofile), xios(add_variablegrouptofile),xios(add_variablegrouptofield) 
 END INTERFACE xios(add_child)