Changeset 886


Ignore:
Timestamp:
07/05/16 15:58:57 (5 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:
5 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/inputs/Version2/iodef.xml

    r827 r886  
    4141     </file> 
    4242     <file id="output_Scalar" name="output_Scalar" type="one_file"> 
    43 <!--        <field field_ref="field_Scalar" />--> 
     43        <field field_ref="field_Scalar" /> 
    4444     </file> 
    4545   </file_definition> 
  • XIOS/trunk/src/interface/fortran/idata.F90

    r593 r886  
    325325 
    326326   ! Send field functions 
    327    SUBROUTINE xios(send_scalar_r8)(fieldid, data_k8) 
     327   SUBROUTINE xios(send_field_r8_0d)(fieldid, data_k8) 
    328328   IMPLICIT NONE 
    329329      CHARACTER(len = *) , INTENT(IN) :: fieldid 
    330330      REAL     (kind = 8), INTENT(IN) :: data_k8 
    331331      CALL cxios_write_data_k80(fieldid, len(fieldid), data_k8, 1) 
    332    END SUBROUTINE xios(send_scalar_r8) 
    333  
    334    SUBROUTINE xios(send_scalar_r4)(fieldid, data_k4) 
     332   END SUBROUTINE xios(send_field_r8_0d) 
     333 
     334   SUBROUTINE xios(send_field_r4_0d)(fieldid, data_k4) 
    335335   IMPLICIT NONE 
    336336      CHARACTER(len = *) , INTENT(IN) :: fieldid 
    337337      REAL     (kind = 4), INTENT(IN) :: data_k4 
    338338      CALL cxios_write_data_k40(fieldid, len(fieldid), data_k4, 1) 
    339    END SUBROUTINE xios(send_scalar_r4) 
    340  
    341  
     339   END SUBROUTINE xios(send_field_r4_0d) 
    342340 
    343341   SUBROUTINE xios(send_field_r8_1d)(fieldid, data1d_k8) 
  • XIOS/trunk/src/interface/fortran/ixios.F90

    r801 r886  
    9797 
    9898USE XIOS_INTERFACES, ONLY : xios(set_attr), xios(get_attr), xios(is_defined_attr), xios(get_handle), xios(add_child), & 
    99                             xios(send_field), xios(send_scalar), xios(recv_field), xios(field_is_active), xios(getVar), xios(setVar) 
     99                            xios(send_field), xios(recv_field), xios(field_is_active), xios(getVar), xios(setVar) 
    100100 
    101101END MODULE XIOS 
  • XIOS/trunk/src/interface/fortran/ixios_interfaces.F90

    r836 r886  
    77USE icontext_attr, ONLY : xios(set_context_attr_hdl), xios(get_context_attr_hdl), xios(is_defined_context_attr_hdl) 
    88 
    9 USE idata, ONLY : xios(send_scalar_r8), xios(send_field_r8_1d), xios(send_field_r8_2d), xios(send_field_r8_3d), & 
    10                   xios(send_scalar_r4), xios(send_field_r4_1d), xios(send_field_r4_2d), xios(send_field_r4_3d), & 
     9USE idata, ONLY : xios(send_field_r8_0d), xios(send_field_r8_1d), xios(send_field_r8_2d), xios(send_field_r8_3d), & 
     10                  xios(send_field_r4_0d), xios(send_field_r4_1d), xios(send_field_r4_2d), xios(send_field_r4_3d), & 
    1111                  xios(recv_field_r8_1d), xios(recv_field_r8_2d), xios(recv_field_r8_3d),                       & 
    1212                  xios(recv_field_r4_1d), xios(recv_field_r4_2d), xios(recv_field_r4_3d),                       & 
     
    146146INTERFACE xios(send_field) 
    147147  MODULE PROCEDURE xios(send_field_r8_1d), xios(send_field_r8_2d), xios(send_field_r8_3d), & 
    148                    xios(send_field_r4_1d), xios(send_field_r4_2d), xios(send_field_r4_3d) 
     148                   xios(send_field_r4_1d), xios(send_field_r4_2d), xios(send_field_r4_3d), & 
     149                   xios(send_field_r8_0d), xios(send_field_r4_0d) 
    149150END INTERFACE xios(send_field) 
    150  
    151 INTERFACE xios(send_scalar) 
    152   MODULE PROCEDURE xios(send_scalar_r8), xios(send_scalar_r4) 
    153 END INTERFACE xios(send_scalar) 
    154151 
    155152INTERFACE xios(recv_field) 
     
    171168 
    172169PUBLIC :: xios(set_attr), xios(get_attr), xios(is_defined_attr), xios(get_handle), xios(add_child), & 
    173           xios(send_scalar), xios(send_field), xios(recv_field), xios(field_is_active), xios(getVar), xios(setVar) 
     170          xios(send_field), xios(recv_field), xios(field_is_active), xios(getVar), xios(setVar) 
    174171 
    175172END MODULE XIOS_INTERFACES 
  • XIOS/trunk/src/test/test_new_features.f90

    r836 r886  
    211211    CALL xios_send_field("field_All_Axis",field_All_Axis) 
    212212    tsTemp = ts 
    213     CALL xios_send_scalar("field_Scalar", tsTemp) 
     213    CALL xios_send_field("field_Scalar", tsTemp) 
    214214    CALL wait_us(5000) ; 
    215215  ENDDO 
Note: See TracChangeset for help on using the changeset viewer.