Changeset 8792


Ignore:
Timestamp:
2017-11-23T12:29:39+01:00 (3 years ago)
Author:
andmirek
Message:

#1953 and #1962 rename rst_fields to rst_rfields

Location:
branches/2017/dev_r8600_xios_read_write/NEMOGCM/NEMO/OPA_SRC/IOM
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_r8600_xios_read_write/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

    r8786 r8792  
    4141   USE dianam          ! build name of file 
    4242   USE xios 
    43    USE iom_def, ONLY : max_rst_fields, rst_fields, rst_wfields, RST_FIELD 
     43   USE iom_def, ONLY : max_rst_fields, rst_rfields, rst_wfields, RST_FIELD 
    4444# endif 
    4545   USE ioipsl, ONLY :  ju2ymds    ! for calendar 
     
    212212!set names of the fields in restart file IF using XIOS to read data 
    213213       CALL iom_set_rst_context() 
    214        CALL iom_set_rst_vars(rst_fields) 
     214       CALL iom_set_rst_vars(rst_rfields) 
    215215!set which fields are to be read from restart file 
    216216       CALL iom_set_rstr_active() 
     
    288288!defin files for restart context 
    289289        DO i = 1, max_rst_fields 
    290          IF( TRIM(rst_fields(i)%vname) /= "NO_NAME") THEN 
    291            IF( iom_varid( numror, TRIM(rst_fields(i)%vname), ldstop = .FALSE. ) > 0 ) THEN 
    292                 CALL xios_add_child(file_hdl, field_hdl, TRIM(rst_fields(i)%vname)) 
    293                 SELECT CASE (TRIM(rst_fields(i)%grid)) 
     290         IF( TRIM(rst_rfields(i)%vname) /= "NO_NAME") THEN 
     291           IF( iom_varid( numror, TRIM(rst_rfields(i)%vname), ldstop = .FALSE. ) > 0 ) THEN 
     292                CALL xios_add_child(file_hdl, field_hdl, TRIM(rst_rfields(i)%vname)) 
     293                SELECT CASE (TRIM(rst_rfields(i)%grid)) 
    294294                 CASE ("grid_N_3D") 
    295                     CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_fields(i)%vname), & 
     295                    CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_rfields(i)%vname), & 
    296296                        domain_ref="grid_N", axis_ref="deptht", operation = "instant") 
    297297                 CASE ("grid_N") 
    298                     CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_fields(i)%vname), & 
     298                    CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_rfields(i)%vname), & 
    299299                        domain_ref="grid_N", operation = "instant")  
    300300                CASE ("grid_vector") 
    301                     CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_fields(i)%vname), & 
     301                    CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_rfields(i)%vname), & 
    302302                         axis_ref="deptht", operation = "instant") 
    303303                 CASE ("grid_scalar") 
    304                     CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_fields(i)%vname), & 
     304                    CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_rfields(i)%vname), & 
    305305                        scalar_ref = "grid_scalar", operation = "instant") 
    306306                END SELECT 
    307                 IF(lwp) WRITE(numout,*) 'XIOS read: ', TRIM(rst_fields(i)%vname), ' enabled in ', TRIM(rst_file) 
     307                IF(lwp) WRITE(numout,*) 'XIOS read: ', TRIM(rst_rfields(i)%vname), ' enabled in ', TRIM(rst_file) 
    308308           ENDIF 
    309309         ENDIF 
  • branches/2017/dev_r8600_xios_read_write/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90

    r8770 r8792  
    8383!$AGRIF_END_DO_NOT_TREAT 
    8484 
    85    TYPE(RST_FIELD), PUBLIC :: rst_wfields(max_rst_fields), rst_fields(max_rst_fields) 
     85   TYPE(RST_FIELD), PUBLIC :: rst_wfields(max_rst_fields), rst_rfields(max_rst_fields) 
    8686 
    8787   !!===================================================================== 
Note: See TracChangeset for help on using the changeset viewer.