Changeset 11901 for NEMO/branches/2019/dev_r11756_SI3restart_XIOS/src/OCE/IOM/restart.F90

Timestamp:

2019-11-13T18:27:42+01:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2323 SI3 restart read/write with XIOS for AGRIF

File:

• NEMO/branches/2019/dev_r11756_SI3restart_XIOS/src/OCE/IOM/restart.F90 (modified) (2 diffs)

NEMO/branches/2019/dev_r11756_SI3restart_XIOS/src/OCE/IOM/restart.F90

@@ -131 +131 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step
       !!----------------------------------------------------------------------
+
                      IF(lwxios) CALL iom_swap(      cwxios_context          )
                      CALL iom_rstput( kt, nitrst, numrow, 'rdt'    , rdt       , ldxios = lwxios)   ! dynamics time step
@@ -207 +208 @@
 ! restart)
          IF(.NOT.lxios_set) lrxios = lrxios.AND.lxios_sini
-         IF( lrxios) THEN
+         IF( lrxios .AND. (.NOT. lxios_set)) THEN
              crxios_context = 'nemo_rst'
-             IF( .NOT. lxios_set ) THEN
-                 IF(lwp) WRITE(numout,*) 'Enable restart reading by XIOS'
-                 CALL iom_init( crxios_context, TRIM(clpath)//cn_ocerst_in, ld_tmppatch = .false. )
-                 lxios_set = .TRUE.
+             lxios_set = .TRUE.
+             IF( TRIM(Agrif_CFixed()) /= '0') THEN
+                IF(lwp) WRITE(numout,*) 'Enable restart reading by XIOS for AGRIF'
+                CALL iom_init( crxios_context, TRIM(clpath)//TRIM(Agrif_CFixed())//"_"//cn_ocerst_in, ld_tmppatch = .false. )
+             ELSE
+                IF(lwp) WRITE(numout,*) 'Enable restart reading by XIOS'
+                CALL iom_init( crxios_context, TRIM(clpath)//cn_ocerst_in, ld_tmppatch = .false. )
              ENDIF
-         ENDIF
-         IF( TRIM(Agrif_CFixed()) /= '0' .AND. lrxios) THEN
-             CALL iom_init( crxios_context, TRIM(clpath)//cn_ocerst_in, ld_tmppatch = .false. )
-             IF(lwp) WRITE(numout,*) 'Enable restart reading by XIOS for AGRIF'
-             lxios_set = .TRUE.
          ENDIF 
       ENDIF