Changeset 12950 for NEMO/branches/2020/dev_12905_xios_restart/src/OCE/DOM

Timestamp:

2020-05-19T12:53:16+02:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2462: new XIOS restart read/write interfaces

Location:

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/DOM

Files:

• daymod.F90 (modified) (4 diffs)
• domain.F90 (modified) (1 diff)
• domvvl.F90 (modified) (3 diffs)

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/DOM/daymod.F90

@@ -148 +148 @@
       CALL day( nit000 )
       !
-      IF( lwxios ) THEN
-! define variables in restart file when writing with XIOS
-          CALL iom_set_rstw_var_active('kt')
-          CALL iom_set_rstw_var_active('ndastp')
-          CALL iom_set_rstw_var_active('adatrj')
-          CALL iom_set_rstw_var_active('ntime')
-      ENDIF
-
    END SUBROUTINE day_init
 
@@ -323 +315 @@
 
       IF( TRIM(cdrw) == 'READ' ) THEN
-
+         IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
          IF( iom_varid( numror, 'kt', ldstop = .FALSE. ) > 0 ) THEN
             ! Get Calendar informations
@@ -391 +383 @@
             adatrj = ( REAL( nit000-1, wp ) * rn_Dt ) / rday
          ENDIF
+         IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
          IF( ABS(adatrj  - REAL(NINT(adatrj),wp)) < 0.1 / rday )   adatrj = REAL(NINT(adatrj),wp)   ! avoid truncation error
          !
@@ -409 +402 @@
          ENDIF
          ! calendar control
-         IF( lwxios ) CALL iom_swap(      cwxios_context          )
+         IF( lwxios ) THEN
+            CALL iom_swap(      cwxios_context          )
+!           IF( kt == nitrst ) THEN
+!               CALL iom_init_closedef(cwxios_context)
+!               CALL iom_setkt( kt - nit000 + 1,      cwxios_context          )
+!               CALL iom_swap(      cwxios_context          )
+!           ENDIF
+         ENDIF
          CALL iom_rstput( kt, nitrst, numrow, 'kt'     , REAL( kt    , wp)  , ldxios = lwxios )   ! time-step
          CALL iom_rstput( kt, nitrst, numrow, 'ndastp' , REAL( ndastp, wp)  , ldxios = lwxios )   ! date

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/DOM/domain.F90

@@ -123 +123 @@
       CALL dom_nam                     ! read namelist ( namrun, namdom )
       !
-      IF( lwxios ) THEN
-!define names for restart write and set core output (restart.F90)
-         CALL iom_set_rst_vars(rst_wfields)
-         CALL iom_set_rstw_core(cdstr)
-      ENDIF
 !reset namelist for SAS
       IF(cdstr == 'SAS') THEN

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/DOM/domvvl.F90

@@ -270 +270 @@
       ENDIF
       !
-      IF(lwxios) THEN
-! define variables in restart file when writing with XIOS
-         CALL iom_set_rstw_var_active('e3t_b')
-         CALL iom_set_rstw_var_active('e3t_n')
-         !                                           ! ----------------------- !
-         IF( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN  ! z_tilde and layer cases !
-            !                                        ! ----------------------- !
-            CALL iom_set_rstw_var_active('tilde_e3t_b')
-            CALL iom_set_rstw_var_active('tilde_e3t_n')
-         END IF
-         !                                           ! -------------!    
-         IF( ln_vvl_ztilde ) THEN                    ! z_tilde case !
-            !                                        ! ------------ !
-            CALL iom_set_rstw_var_active('hdiv_lf')
-         ENDIF
-         !
-      ENDIF
-      !
    END SUBROUTINE dom_vvl_zgr
 
@@ -793 +775 @@
          IF( ln_rstart ) THEN                   !* Read the restart file
             CALL rst_read_open                  !  open the restart file if necessary
+            IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
             CALL iom_get( numror, jpdom_autoglo, 'sshn'   , ssh(:,:,Kmm), ldxios = lrxios    )
             !
@@ -869 +852 @@
                ENDIF
             ENDIF
+            IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
             !
          ELSE                                   !* Initialize at "rest"