Changeset 587 for XIOS/trunk/src/interface

Timestamp:

04/01/15 17:53:06 (9 years ago)

Author:

mhnguyen

Message:

Correcting some issues because of merging code

+) Correct Fortran interface
+) Make a new interface for function sending a scalar

Test
+) On Curie:
+) Mode attached and connected
+) test_client and test_complete are correct

Location:

XIOS/trunk/src/interface/fortran

Files:

• idata.F90 (modified) (1 diff)
• ixios.F90 (modified) (3 diffs, 1 prop)
• ixios_interfaces.F90 (modified) (3 diffs)

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

@@ -277 +277 @@
 
 
-   SUBROUTINE xios(send_field_r8)(fieldid, data_k8)
+   SUBROUTINE xios(send_scalar_r8)(fieldid, data_k8)
    IMPLICIT NONE
       CHARACTER(len = *) , INTENT(IN) :: fieldid
       REAL     (kind = 8), INTENT(IN) :: data_k8
       CALL cxios_write_data_k80(fieldid, len(fieldid), data_k8, 1)
-   END SUBROUTINE xios(send_field_r8)
-
-   SUBROUTINE xios(send_field_r4)(fieldid, data_k4)
+   END SUBROUTINE xios(send_scalar_r8)
+
+   SUBROUTINE xios(send_scalar_r4)(fieldid, data_k4)
    IMPLICIT NONE
       CHARACTER(len = *) , INTENT(IN) :: fieldid
       REAL     (kind = 4), INTENT(IN) :: data_k4
       CALL cxios_write_data_k40(fieldid, len(fieldid), data_k4, 1)
-   END SUBROUTINE xios(send_field_r4)
+   END SUBROUTINE xios(send_scalar_r4)
 
 

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

@@ -11 +11 @@
 
 USE icontext_attr, ONLY : xios(set_context_attr), xios(get_context_attr), xios(is_defined_context_attr)
-                  xios(setVar_logic), xios(setVar_char), xios(send_field_r8), xios(send_field_r4)
 
 USE idata, ONLY : xios(initialize), xios(init_server), xios(finalize), xios(context_initialize), xios(context_is_initialized), &
@@ -39 +38 @@
 
 USE ifield, ONLY : txios(field), txios(fieldgroup), xios(is_valid_field), xios(is_valid_fieldgroup)
-                    xios(send_field_r4_1d), xios(send_field_r4_2d), xios(send_field_r4_3d),              &
-                    xios(send_field_r8), xios(send_field_r4)
 
 USE ifield_attr, ONLY : xios(set_field_attr), xios(get_field_attr), xios(is_defined_field_attr)
@@ -71 +68 @@
 
 USE XIOS_INTERFACES, ONLY : xios(set_attr), xios(get_attr), xios(is_defined_attr), xios(get_handle), &
-                            xios(add_child), xios(send_field), xios(field_is_active), xios(getVar), xios(setVar)
+                            xios(add_child), xios(send_field), xios(send_scalar), xios(field_is_active), xios(getVar), xios(setVar)
 
 END MODULE XIOS

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

@@ -7 +7 @@
 USE icontext_attr, ONLY : xios(set_context_attr_hdl), xios(get_context_attr_hdl), xios(is_defined_context_attr_hdl)
 
-USE idata, ONLY : 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),                    &
+USE idata, ONLY : xios(send_scalar_r8), xios(send_field_r8_1d), xios(send_field_r8_2d), xios(send_field_r8_3d),                    &
+                  xios(send_scalar_r4), xios(send_field_r4_1d), xios(send_field_r4_2d), 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)
@@ -102 +102 @@
 END INTERFACE xios(send_field)
 
+INTERFACE xios(send_scalar)
+  MODULE PROCEDURE xios(send_scalar_r8), xios(send_scalar_r4)
+END INTERFACE xios(send_scalar)
+
 INTERFACE xios(field_is_active)
   MODULE PROCEDURE xios(field_is_active_id),xios(field_is_active_hdl)
@@ -115 +119 @@
 
 PUBLIC :: xios(set_attr), xios(get_attr), xios(is_defined_attr), xios(get_handle), &
-          xios(add_child), xios(send_field), xios(field_is_active), xios(getVar), xios(setVar)
+          xios(add_child), xios(send_field), xios(field_is_active), xios(getVar), xios(setVar), xios(send_scalar)
 
 END MODULE XIOS_INTERFACES