Changeset 8792

Timestamp:

2017-11-23T12:29:39+01:00 (6 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:

• iom.F90 (modified) (3 diffs)
• iom_def.F90 (modified) (1 diff)

branches/2017/dev_r8600_xios_read_write/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -41 +41 @@
    USE dianam          ! build name of file
    USE xios
-   USE iom_def, ONLY : max_rst_fields, rst_fields, rst_wfields, RST_FIELD
+   USE iom_def, ONLY : max_rst_fields, rst_rfields, rst_wfields, RST_FIELD
 # endif
    USE ioipsl, ONLY :  ju2ymds    ! for calendar
@@ -212 +212 @@
 !set names of the fields in restart file IF using XIOS to read data
        CALL iom_set_rst_context()
-       CALL iom_set_rst_vars(rst_fields)
+       CALL iom_set_rst_vars(rst_rfields)
 !set which fields are to be read from restart file
        CALL iom_set_rstr_active()
@@ -288 +288 @@
 !defin files for restart context
         DO i = 1, max_rst_fields
-         IF( TRIM(rst_fields(i)%vname) /= "NO_NAME") THEN
-           IF( iom_varid( numror, TRIM(rst_fields(i)%vname), ldstop = .FALSE. ) > 0 ) THEN
-                CALL xios_add_child(file_hdl, field_hdl, TRIM(rst_fields(i)%vname))
-                SELECT CASE (TRIM(rst_fields(i)%grid))
+         IF( TRIM(rst_rfields(i)%vname) /= "NO_NAME") THEN
+           IF( iom_varid( numror, TRIM(rst_rfields(i)%vname), ldstop = .FALSE. ) > 0 ) THEN
+                CALL xios_add_child(file_hdl, field_hdl, TRIM(rst_rfields(i)%vname))
+                SELECT CASE (TRIM(rst_rfields(i)%grid))
                  CASE ("grid_N_3D")
-                    CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_fields(i)%vname), &
+                    CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_rfields(i)%vname), &
                         domain_ref="grid_N", axis_ref="deptht", operation = "instant")
                  CASE ("grid_N")
-                    CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_fields(i)%vname), &
+                    CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_rfields(i)%vname), &
                         domain_ref="grid_N", operation = "instant") 
                 CASE ("grid_vector")
-                    CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_fields(i)%vname), &
+                    CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_rfields(i)%vname), &
                          axis_ref="deptht", operation = "instant")
                  CASE ("grid_scalar")
-                    CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_fields(i)%vname), &
+                    CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(rst_rfields(i)%vname), &
                         scalar_ref = "grid_scalar", operation = "instant")
                 END SELECT
-                IF(lwp) WRITE(numout,*) 'XIOS read: ', TRIM(rst_fields(i)%vname), ' enabled in ', TRIM(rst_file)
+                IF(lwp) WRITE(numout,*) 'XIOS read: ', TRIM(rst_rfields(i)%vname), ' enabled in ', TRIM(rst_file)
            ENDIF
          ENDIF

branches/2017/dev_r8600_xios_read_write/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90

@@ -83 +83 @@
 !$AGRIF_END_DO_NOT_TREAT
 
-   TYPE(RST_FIELD), PUBLIC :: rst_wfields(max_rst_fields), rst_fields(max_rst_fields)
+   TYPE(RST_FIELD), PUBLIC :: rst_wfields(max_rst_fields), rst_rfields(max_rst_fields)
 
    !!=====================================================================