Changeset 9367 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC

Timestamp:

2018-02-28T17:23:20+01:00 (6 years ago)

Author:

mathiot

Message:

Add restart read/write via XIOS capability (#1953 and #1962 and twiki: 2017WP/Met_Office-1_Mirek_XIOSread). WARNING: need to upgrade XIOS to r1296 to compile

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC

Files:

• daymod.F90 (modified) (5 diffs)
• nemogcm.F90 (modified) (1 diff)
• step.F90 (modified) (1 diff)

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

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

branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

@@ -381 +381 @@
                            CALL phy_cst         ! Physical constants
                            CALL eos_init        ! Equation of seawater
-                           CALL dom_init        ! Domain
+                           CALL dom_init('SAS') ! Domain
       IF( ln_ctl      )    CALL prt_ctl_init    ! Print control
       

branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/step.F90

@@ -122 +122 @@
 
 #if defined key_iomput
-      IF( kstp == nitend .OR. indic < 0 ) THEN 
+      IF( kstp == nitrst ) THEN
+         IF(.NOT.lwxios) THEN
+            CALL iom_close( numrow )     
+         ELSE
+            CALL iom_context_finalize( cwxios_context )
+         ENDIF
+         lrst_oce = .FALSE.
+      ENDIF
+      IF( kstp == nitend .OR. indic < 0 ) THEN
                              CALL iom_context_finalize( cxios_context ) ! needed for XIOS+AGRIF
       ENDIF