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

Timestamp:

09/22/14 14:17:33 (10 years ago)

Author:

mhnguyen

Message:

Ticket 50: Implementing the getting/setting methods for Fortran interface

+) Add some C and Fortran functions to set and get data to/from CVariable with an id
+) Add method to send, receive and dispatch in CVariable
+) Add dispatch method in server class

Test
-) On Curie
-) Test data: integer, float, double, boolean, string
-) File: one and multiple, using_server: ON and OFF
+) All test cases passed and had correct results

File:

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

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

@@ -10 +10 @@
                           xios(get_context_attr), xios(get_context_attr_hdl), &
                           xios(is_defined_context_attr), xios(is_defined_context_attr_hdl)
-                                               
+
 USE idata, ONLY : xios(initialize),xios(init_server), xios(finalize), xios(context_initialize),  &
                   xios(context_is_initialized), xios(close_context_definition),xios(solve_inheritance),       &
                   xios(context_finalize), xios(send_field_r8_1d), xios(send_field_r8_2d), &
                   xios(send_field_r8_3d), xios(send_field_r4_1d), xios(send_field_r4_2d), &
-                  xios(send_field_r4_3d)
+                  xios(send_field_r4_3d), xios(getVar_k8), xios(getVar_k4), xios(getVar_int), &
+                  xios(getVar_logic), xios(getVar_char), xios(setVar_k8), xios(setVar_k4), xios(setVar_int), &
+                  xios(setVar_logic), xios(setVar_char)
 
 USE idate, ONLY : txios(date),txios(time), xios(set_timestep),xios(update_calendar)
@@ -27 +29 @@
                           xios(is_defined_domain_attr), xios(is_defined_domain_attr_hdl)
 
-USE idomaingroup_attr, ONLY : xios(set_domaingroup_attr), xios(set_domaingroup_attr_hdl),  & 
-                              xios(get_domaingroup_attr), xios(get_domaingroup_attr_hdl), & 
-                              xios(is_defined_domaingroup_attr), xios(is_defined_domaingroup_attr_hdl) 
-                    
+USE idomaingroup_attr, ONLY : xios(set_domaingroup_attr), xios(set_domaingroup_attr_hdl),  &
+                              xios(get_domaingroup_attr), xios(get_domaingroup_attr_hdl), &
+                              xios(is_defined_domaingroup_attr), xios(is_defined_domaingroup_attr_hdl)
+
 USE ifield, ONLY : txios(field), txios(fieldgroup), xios(get_field_handle),  &
                    xios(get_fieldgroup_handle), xios(is_valid_field),        &
-                   xios(is_valid_fieldgroup),xios(field_is_active_id),xios(field_is_active_hdl)  
+                   xios(is_valid_fieldgroup),xios(field_is_active_id),xios(field_is_active_hdl)
 
 USE ifield_attr, ONLY : xios(set_field_attr),xios(set_field_attr_hdl),    &
                         xios(get_field_attr),xios(get_field_attr_hdl), &
                         xios(is_defined_field_attr),xios(is_defined_field_attr_hdl)
-  
+
 USE ifieldgroup_attr, ONLY : xios(set_fieldgroup_attr), xios(set_fieldgroup_attr_hdl),  &
                              xios(get_fieldgroup_attr), xios(get_fieldgroup_attr_hdl), &
@@ -50 +52 @@
                         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),    & 
+
+USE ifile, ONLY : txios(file), txios(filegroup), xios(get_file_handle),    &
                   xios(get_filegroup_handle), xios(is_valid_file), xios(is_valid_filegroup)
 
@@ -65 +67 @@
                             xios(get_filegroup_attr), xios(get_filegroup_attr_hdl), &
                             xios(is_defined_filegroup_attr), xios(is_defined_filegroup_attr_hdl)
-                  
+
 USE igrid, ONLY : txios(grid), txios(gridgroup), xios(get_grid_handle),     &
-                  xios(get_gridgroup_handle), xios(is_valid_grid), xios(is_valid_gridgroup) 
+                  xios(get_gridgroup_handle), xios(is_valid_grid), xios(is_valid_gridgroup)
 
 USE igrid_attr, ONLY : xios(set_grid_attr_hdl), xios(set_grid_attr), &
@@ -78 +80 @@
 
 USE iaxis, ONLY : txios(axis), txios(axisgroup), xios(get_axis_handle),     &
-                  xios(get_axisgroup_handle), xios(is_valid_axis), xios(is_valid_axisgroup) 
+                  xios(get_axisgroup_handle), xios(is_valid_axis), xios(is_valid_axisgroup)
 
 USE iaxis_attr, ONLY :  xios(set_axis_attr), xios(set_axis_attr_hdl), &
@@ -90 +92 @@
 USE ixml_tree, ONLY : 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_axisgroup), xios(add_filegroup), xios(add_gridgroup), xios(add_fieldgroup),         &
                      xios(add_domaingroup), xios(add_fieldgrouptofile), xios(add_variablegrouptofile),            &
                      xios(add_variablegrouptofield)
@@ -127 +129 @@
                     xios(get_field_handle), xios(get_fieldgroup_handle),xios(get_variable_handle),          &
                     xios(get_variablegroup_handle)
-END INTERFACE xios(get_handle) 
+END INTERFACE xios(get_handle)
 
 INTERFACE xios(add_child)
@@ -133 +135 @@
                    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) 
+                   xios(add_fieldgrouptofile), xios(add_variablegrouptofile),xios(add_variablegrouptofield)
 END INTERFACE xios(add_child)
 
@@ -145 +147 @@
   MODULE PROCEDURE xios(field_is_active_id),xios(field_is_active_hdl)
 END INTERFACE
-  
+
+INTERFACE xios(getVar)
+  MODULE PROCEDURE xios(getVar_k8), xios(getVar_k4), xios(getVar_int), xios(getVar_logic), xios(getVar_char)
+END INTERFACE xios(getVar)
+
+INTERFACE xios(setVar)
+  MODULE PROCEDURE xios(setVar_k8), xios(setVar_k4), xios(setVar_int), xios(setVar_logic), xios(setVar_char)
+END INTERFACE xios(setVar)
+
  PUBLIC :: txios(domain), txios(domaingroup),txios(field), txios(fieldgroup),txios(file), txios(filegroup), &
-          txios(grid), txios(gridgroup), txios(axis), txios(axisgroup),txios(context), txios(date),txios(time)  
+          txios(grid), txios(gridgroup), txios(axis), txios(axisgroup),txios(context), txios(date),txios(time)
 
  PUBLIC :: xios(set_attr), xios(set_domain_attr), xios(set_domaingroup_attr), xios(set_fieldgroup_attr), &
@@ -164 +174 @@
           xios(is_defined_axisgroup_attr), xios(is_defined_context_attr)
 
- PUBLIC :: xios(get_handle) 
- PUBLIC :: xios(add_child) 
+ PUBLIC :: xios(get_handle)
+ PUBLIC :: xios(add_child)
 
  PUBLIC :: xios(is_valid_context),xios(is_valid_domain), xios(is_valid_domaingroup),xios(is_valid_field),        &
           xios(is_valid_fieldgroup), xios(is_valid_file), xios(is_valid_filegroup), xios(is_valid_grid),         &
           xios(is_valid_gridgroup), xios(is_valid_axis), xios(is_valid_axisgroup)
-          
- PUBLIC :: xios(set_current_context)  
+
+ PUBLIC :: xios(set_current_context)
  PUBLIC :: xios(set_timestep),xios(update_calendar)
  PUBLIC :: xios(initialize), xios(init_server), xios(finalize), xios(context_initialize),xios(context_is_initialized), &
@@ -177 +187 @@
            xios(field_is_active)
 
+ PUBLIC :: xios(getVar)
+ PUBLIC :: xios(setVar)
+
 END MODULE XIOS