Changeset 8785

Timestamp:

2017-11-22T13:34:53+01:00 (6 years ago)

Author:

andmirek

Message:

#1953 and #1962 change in subroutine name and way temperature first level is read

Location:

branches/2017/dev_r8600_xios_read_write/NEMOGCM/NEMO/OPA_SRC/IOM

Files:

• iom.F90 (modified) (5 diffs)
• restart.F90 (modified) (2 diffs)

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

@@ -66 +66 @@
    PRIVATE iom_set_domain_attr, iom_set_axis_attr, iom_set_field_attr, iom_set_file_attr, iom_get_file_attr, iom_set_grid_attr
    PRIVATE set_grid, set_grid_bounds, set_scalar, set_xmlatt, set_mooring, iom_update_file_name, iom_sdate
-   PRIVATE iom_set_rst_context, iom_set_rstw_active
+   PRIVATE iom_set_rst_context, iom_set_rstw_active, iom_set_rstr_active
    PUBLIC iom_set_rstw_var_active, iom_set_rst_vars
 # endif
@@ -214 +214 @@
        CALL iom_set_rst_vars(rst_fields)
 !set which fields are to be read from restart file
-       CALL set_rstr_active()
+       CALL iom_set_rstr_active()
       ELSE IF( TRIM(cdname) == TRIM(cwxios_context) ) THEN
 !set names of the fields in restart file IF using XIOS to write data
@@ -263 +263 @@
    END SUBROUTINE iom_set_rstw_var_active
 
-   SUBROUTINE set_rstr_active()
+   SUBROUTINE iom_set_rstr_active()
 !sets enabled = .TRUE. for each field in restart file
    CHARACTER(len=256) :: rst_file
@@ -309 +309 @@
          ENDIF
         END DO
-   END SUBROUTINE set_rstr_active
+   END SUBROUTINE iom_set_rstr_active
 
    SUBROUTINE iom_set_rstw_core()
@@ -536 +536 @@
 #if defined key_iomput
       TYPE(xios_context) :: nemo_hdl
-
+      IF(lwp) write(numout,*)  'SWAP to: ',TRIM(cdname)
       IF( TRIM(Agrif_CFixed()) == '0' ) THEN
         CALL xios_get_handle(TRIM(cdname),nemo_hdl)

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

@@ -249 +249 @@
       TYPE(xios_duration):: dtime
       integer::ni,nj,nk
+      REAL(wp), DIMENSION(jpi, jpj, jpk) :: w3d 
       !!----------------------------------------------------------------------
 
@@ -265 +266 @@
          &   "rst_read:- ln_diurnal_only set, setting rhop=rau0" 
          rhop = rau0
-         CALL iom_get( numror, jpdom_autoglo, 'tn'     , tsn(:,:,1,jp_tem), ldxios = lxios_read ) 
+         CALL iom_get( numror, jpdom_autoglo, 'tn'     , w3d, ldxios = lxios_read ) 
+         tsn(:,:,1,jp_tem) = w3d(:,:,1)
          RETURN 
       ENDIF