Changeset 8836 for branches/2017/dev_r8600_xios_read_write_v2/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

Timestamp:

2017-11-28T15:45:20+01:00 (6 years ago)

Author:

andmirek

Message:

#1953 and #1962 Techinal corrections

File:

• branches/2017/dev_r8600_xios_read_write_v2/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) (9 diffs)

branches/2017/dev_r8600_xios_read_write_v2/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_rfields, rst_wfields, RST_FIELD
 # endif
    USE ioipsl, ONLY :  ju2ymds    ! for calendar
@@ -211 +210 @@
       IF( TRIM(cdname) == TRIM(crxios_context) ) THEN
 !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_rfields)
+          CALL iom_set_rst_context()
+          CALL iom_set_rst_vars(rst_rfields)
 !set which fields are to be read from restart file
-       CALL iom_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
-       CALL iom_set_rst_context()
-       CALL iom_set_rst_vars(rst_wfields)
+          CALL iom_set_rst_context()
+          CALL iom_set_rst_vars(rst_wfields)
 !set which fields are to be read from restart file
-       CALL iom_set_rstw_active(fname)
+          CALL iom_set_rstw_active(fname)
       ELSE
-       CALL set_xmlatt
+          CALL set_xmlatt
       ENDIF
 
@@ -239 +238 @@
 
    SUBROUTINE iom_set_rstw_var_active(field)
+      !!---------------------------------------------------------------------
+      !!                   ***  SUBROUTINE  iom_set_rstw_var_active  ***
+      !!
+      !! ** Purpose :  enable variable in restart file when writing with XIOS 
+      !!---------------------------------------------------------------------
    CHARACTER(len = *), INTENT(IN) :: field
    INTEGER :: i
@@ -264 +268 @@
 
    SUBROUTINE iom_set_rstr_active()
+      !!---------------------------------------------------------------------
+      !!                   ***  SUBROUTINE  iom_set_rstr_active  ***
+      !!
+      !! ** Purpose :  define file name in XIOS context for reading restart file,
+      !!               enable variables present in restart file for reading with XIOS 
+      !!---------------------------------------------------------------------
+
 !sets enabled = .TRUE. for each field in restart file
    CHARACTER(len=256) :: rst_file
@@ -286 +297 @@
              par_access="collective", enabled=.TRUE., mode="read",                 &
              output_freq=xios_timestep)
-!defin files for restart context
+!define variables for restart context
         DO i = 1, max_rst_fields
          IF( TRIM(rst_rfields(i)%vname) /= "NO_NAME") THEN
@@ -312 +323 @@
 
    SUBROUTINE iom_set_rstw_core(cdmdl)
-   CHARACTER (len=*), INTENT (IN) :: cdmdl
+      !!---------------------------------------------------------------------
+      !!                   ***  SUBROUTINE  iom_set_rstw_core  ***
+      !!
+      !! ** Purpose :  set variables which are always in restart file 
+      !!---------------------------------------------------------------------
+   CHARACTER (len=*), INTENT (IN) :: cdmdl ! model OPA or SAS
    
    IF(cdmdl == "OPA") THEN
@@ -350 +366 @@
 
    SUBROUTINE iom_set_rst_vars(fields)
-!set names for variables in restart file
+      !!---------------------------------------------------------------------
+      !!                   ***  SUBROUTINE  iom_set_rstr_active  ***
+      !!
+      !! ** Purpose :  Fill array fields with the information about all 
+      !!               possible variables and corresponding grids definition 
+      !!               for reading/writing restart with XIOS
+      !!---------------------------------------------------------------------
    TYPE(RST_FIELD), INTENT(INOUT) :: fields(max_rst_fields)
+
    INTEGER :: i
         i = 0
@@ -460 +483 @@
 
    SUBROUTINE iom_set_rstw_active(cdrst_file)
+      !!---------------------------------------------------------------------
+      !!                   ***  SUBROUTINE  iom_set_rstr_active  ***
+      !!
+      !! ** Purpose :  define file name in XIOS context for writing restart
+      !!               enable variables present in restart file for writing
+      !!---------------------------------------------------------------------
 !sets enabled = .TRUE. for each field in restart file
    CHARACTER(len=*) :: cdrst_file
@@ -507 +536 @@
 
    SUBROUTINE iom_set_rst_context( ) 
+     !!---------------------------------------------------------------------
+      !!                   ***  SUBROUTINE  iom_set_rstr_active  ***
+      !!
+      !! ** Purpose : Define domain, axis and grid for restart (read/write) 
+      !!              context 
+      !!               
+      !!---------------------------------------------------------------------
 #if defined key_iomput
    TYPE(xios_domaingroup)            :: domaingroup_hdl