Changeset 12961 for NEMO/branches/2020/dev_12905_xios_restart/src/OCE/IOM/restart.F90

Timestamp:

2020-05-22T13:51:12+02:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2462: read/write restart with XIOS in TOP (with debug print statements)

File:

• NEMO/branches/2020/dev_12905_xios_restart/src/OCE/IOM/restart.F90 (modified) (3 diffs)

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/IOM/restart.F90

@@ -116 +116 @@
                   clpname = TRIM(Agrif_CFixed())//"_"//clname   
                ENDIF
-               CALL iom_init( cwxios_context, TRIM(clpath)//TRIM(clpname), .false., ld_closedef = .FALSE. )
+               CALL iom_init( cwxios_context, TRIM(clpath)//TRIM(clpname), ld_tmppatch = .false.,&
+                                                                           ld_closedef = .FALSE. )
                CALL iom_swap(      cxios_context          )
 #else
@@ -190 +191 @@
       !!                the file has already been opened
       !!----------------------------------------------------------------------
-      LOGICAL         ::   llok
-      CHARACTER(lc)   ::   clpath   ! full path to ocean output restart file
-      CHARACTER(lc+2) ::   clpname  ! file name including agrif prefix
+      LOGICAL             ::   llok
+      CHARACTER(len=lc)   ::   clpath   ! full path to ocean output restart file
+      CHARACTER(len=lc+2) ::   clpname  ! file name including agrif prefix
       !!----------------------------------------------------------------------
       !
@@ -209 +210 @@
 ! can handle checking if variable is in the restart file (there will be no need to open
 ! restart)
-         IF(.NOT.lxios_set) lrxios = lrxios.AND.lxios_sini
+         lrxios = lrxios.AND.lxios_sini
 
          IF( lrxios) THEN
              crxios_context = 'oce_rst'
-             IF( .NOT.lxios_set ) THEN
-                 IF(lwp) WRITE(numout,*) 'Enable restart reading by XIOS'
-                 IF( TRIM(Agrif_CFixed()) == '0' ) THEN
-                    clpname = cn_ocerst_in
-                 ELSE
-                    clpname = TRIM(Agrif_CFixed())//"_"//cn_ocerst_in   
-                 ENDIF
-                 CALL iom_init( crxios_context, fname = TRIM(clpath)//TRIM(clpname), ld_tmppatch = .TRUE. )
-                 lxios_set = .TRUE.
+             IF(lwp) WRITE(numout,*) 'Enable restart reading by XIOS'
+             IF( TRIM(Agrif_CFixed()) == '0' ) THEN
+                clpname = cn_ocerst_in
+             ELSE
+                clpname = TRIM(Agrif_CFixed())//"_"//cn_ocerst_in   
              ENDIF
+             CALL iom_init( crxios_context, fname = TRIM(clpath)//TRIM(clpname), &
+                              idfp = iom_file(numror)%nfid, ld_tmppatch = .TRUE. )
          ENDIF