Changeset 886

Timestamp:

07/05/16 15:58:57 (7 years ago)

Author:

mhnguyen

Message:

Change send_scalar to send_field to make it more coherent

+) Removing and changing some functions in fortran interface

Test
+) On Curie
+) All work

Location:

XIOS/trunk

Files:

• inputs/Version2/iodef.xml (modified) (1 diff)
• src/interface/fortran/idata.F90 (modified) (1 diff)
• src/interface/fortran/ixios.F90 (modified) (1 diff)
• src/interface/fortran/ixios_interfaces.F90 (modified) (3 diffs)
• src/test/test_new_features.f90 (modified) (1 diff)

XIOS/trunk/inputs/Version2/iodef.xml

@@ -41 +41 @@
      </file>
      <file id="output_Scalar" name="output_Scalar" type="one_file">
-<!--        <field field_ref="field_Scalar" />-->
+        <field field_ref="field_Scalar" />
      </file>
    </file_definition>

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

@@ -325 +325 @@
 
    ! Send field functions
-   SUBROUTINE xios(send_scalar_r8)(fieldid, data_k8)
+   SUBROUTINE xios(send_field_r8_0d)(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_scalar_r8)
-
-   SUBROUTINE xios(send_scalar_r4)(fieldid, data_k4)
+   END SUBROUTINE xios(send_field_r8_0d)
+
+   SUBROUTINE xios(send_field_r4_0d)(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_scalar_r4)
-
-
+   END SUBROUTINE xios(send_field_r4_0d)
 
    SUBROUTINE xios(send_field_r8_1d)(fieldid, data1d_k8)

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

@@ -97 +97 @@
 
 USE XIOS_INTERFACES, ONLY : xios(set_attr), xios(get_attr), xios(is_defined_attr), xios(get_handle), xios(add_child), &
-                            xios(send_field), xios(send_scalar), xios(recv_field), xios(field_is_active), xios(getVar), xios(setVar)
+                            xios(send_field), xios(recv_field), 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_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), &
+USE idata, ONLY : xios(send_field_r8_0d), xios(send_field_r8_1d), xios(send_field_r8_2d), xios(send_field_r8_3d), &
+                  xios(send_field_r4_0d), xios(send_field_r4_1d), xios(send_field_r4_2d), xios(send_field_r4_3d), &
                   xios(recv_field_r8_1d), xios(recv_field_r8_2d), xios(recv_field_r8_3d),                       &
                   xios(recv_field_r4_1d), xios(recv_field_r4_2d), xios(recv_field_r4_3d),                       &
@@ -146 +146 @@
 INTERFACE xios(send_field)
   MODULE PROCEDURE 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_1d), xios(send_field_r4_2d), xios(send_field_r4_3d), &
+                   xios(send_field_r8_0d), xios(send_field_r4_0d)
 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(recv_field)
@@ -171 +168 @@
 
 PUBLIC :: xios(set_attr), xios(get_attr), xios(is_defined_attr), xios(get_handle), xios(add_child), &
-          xios(send_scalar), xios(send_field), xios(recv_field), xios(field_is_active), xios(getVar), xios(setVar)
+          xios(send_field), xios(recv_field), xios(field_is_active), xios(getVar), xios(setVar)
 
 END MODULE XIOS_INTERFACES

XIOS/trunk/src/test/test_new_features.f90

@@ -211 +211 @@
     CALL xios_send_field("field_All_Axis",field_All_Axis)
     tsTemp = ts
-    CALL xios_send_scalar("field_Scalar", tsTemp)
+    CALL xios_send_field("field_Scalar", tsTemp)
     CALL wait_us(5000) ;
   ENDDO