Changeset 8924 for branches/2017/dev_METO_2017/NEMOGCM/NEMO/SAS_SRC/daymod.F90

Timestamp:

2017-12-06T16:16:55+01:00 (7 years ago)

Author:

timgraham

Message:

Reverted last merge as I can't get the XIOS read branch to compile

File:

• branches/2017/dev_METO_2017/NEMOGCM/NEMO/SAS_SRC/daymod.F90 (modified) (5 diffs)

branches/2017/dev_METO_2017/NEMOGCM/NEMO/SAS_SRC/daymod.F90

@@ -30 +30 @@
    USE in_out_manager ! I/O manager
    USE prtctl         ! Print control
-   USE iom            ! I/O manager
+   USE iom            !
    USE timing         ! Timing
    USE restart        ! restart
@@ -142 +142 @@
       ! call day to set the calendar parameters at the begining of the current simulaton. needed by iom_init
       CALL day( nit000 )
-      IF( lwxios ) THEN
-        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
@@ -324 +318 @@
          IF( iom_varid( numror, 'kt', ldstop = .FALSE. ) > 0 ) THEN
             ! Get Calendar informations
-            CALL iom_get( numror, 'kt', zkt, ldxios = lrxios )   ! last time-step of previous run
+            CALL iom_get( numror, 'kt', zkt )   ! last time-step of previous run
             IF(lwp) THEN
                WRITE(numout,*) ' *** Info read in restart : '
@@ -343 +337 @@
             IF ( nrstdt == 2 ) THEN
                ! read the parameters corresponding to nit000 - 1 (last time step of previous run)
-               CALL iom_get( numror, 'ndastp', zndastp, ldxios = lrxios )
+               CALL iom_get( numror, 'ndastp', zndastp )
                ndastp = NINT( zndastp )
-               CALL iom_get( numror, 'adatrj', adatrj , ldxios = lrxios )
-          CALL iom_get( numror, 'ntime' , ktime  , ldxios = lrxios )
+               CALL iom_get( numror, 'adatrj', adatrj  )
+          CALL iom_get( numror, 'ntime', ktime )
           nn_time0=INT(ktime)
                ! calculate start time in hours and minutes
@@ -405 +399 @@
          ENDIF
          ! calendar control
-         IF( lwxios ) CALL iom_swap(      cwxios_context          )
-         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
-         CALL iom_rstput( kt, nitrst, numrow, 'adatrj' , adatrj             , ldxios = lwxios )   ! number of elapsed days since
+         CALL iom_rstput( kt, nitrst, numrow, 'kt'     , REAL( kt    , wp) )   ! time-step
+         CALL iom_rstput( kt, nitrst, numrow, 'ndastp' , REAL( ndastp, wp) )   ! date
+         CALL iom_rstput( kt, nitrst, numrow, 'adatrj' , adatrj            )   ! number of elapsed days since
          !                                                                     ! the begining of the run [s]
-    CALL iom_rstput( kt, nitrst, numrow, 'ntime'  , REAL( nn_time0, wp), ldxios = lwxios ) ! time
-         IF( lwxios ) CALL iom_swap(      cxios_context          )
+    CALL iom_rstput( kt, nitrst, numrow, 'ntime'  , REAL( nn_time0, wp) ) ! time
       ENDIF
       !